diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
deleted file mode 100644
index 3cd08e048..000000000
--- a/.github/workflows/deploy-store.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Deploy to app stores
-
-on:
-  release:
-    types: [ created ]
-
-jobs:
-
-  deploy-google-play:
-    name: Deploy to google play
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: google-play
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Decrypt keys
-        env:
-          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-        run: |
-          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
-      - name: Upload apk to google play
-        env:
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-        run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
-
-  deploy-app-gallery:
-    name: Deploy to AppGallery
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-gallery
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Decrypt keys
-        env:
-          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg
-          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
-          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-      - name: Build HMS version
-        env:
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-        run: ./gradlew assembleHmsRelease --stacktrace
-      - name: Upload APK to AppGallery
-        env:
-          AGC_CLIENT_ID: ${{ secrets.AGC_CLIENT_ID }}
-          AGC_CLIENT_SECRET: ${{ secrets.AGC_CLIENT_SECRET }}
-        run: ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace;
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
deleted file mode 100644
index 88edca05d..000000000
--- a/.github/workflows/deploy-test.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-name: Deploy to app tests
-
-on:
-  push:
-#    branches: [ develop ]
-    branches: [ '!*' ]
-  pull_request_target:
-#    branches: [ develop ]
-    branches: [ '!*' ]
-
-  workflow_dispatch:
-
-jobs:
-
-  deploy-appcenter:
-    name: App Center
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-center
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Set run number with offset
-        env:
-          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-      - name: Prepare build configuration
-        run: |
-          sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/google-services.json
-          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/agconnect-services.json
-          sed -i -e '/versionNameSuffix/d' app/build.gradle
-      - name: Add signing config
-        run: |
-          cat >> app/build.gradle <<EOF
-          android.signingConfigs.debug {
-              storeFile file("bitrise.jks")
-              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-              keyAlias System.getenv("BITRISE_KEY_ALIAS")
-              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-          }
-          EOF
-      - name: Decrypt keys
-        env:
-          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-      - name: Bump version
-        uses: chkfung/android-version-actions@v1.1
-        with:
-          gradlePath: app/build.gradle
-          versionCode: ${{ env.RUN_NUMBER }}
-          versionName: ${{ env.RUN_NUMBER }}-${{ github.head_ref }}
-      - name: Build apk
-        env:
-          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-        run: ./gradlew assembleFdroidDebug --stacktrace
-      - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
-          path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-      - name: Deploy to app center
-        uses: wzieba/AppCenter-Github-Action@v1
-        with:
-          appName: wulkanowy/wulkanowy
-          token: ${{ secrets.APP_CENTER_TOKEN }}
-          group: Testers
-          file: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
-          notifyTesters: true
-          debug: true
-
-  deploy-app-distribution:
-    name: App Distribution
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    environment: app-distribution
-    if: github.event_name != 'pull_request_target'
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Set run number with offset
-        env:
-          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
-        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
-      - name: Add signing config
-        run: |
-          cat >> app/build.gradle <<EOF
-          android.signingConfigs.debug {
-              storeFile file("bitrise.jks")
-              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
-              keyAlias System.getenv("BITRISE_KEY_ALIAS")
-              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
-          }
-          EOF
-      - name: Decrypt keys
-        env:
-          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
-          BITRISE_SERVICES_ENCRYPT_KEY: ${{ secrets.BITRISE_SERVICES_ENCRYPT_KEY }}
-        run: |
-          gpg --yes --batch --passphrase=$BITRISE_SERVICES_ENCRYPT_KEY ./app/src/debug/google-services.json.gpg
-          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
-      - name: Bump version
-        uses: chkfung/android-version-actions@v1.1
-        with:
-          gradlePath: app/build.gradle
-          versionCode: ${{ env.RUN_NUMBER }}
-          versionName: ${{ env.RUN_NUMBER }}
-      - name: Build apk
-        env:
-          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
-          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
-          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
-        run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
-      - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
-          path: app/build/outputs/apk/play/debug/app-play-debug.apk
-      - name: Deploy to app distribution
-        uses: wzieba/Firebase-Distribution-Github-Action@v1
-        with:
-          appId: ${{ secrets.FIREBASE_APP_ID }}
-          token: ${{ secrets.FIREBASE_TOKEN }}
-          groups: discord
-          file: app/build/outputs/apk/play/debug/app-play-debug.apk
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index d359360ae..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [ master, develop ]
-    tags: [ '*' ]
-  pull_request:
-    branches: [ master, develop ]
-
-jobs:
-  unit-tests:
-      name: Unit tests
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      steps:
-        - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v2
-        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v1
-          with:
-            java-version: 11
-        - uses: actions/cache@v2
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Unit tests
-          run: |
-            ./gradlew --build-cache -Pcoverage testFdroidDebugUnitTest --stacktrace
-            ./gradlew --build-cache -Pcoverage jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v1
-          with:
-              flags: unit
diff --git a/.gitignore b/.gitignore
index 5d3321e3f..d3fb6e4e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ out/
 # Gradle files
 .gradle/
 build/
-.build-cache
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -114,6 +113,3 @@ Thumbs.db
 
 !/gradle/wrapper/gradle-wrapper.jar
 .idea/jarRepositories.xml
-
-
-app/src/release/agconnect-services.json
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0ac66f649..d66c3361f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,23 +4,23 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <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" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
+      <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="false" />
+      <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" />
+      <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />
+      <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
+      <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" />
+      <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -134,11 +134,13 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/.travis.yml b/.travis.yml
index 04db3a616..788aeffa7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ jdk: oraclejdk8
 
 env:
  global:
-   - ANDROID_API_LEVEL=30
-   - ANDROID_BUILD_TOOLS_VERSION=30.0.2
+    - ANDROID_API_LEVEL=29
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.3
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.24.0
+    - 0.18.3
 
 android:
  licenses:
@@ -28,37 +28,32 @@ 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 -Pcoverage testFdroidDebugUnitTest --stacktrace --daemon
-  - ./gradlew -Pcoverage connectedFdroidDebugAndroidTest --stacktrace --daemon
+  - ./gradlew -Pcoverage testPlayDebugUnitTest --stacktrace --daemon
+  - ./gradlew -Pcoverage createFdroidDebugCoverageReport --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=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-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 -PenableFirebase --stacktrace;
diff --git a/README.en.md b/README.en.md
index 0f2885cfd..7444cccae 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,8 +1,7 @@
 [Polska wersja README](README.md)
 
 # Wulkanowy
-
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Test%20and%20deploy/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
@@ -12,7 +11,7 @@ Unofficial android VULCAN UONET+ register client for both students and their par
 
 ## Features
 
-* logging in using the email and password
+* logging in using the email and password OR using token and pin
 * functions from the register website:
     * grades
     * grade statistics
@@ -25,29 +24,22 @@ Unofficial android VULCAN UONET+ register client for both students and their par
     * homework
     * notes
     * lucky number
-    * additional lessons
-    * school conferences
-    * student and school information
 * calculation of the average independently of school's preferences
 * notifications, e.g. about a new grade
-* support for multiple accounts with the ability to rename students 
 * dark and black (AMOLED) theme
 * offline mode
 * no ads
 
 ## Download
 
-You can download the current version from the Google Play, F-Droid or Huawei AppGallery store
+You can download the current beta version from the Google Play or the F-Droid 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
 
@@ -55,8 +47,8 @@ You can also download a [development version](https://wulkanowy.github.io/#downl
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
+* [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) 
 
@@ -64,9 +56,6 @@ You can also download a [development version](https://wulkanowy.github.io/#downl
 
 Please contribute to the project either by creating a PR or submitting an issue on GitHub.
 
-For people interested in translating the application into different languages, we provide Crowdin
-https://crowdin.com/project/wulkanowy2
-
 ## License
 
 This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details
diff --git a/README.md b/README.md
index bbc36ab65..61b13444a 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
 [English version of README](README.en.md)
 
 # Wulkanowy
-
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Test%20and%20deploy/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
@@ -12,7 +11,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
 ## Funkcje
 
-* logowanie za pomocą e-maila i hasła
+* logowanie za pomocą e-maila i hasła LUB tokena i pinu
 * funkcje ze strony internetowej dziennika:
     * oceny
     * statystyki ocen
@@ -25,29 +24,22 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
     * zadania domowe
     * uwagi
     * szczęśliwy numerek
-    * dodatkowe lekcje
-    * zebrania w szkole
-    * informacje o uczniu i szkole
 * obliczanie średniej niezależnie od preferencji szkoły
 * powiadomienia np. o nowej ocenie
-* obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
 * ciemny i czarny (AMOLED) motyw
-* tryb offline
+* tryb offilne
 * brak reklam
 
 ## Pobierz
 
-Aktualną wersję możesz pobrać ze sklepu Google Play, F-Droid lub Huawei AppGallery
+Aktualną wersję beta możesz pobrać ze sklepu Google Play lub F-Droid
 
 [<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
@@ -55,9 +47,9 @@ Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#downloa
 
 ## Zbudowana za pomocą
 
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
+* [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) 
 
@@ -65,9 +57,6 @@ Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#downloa
 
 Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
 
-Dla osób zainteresowanych tłumaczeniem aplikacji na różne języki udostępniamy Crowdina
-https://crowdin.com/project/wulkanowy2
-
 ## Licencja
 
 Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
diff --git a/app/bitrise.jks.gpg b/app/bitrise.jks.gpg
deleted file mode 100644
index 1dee91bd9..000000000
Binary files a/app/bitrise.jks.gpg and /dev/null differ
diff --git a/app/build.gradle b/app/build.gradle
index 02a3c90f4..498c7a376 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,41 +1,34 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.huawei.agconnect'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
-        targetSdkVersion 30
-        versionCode 91
-        versionName "1.1.5"
+        targetSdkVersion 29
+        versionCode 62
+        versionName "0.18.3"
         multiDexEnabled true
+        resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
-
-        resValue "string", "app_name", "Wulkanowy"
-        buildConfigField "long", "BUILD_TIMESTAMP", String.valueOf(System.currentTimeMillis())
-
         manifestPlaceholders = [
                 firebase_enabled: project.hasProperty("enableFirebase")
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments += [
+                arguments = [
                         "room.schemaLocation": "$projectDir/schemas".toString(),
                         "room.incremental"   : "true"
                 ]
@@ -44,8 +37,7 @@ android {
     }
 
     sourceSets {
-        // https://github.com/robolectric/robolectric/issues/3928#issuecomment-395309991
-        debug.assets.srcDirs += files("$projectDir/schemas".toString())
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -76,51 +68,30 @@ android {
     flavorDimensions "platform"
 
     productFlavors {
-        hms {
-            dimension "platform"
-            minSdkVersion 19
-            manifestPlaceholders = [
-                    install_channel: "AppGallery"
-            ]
-        }
-
         play {
             dimension "platform"
-            manifestPlaceholders = [
-                    install_channel: "Google Play"
-            ]
         }
 
         fdroid {
             dimension "platform"
-            manifestPlaceholders = [
-                    install_channel: "F-Droid"
-            ]
         }
     }
 
-    buildFeatures {
-        viewBinding = true
+    viewBinding {
+        enabled = true
     }
 
     lintOptions {
         disable 'HardwareIds'
     }
 
-    testOptions.unitTests {
-        includeAndroidResources = true
-    }
-
     compileOptions {
-        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        useIR = true
         jvmTarget = "1.8"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
@@ -137,117 +108,103 @@ play {
     serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
     serviceAccountCredentials = file('key.p12')
     defaultToAppBundles = false
-    track = 'production'
-    updatePriority = 1
-}
-
-huaweiPublish {
-    instances {
-        hmsRelease {
-            clientId = System.getenv("AGC_CLIENT_ID")
-            clientSecret = System.getenv("AGC_CLIENT_SECRET")
-            buildFormat = "apk"
-            deployType = "draft"
-        }
-    }
+    track = 'alpha'
 }
 
 ext {
-    work_manager = "2.5.0"
-    work_hilt = "1.0.0-beta01"
-    room = "2.3.0-rc01"
-    chucker = "3.4.0"
-    mockk = "1.11.0"
-    moshi = "1.11.0"
+    work_manager = "2.3.4"
+    room = "2.2.5"
+    dagger = "2.28"
+    chucker = "3.2.0"
+    mockk = "1.9.2"
+}
+
+configurations.all {
+    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.1.5"
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    implementation "io.github.wulkanowy:sdk:0.18.3"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
-
-    implementation "androidx.core:core-ktx:1.3.2"
-    implementation "androidx.activity:activity-ktx:1.2.2"
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.appcompat:appcompat-resources:1.2.0"
-    implementation "androidx.fragment:fragment-ktx:1.3.2"
-    implementation "androidx.annotation:annotation:1.2.0"
+    implementation "androidx.core:core-ktx:1.2.0"
+    implementation "androidx.activity:activity-ktx:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0-rc01"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
+    implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
     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"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.3.0"
-    implementation "com.github.wulkanowy:material-chips-input:2.2.0"
+    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.mikhaellopez:circularimageview:4.2.0'
+    implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
-    playImplementation "androidx.work:work-gcm:$work_manager"
+    implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation 'com.github.PaulinaSadowska:RxWorkManagerObservers:1.0.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:hilt-android:$hilt_version"
-    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-    implementation "androidx.hilt:hilt-work:$work_hilt"
-    kapt "androidx.hilt:hilt-compiler:$work_hilt"
+    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.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
-    implementation "com.github.YarikSOffice:lingver:1.3.0"
+    implementation "com.github.YarikSOffice:lingver:1.2.2"
 
-    implementation "com.squareup.moshi:moshi:$moshi"
-    implementation "com.squareup.moshi:moshi-adapters:$moshi"
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.8"
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
+
+    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.4"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     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.1.1"
+    implementation "io.coil-kt:coil:0.11.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
-    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
 
-    playImplementation platform('com.google.firebase:firebase-bom:26.7.0')
-    playImplementation 'com.google.firebase:firebase-analytics-ktx'
-    playImplementation 'com.google.firebase:firebase-messaging:'
-    playImplementation 'com.google.firebase:firebase-crashlytics:'
-    playImplementation 'com.google.android.play:core-ktx:1.8.1'
-
-    hmsImplementation 'com.huawei.hms:hianalytics:5.2.0.301'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.5.1.200'
+    playImplementation 'com.google.firebase:firebase-analytics:17.4.2'
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.0.7'
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.0.7"
+    playImplementation 'com.google.firebase:firebase-messaging:20.2.0'
+    playImplementation 'com.google.firebase:firebase-crashlytics:17.0.0'
+    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
     debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
-    testImplementation "junit:junit:4.13.2"
+    testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "org.threeten:threetenbp:1.4.4"
+    testImplementation "org.mockito:mockito-inline:3.3.3"
 
-    testImplementation 'org.robolectric:robolectric:4.5.1'
-    testImplementation "androidx.test:runner:1.3.0"
-    testImplementation "androidx.test.ext:junit:1.1.2"
-    testImplementation "androidx.test:core:1.3.0"
-    testImplementation "androidx.room:room-testing:$room"
-    testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
-    kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
-
-    androidTestImplementation "androidx.test:core:1.3.0"
-    androidTestImplementation "androidx.test:runner:1.3.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test:core:1.2.0"
+    androidTestImplementation "androidx.test:runner:1.2.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
     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.3.3"
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 94469fbc0..e9abfb613 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -7,7 +7,6 @@ jacoco {
 
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
 }
 
 task jacocoTestReport(type: JacocoReport) {
@@ -36,13 +35,13 @@ task jacocoTestReport(type: JacocoReport) {
             dir: "$buildDir/intermediates/classes/debug",
             excludes: excludes
     ) + fileTree(
-            dir: "$buildDir/tmp/kotlin-classes/fdroidDebug",
+            dir: "$buildDir/tmp/kotlin-classes/playDebug",
             excludes: excludes
     ))
 
     sourceDirectories.setFrom(files([
             "src/main/java",
-            "src/fdroid/java"
+            "src/play/java"
     ]))
     executionData.setFrom(fileTree(
             dir: project.projectDir,
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index fd9482613..1a8b8c329 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,21 +1,40 @@
-# General
+# Optimizations
+-optimizationpasses 5
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontskipnonpubliclibraryclassmembers
+-dontpreverify
 -dontobfuscate
+-allowaccessmodification
+-repackageclasses ''
+-verbose
 
 
-#Config for wulkanowy
+#Keep all wulkanowy files
 -keep class io.github.wulkanowy.** {*;}
 
 
-#Config for firebase crashlitycs
+#Config for anallitycs
+-keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
+-keep class com.crashlytics.** {*;}
 -keep public class * extends java.lang.Exception
+-dontwarn com.crashlytics.**
 
 
-#Config for Okio and OkHttp
--dontwarn javax.annotation.**
+#Config for OkHttp
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
 -dontwarn org.codehaus.mojo.animal_sniffer.*
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
+-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
@@ -24,3 +43,10 @@
 
 #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/25.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
index 474824df6..e99a11d4a 100644
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
@@ -1741,4 +1741,4 @@
       "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd101f5a26a024f62e6fee161e421b882')"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
deleted file mode 100644
index 21005f9c6..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
+++ /dev/null
@@ -1,1768 +0,0 @@
-{
-  "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
deleted file mode 100644
index 46b777513..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
+++ /dev/null
@@ -1,1774 +0,0 @@
-{
-  "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/schemas/io.github.wulkanowy.data.db.AppDatabase/28.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/28.json
deleted file mode 100644
index c7c4c0331..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/28.json
+++ /dev/null
@@ -1,1842 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 28,
-    "identityHash": "3a449a55ea73fbfbb7973f1f3f834e10",
-    "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "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, '3a449a55ea73fbfbb7973f1f3f834e10')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/29.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/29.json
deleted file mode 100644
index 3e863c578..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/29.json
+++ /dev/null
@@ -1,1898 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 29,
-    "identityHash": "30e4647c7dd84a6ac9b2f9f3ef7d3264",
-    "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": "GradePartialStatistics",
-        "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, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT 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": "classAverage",
-            "columnName": "class_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAverage",
-            "columnName": "student_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classAmounts",
-            "columnName": "class_amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAmounts",
-            "columnName": "student_amounts",
-            "affinity": "TEXT",
-            "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": "GradeSemesterStatistics",
-        "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, `amounts` TEXT NOT NULL, `student_grade` 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": "amounts",
-            "columnName": "amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentGrade",
-            "columnName": "student_grade",
-            "affinity": "INTEGER",
-            "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "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, '30e4647c7dd84a6ac9b2f9f3ef7d3264')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/30.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/30.json
deleted file mode 100644
index 309f4ac09..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/30.json
+++ /dev/null
@@ -1,1954 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 30,
-    "identityHash": "891980e378373d0a17bd341f9b07cc74",
-    "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": "GradePartialStatistics",
-        "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, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT 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": "classAverage",
-            "columnName": "class_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAverage",
-            "columnName": "student_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classAmounts",
-            "columnName": "class_amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAmounts",
-            "columnName": "student_amounts",
-            "affinity": "TEXT",
-            "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": "GradeSemesterStatistics",
-        "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, `amounts` TEXT NOT NULL, `student_grade` 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": "amounts",
-            "columnName": "amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentGrade",
-            "columnName": "student_grade",
-            "affinity": "INTEGER",
-            "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TimetableAdditional",
-        "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, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` 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": "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
-          }
-        ],
-        "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, '891980e378373d0a17bd341f9b07cc74')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/31.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/31.json
deleted file mode 100644
index 4935a9018..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/31.json
+++ /dev/null
@@ -1,2136 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 31,
-    "identityHash": "d642512ffa5fe81ae9308c9c55612539",
-    "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": "GradePartialStatistics",
-        "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, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT 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": "classAverage",
-            "columnName": "class_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAverage",
-            "columnName": "student_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classAmounts",
-            "columnName": "class_amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAmounts",
-            "columnName": "student_amounts",
-            "affinity": "TEXT",
-            "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": "GradeSemesterStatistics",
-        "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, `amounts` TEXT NOT NULL, `student_grade` 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": "amounts",
-            "columnName": "amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentGrade",
-            "columnName": "student_grade",
-            "affinity": "INTEGER",
-            "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": "unitId",
-            "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": "userLoginId",
-            "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": "userLoginId",
-            "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TimetableAdditional",
-        "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, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` 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": "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
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "StudentInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `first_guardian_full_name` TEXT NOT NULL, `first_guardian_kinship` TEXT NOT NULL, `first_guardian_address` TEXT NOT NULL, `first_guardian_phones` TEXT NOT NULL, `first_guardian_email` TEXT NOT NULL, `second_guardian_full_name` TEXT NOT NULL, `second_guardian_kinship` TEXT NOT NULL, `second_guardian_address` TEXT NOT NULL, `second_guardian_phones` TEXT NOT NULL, `second_guardian_email` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullName",
-            "columnName": "full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstName",
-            "columnName": "first_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondName",
-            "columnName": "second_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "surname",
-            "columnName": "surname",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthDate",
-            "columnName": "birth_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthPlace",
-            "columnName": "birth_place",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gender",
-            "columnName": "gender",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasPolishCitizenship",
-            "columnName": "has_polish_citizenship",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "familyName",
-            "columnName": "family_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentsNames",
-            "columnName": "parents_names",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registeredAddress",
-            "columnName": "registered_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "correspondenceAddress",
-            "columnName": "correspondence_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "phoneNumber",
-            "columnName": "phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "cellPhoneNumber",
-            "columnName": "cell_phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.fullName",
-            "columnName": "first_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.kinship",
-            "columnName": "first_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.address",
-            "columnName": "first_guardian_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.phones",
-            "columnName": "first_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.email",
-            "columnName": "first_guardian_email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.fullName",
-            "columnName": "second_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.kinship",
-            "columnName": "second_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.address",
-            "columnName": "second_guardian_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.phones",
-            "columnName": "second_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.email",
-            "columnName": "second_guardian_email",
-            "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, 'd642512ffa5fe81ae9308c9c55612539')"
-    ]
-  }
-}
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/32.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/32.json
deleted file mode 100644
index 3621be48a..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/32.json
+++ /dev/null
@@ -1,2142 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 32,
-    "identityHash": "9531cdc8b3f0e62db5ab6ebe66837a28",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT 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": "nick",
-            "columnName": "nick",
-            "affinity": "TEXT",
-            "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": "GradePartialStatistics",
-        "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, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT 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": "classAverage",
-            "columnName": "class_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAverage",
-            "columnName": "student_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classAmounts",
-            "columnName": "class_amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAmounts",
-            "columnName": "student_amounts",
-            "affinity": "TEXT",
-            "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": "GradeSemesterStatistics",
-        "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, `amounts` TEXT NOT NULL, `student_grade` 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": "amounts",
-            "columnName": "amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentGrade",
-            "columnName": "student_grade",
-            "affinity": "INTEGER",
-            "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": "unitId",
-            "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": "userLoginId",
-            "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": "userLoginId",
-            "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TimetableAdditional",
-        "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, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` 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": "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
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "StudentInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `first_guardian_full_name` TEXT NOT NULL, `first_guardian_kinship` TEXT NOT NULL, `first_guardian_address` TEXT NOT NULL, `first_guardian_phones` TEXT NOT NULL, `first_guardian_email` TEXT NOT NULL, `second_guardian_full_name` TEXT NOT NULL, `second_guardian_kinship` TEXT NOT NULL, `second_guardian_address` TEXT NOT NULL, `second_guardian_phones` TEXT NOT NULL, `second_guardian_email` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullName",
-            "columnName": "full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstName",
-            "columnName": "first_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondName",
-            "columnName": "second_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "surname",
-            "columnName": "surname",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthDate",
-            "columnName": "birth_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthPlace",
-            "columnName": "birth_place",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gender",
-            "columnName": "gender",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasPolishCitizenship",
-            "columnName": "has_polish_citizenship",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "familyName",
-            "columnName": "family_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentsNames",
-            "columnName": "parents_names",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registeredAddress",
-            "columnName": "registered_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "correspondenceAddress",
-            "columnName": "correspondence_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "phoneNumber",
-            "columnName": "phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "cellPhoneNumber",
-            "columnName": "cell_phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.fullName",
-            "columnName": "first_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.kinship",
-            "columnName": "first_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.address",
-            "columnName": "first_guardian_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.phones",
-            "columnName": "first_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.email",
-            "columnName": "first_guardian_email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.fullName",
-            "columnName": "second_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.kinship",
-            "columnName": "second_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.address",
-            "columnName": "second_guardian_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.phones",
-            "columnName": "second_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondGuardian.email",
-            "columnName": "second_guardian_email",
-            "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, '9531cdc8b3f0e62db5ab6ebe66837a28')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/33.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/33.json
deleted file mode 100644
index 255c196e5..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/33.json
+++ /dev/null
@@ -1,2142 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 33,
-    "identityHash": "c024cc4e19e009a03303e2bfe5c34b48",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT 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": "nick",
-            "columnName": "nick",
-            "affinity": "TEXT",
-            "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": "GradePartialStatistics",
-        "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, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT 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": "classAverage",
-            "columnName": "class_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAverage",
-            "columnName": "student_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classAmounts",
-            "columnName": "class_amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAmounts",
-            "columnName": "student_amounts",
-            "affinity": "TEXT",
-            "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": "GradeSemesterStatistics",
-        "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, `amounts` TEXT NOT NULL, `student_grade` 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": "amounts",
-            "columnName": "amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentGrade",
-            "columnName": "student_grade",
-            "affinity": "INTEGER",
-            "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": "unitId",
-            "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": "userLoginId",
-            "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": "userLoginId",
-            "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TimetableAdditional",
-        "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, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` 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": "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
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "StudentInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullName",
-            "columnName": "full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstName",
-            "columnName": "first_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondName",
-            "columnName": "second_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "surname",
-            "columnName": "surname",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthDate",
-            "columnName": "birth_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthPlace",
-            "columnName": "birth_place",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gender",
-            "columnName": "gender",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasPolishCitizenship",
-            "columnName": "has_polish_citizenship",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "familyName",
-            "columnName": "family_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentsNames",
-            "columnName": "parents_names",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registeredAddress",
-            "columnName": "registered_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "correspondenceAddress",
-            "columnName": "correspondence_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "phoneNumber",
-            "columnName": "phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "cellPhoneNumber",
-            "columnName": "cell_phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.fullName",
-            "columnName": "first_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.kinship",
-            "columnName": "first_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.address",
-            "columnName": "first_guardian_address",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.phones",
-            "columnName": "first_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.email",
-            "columnName": "first_guardian_email",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.fullName",
-            "columnName": "second_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.kinship",
-            "columnName": "second_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.address",
-            "columnName": "second_guardian_address",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.phones",
-            "columnName": "second_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.email",
-            "columnName": "second_guardian_email",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "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, 'c024cc4e19e009a03303e2bfe5c34b48')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/34.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/34.json
deleted file mode 100644
index 6a56ac64e..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/34.json
+++ /dev/null
@@ -1,2142 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 34,
-    "identityHash": "c024cc4e19e009a03303e2bfe5c34b48",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT 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": "nick",
-            "columnName": "nick",
-            "affinity": "TEXT",
-            "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": "GradePartialStatistics",
-        "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, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT 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": "classAverage",
-            "columnName": "class_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAverage",
-            "columnName": "student_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classAmounts",
-            "columnName": "class_amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAmounts",
-            "columnName": "student_amounts",
-            "affinity": "TEXT",
-            "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": "GradeSemesterStatistics",
-        "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, `amounts` TEXT NOT NULL, `student_grade` 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": "amounts",
-            "columnName": "amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentGrade",
-            "columnName": "student_grade",
-            "affinity": "INTEGER",
-            "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": "unitId",
-            "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": "userLoginId",
-            "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": "userLoginId",
-            "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TimetableAdditional",
-        "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, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` 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": "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
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "StudentInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullName",
-            "columnName": "full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstName",
-            "columnName": "first_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondName",
-            "columnName": "second_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "surname",
-            "columnName": "surname",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthDate",
-            "columnName": "birth_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthPlace",
-            "columnName": "birth_place",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gender",
-            "columnName": "gender",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasPolishCitizenship",
-            "columnName": "has_polish_citizenship",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "familyName",
-            "columnName": "family_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentsNames",
-            "columnName": "parents_names",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registeredAddress",
-            "columnName": "registered_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "correspondenceAddress",
-            "columnName": "correspondence_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "phoneNumber",
-            "columnName": "phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "cellPhoneNumber",
-            "columnName": "cell_phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.fullName",
-            "columnName": "first_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.kinship",
-            "columnName": "first_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.address",
-            "columnName": "first_guardian_address",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.phones",
-            "columnName": "first_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.email",
-            "columnName": "first_guardian_email",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.fullName",
-            "columnName": "second_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.kinship",
-            "columnName": "second_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.address",
-            "columnName": "second_guardian_address",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.phones",
-            "columnName": "second_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.email",
-            "columnName": "second_guardian_email",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "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, 'c024cc4e19e009a03303e2bfe5c34b48')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/35.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/35.json
deleted file mode 100644
index f166b2d72..000000000
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/35.json
+++ /dev/null
@@ -1,2148 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 35,
-    "identityHash": "15fb91ec180fe60bf400cfa729c3418d",
-    "entities": [
-      {
-        "tableName": "Students",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER 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": "nick",
-            "columnName": "nick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "avatarColor",
-            "columnName": "avatar_color",
-            "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": "GradePartialStatistics",
-        "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, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT 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": "classAverage",
-            "columnName": "class_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAverage",
-            "columnName": "student_average",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "classAmounts",
-            "columnName": "class_amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentAmounts",
-            "columnName": "student_amounts",
-            "affinity": "TEXT",
-            "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": "GradeSemesterStatistics",
-        "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, `amounts` TEXT NOT NULL, `student_grade` 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": "amounts",
-            "columnName": "amounts",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentGrade",
-            "columnName": "student_grade",
-            "affinity": "INTEGER",
-            "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, `unread_by` INTEGER NOT NULL, `read_by` 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, `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": "unreadBy",
-            "columnName": "unread_by",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "readBy",
-            "columnName": "read_by",
-            "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": "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": "unitId",
-            "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": "userLoginId",
-            "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": "userLoginId",
-            "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": []
-      },
-      {
-        "tableName": "Conferences",
-        "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, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER 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": "diaryId",
-            "columnName": "diary_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subject",
-            "columnName": "subject",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "agenda",
-            "columnName": "agenda",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "presentOnConference",
-            "columnName": "present_on_conference",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "conferenceId",
-            "columnName": "conference_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "date",
-            "columnName": "date",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TimetableAdditional",
-        "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, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` 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": "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
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "StudentInfo",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "studentId",
-            "columnName": "student_id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullName",
-            "columnName": "full_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstName",
-            "columnName": "first_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "secondName",
-            "columnName": "second_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "surname",
-            "columnName": "surname",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthDate",
-            "columnName": "birth_date",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "birthPlace",
-            "columnName": "birth_place",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "gender",
-            "columnName": "gender",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasPolishCitizenship",
-            "columnName": "has_polish_citizenship",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "familyName",
-            "columnName": "family_name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parentsNames",
-            "columnName": "parents_names",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "address",
-            "columnName": "address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "registeredAddress",
-            "columnName": "registered_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "correspondenceAddress",
-            "columnName": "correspondence_address",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "phoneNumber",
-            "columnName": "phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "cellPhoneNumber",
-            "columnName": "cell_phone_number",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "email",
-            "columnName": "email",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "firstGuardian.fullName",
-            "columnName": "first_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.kinship",
-            "columnName": "first_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.address",
-            "columnName": "first_guardian_address",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.phones",
-            "columnName": "first_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "firstGuardian.email",
-            "columnName": "first_guardian_email",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.fullName",
-            "columnName": "second_guardian_full_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.kinship",
-            "columnName": "second_guardian_kinship",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.address",
-            "columnName": "second_guardian_address",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.phones",
-            "columnName": "second_guardian_phones",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "secondGuardian.email",
-            "columnName": "second_guardian_email",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "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, '15fb91ec180fe60bf400cfa729c3418d')"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
similarity index 66%
rename from app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
index f9fc76311..611161e58 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.data.db.migrations
 
-import android.content.Context
 import androidx.preference.PreferenceManager
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
@@ -9,7 +8,6 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.utils.AppInfo
 import org.junit.Rule
 
 abstract class AbstractMigrationTest {
@@ -24,17 +22,12 @@ abstract class AbstractMigrationTest {
     )
 
     fun getMigratedRoomDatabase(): AppDatabase {
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        val database = Room.databaseBuilder(
-            ApplicationProvider.getApplicationContext(),
-            AppDatabase::class.java,
-            dbName
-        ).addMigrations(
-            *AppDatabase.getMigrations(
-                SharedPrefProvider(PreferenceManager.getDefaultSharedPreferences(context)),
-                AppInfo()
+        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
+            AppDatabase::class.java, dbName)
+            .addMigrations(*AppDatabase.getMigrations(SharedPrefProvider(PreferenceManager
+                .getDefaultSharedPreferences(ApplicationProvider.getApplicationContext())))
             )
-        ).build()
+            .build()
         // close the database and release any stream resources when the test finishes
         helper.closeWhenFinished(database)
         return database
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
similarity index 86%
rename from app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
index a02904733..0bbcc4271 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@@ -2,20 +2,13 @@ package io.github.wulkanowy.data.db.migrations
 
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
-import android.os.Build
 import androidx.sqlite.db.SupportSQLiteDatabase
-import dagger.hilt.android.testing.HiltAndroidTest
-import dagger.hilt.android.testing.HiltTestApplication
-import kotlinx.coroutines.runBlocking
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 
-@HiltAndroidTest
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
+@RunWith(AndroidJUnit4::class)
 class Migration12Test : AbstractMigrationTest() {
 
     @Test
@@ -36,7 +29,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(2, students.size)
 
@@ -65,7 +58,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(1, students.size)
 
@@ -91,7 +84,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(3, students.size)
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
similarity index 83%
rename from app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
rename to app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index 2350da459..6f9406f6d 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -2,26 +2,16 @@ package io.github.wulkanowy.data.db.migrations
 
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
-import android.os.Build
 import androidx.sqlite.db.SupportSQLiteDatabase
-import dagger.hilt.android.testing.HiltAndroidTest
-import dagger.hilt.android.testing.HiltTestApplication
 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.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import java.time.LocalDate.of
+import org.threeten.bp.LocalDate.of
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-@HiltAndroidTest
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
 class Migration13Test : AbstractMigrationTest() {
 
     @Test
@@ -36,7 +26,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(3, students.size)
 
@@ -70,7 +60,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
+        val students = db.studentDao.loadAll().blockingGet()
 
         assertEquals(2, students.size)
 
@@ -130,23 +120,23 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals(2, first.diaryId)
         }
 
-        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.second }.second }
+            assertEquals(1970, it[0].first.schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].first.end)
+            assertEquals(of(1970, 1, 1), it[0].first.start)
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
 
-        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)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.second }.second }
+            assertFalse(it[0].second)
+            assertFalse(it[1].second)
+            assertFalse(it[2].second)
+            assertTrue(it[3].second)
         }
     }
 
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..bbbfd83dd
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.entities.Student
+import org.threeten.bp.LocalDateTime
+
+fun getStudent(): Student {
+    return Student(
+        email = "test",
+        password = "test123",
+        schoolSymbol = "23",
+        scrapperBaseUrl = "fakelog.cf",
+        loginType = "AUTO",
+        isCurrent = true,
+        studentName = "",
+        schoolShortName = "",
+        schoolName = "",
+        studentId = 0,
+        classId = 1,
+        symbol = "",
+        registrationDate = LocalDateTime.now(),
+        className = "",
+        loginMode = "API",
+        certificateKey = "",
+        privateKey = "",
+        mobileBaseUrl = "",
+        userLoginId = 0,
+        isParent = false
+    )
+}
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
new file mode 100644
index 000000000..7dc93c4a4
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..c7ede6ae5
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.repositories.attendance
+
+import androidx.room.Room
+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.Attendance
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class AttendanceLocalTest {
+
+    private lateinit var attendanceLocal: AttendanceLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
+        attendanceLocal = AttendanceLocal(testDb.attendanceDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        attendanceLocal.saveAttendance(listOf(
+            Attendance(1, 2, 3, of(2018, 9, 10), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name),
+            Attendance(1, 2, 3, of(2018, 9, 14), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.WAITING.name),
+            Attendance(1, 2, 3, of(2018, 9, 17), 0, "", "", false, false, false, false, false, false, false, SentExcuseStatus.ACCEPTED.name)
+        ))
+
+        val attendance = attendanceLocal
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
+        assertEquals(2, attendance.size)
+        assertEquals(attendance[0].date, of(2018, 9, 10))
+        assertEquals(attendance[1].date, of(2018, 9, 14))
+    }
+}
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
new file mode 100644
index 000000000..50badc468
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.data.repositories.completedlessons
+
+import androidx.room.Room
+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.CompletedLesson
+import io.github.wulkanowy.data.db.entities.Semester
+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 org.threeten.bp.LocalDate.of
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class CompletedLessonsLocalTest {
+
+    private lateinit var completedLessonsLocal: CompletedLessonsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        completedLessonsLocal.saveCompletedLessons(listOf(
+            getCompletedLesson(of(2018, 9, 10), 1),
+            getCompletedLesson(of(2018, 9, 14), 2),
+            getCompletedLesson(of(2018, 9, 17), 3)
+        ))
+
+        val completed = completedLessonsLocal
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
+        assertEquals(2, completed.size)
+        assertEquals(completed[0].date, of(2018, 9, 10))
+        assertEquals(completed[1].date, of(2018, 9, 14))
+    }
+
+    private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
+        return CompletedLesson(1, 2, date, number, "", "", "", "", "", "", "")
+    }
+}
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
new file mode 100644
index 000000000..98dfc88eb
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.repositories.exam
+
+import androidx.room.Room
+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.Exam
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class ExamLocalTest {
+
+    private lateinit var examLocal: ExamLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java).build()
+        examLocal = ExamLocal(testDb.examsDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        examLocal.saveExams(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(), "", "", "", "", "", "")
+        ))
+
+        val exams = examLocal
+            .getExams(Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1),
+                of(2018, 9, 10),
+                of(2018, 9, 14)
+            )
+            .blockingGet()
+        assertEquals(2, exams.size)
+        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
new file mode 100644
index 000000000..eb1a55480
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import androidx.room.Room
+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 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 kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeLocalTest {
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        gradeLocal.saveGrades(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)
+        ))
+
+        val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
+
+        val grades = gradeLocal
+            .getGradesDetails(semester)
+            .blockingGet()
+
+        assertEquals(2, grades.size)
+        assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
+        assertEquals(grades[1].date, LocalDate.of(2019, 2, 28))
+    }
+}
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
new file mode 100644
index 000000000..cdd514772
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -0,0 +1,182 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import android.os.Build.VERSION_CODES.P
+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.db.AppDatabase
+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.github.wulkanowy.sdk.pojo.Grade
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.reactivex.Single
+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 kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+@SdkSuppress(minSdkVersion = P)
+@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
+
+    private lateinit var gradeRemote: GradeRemote
+
+    private lateinit var gradeLocal: GradeLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        gradeRemote = GradeRemote(mockSdk)
+
+        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
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @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")
+        ) to emptyList())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+
+    @Test
+    fun mitigateOldGradesNotifications() {
+        gradeLocal.saveGrades(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")
+        ))
+
+        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")
+        ) to emptyList())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().first.sortedByDescending { it.date }
+
+        assertFalse { grades[0].isRead }
+        assertFalse { grades[1].isRead }
+        assertTrue { grades[2].isRead }
+        assertTrue { grades[3].isRead }
+    }
+
+    @Test
+    fun subtractLocaleDuplicateGrades() {
+        gradeLocal.saveGrades(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")
+        ))
+
+        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")
+        ) to emptyList())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(2, grades.first.size)
+    }
+
+    @Test
+    fun subtractRemoteDuplicateGrades() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        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")
+        ) to emptyList())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.first.size)
+    }
+
+    @Test
+    fun emptyLocal() {
+        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")
+        ) to emptyList())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.first.size)
+    }
+
+    @Test
+    fun emptyRemote() {
+        gradeLocal.saveGrades(listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ))
+
+        every { mockSdk.getGrades(1) } returns Single.just(emptyList<Grade>() to emptyList())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(0, grades.first.size)
+    }
+}
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
new file mode 100644
index 000000000..9146934bf
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import org.threeten.bp.LocalDate
+import io.github.wulkanowy.sdk.pojo.Grade as GradeRemote
+import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
+
+fun createGradeLocal(value: Int, weight: Double, date: LocalDate, desc: String, semesterId: Int = 1): GradeLocal {
+    return GradeLocal(
+        semesterId = semesterId,
+        studentId = 1,
+        modifier = .0,
+        teacher = "",
+        subject = "",
+        date = date,
+        color = "",
+        comment = "",
+        description = desc,
+        entry = "",
+        gradeSymbol = "",
+        value = value.toDouble(),
+        weight = "",
+        weightValue = weight
+    )
+}
+
+fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
+    return GradeRemote(
+        subject = "",
+        color = "",
+        comment = "",
+        date = date,
+        description = desc,
+        entry = "",
+        modifier = .0,
+        symbol = "",
+        teacher = "",
+        value = value.toDouble(),
+        weight = weight.toString(),
+        weightValue = weight
+    )
+}
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
new file mode 100644
index 000000000..bd3635fea
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -0,0 +1,106 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import androidx.room.Room
+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.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.db.entities.Semester
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate.now
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class GradeStatisticsLocalTest {
+
+    private lateinit var gradeStatisticsLocal: GradeStatisticsLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        gradeStatisticsLocal = GradeStatisticsLocal(testDb.gradeStatistics, testDb.gradePointsStatistics)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndRead_subject() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Matematyka").blockingGet()
+        assertEquals(1, stats.size)
+        assertEquals(stats[0].subject, "Matematyka")
+    }
+
+    @Test
+    fun saveAndRead_all() {
+        gradeStatisticsLocal.saveGradesStatistics(listOf(
+            getGradeStatistics("Matematyka", 2, 1),
+            getGradeStatistics("Chemia", 2, 1),
+            getGradeStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesStatistics(getSemester(), false, "Wszystkie").blockingGet()
+        assertEquals(3, stats.size)
+        assertEquals(stats[0].subject, "Wszystkie")
+        assertEquals(stats[1].subject, "Matematyka")
+        assertEquals(stats[2].subject, "Chemia")
+    }
+
+    @Test
+    fun saveAndRead_points() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
+            getGradePointsStatistics("Matematyka", 2, 1),
+            getGradePointsStatistics("Chemia", 2, 1),
+            getGradePointsStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        with(stats[0]) {
+            assertEquals(subject, "Matematyka")
+            assertEquals(others, 5.0)
+            assertEquals(student, 5.0)
+        }
+    }
+
+    @Test
+    fun saveAndRead_subjectEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Matematyka").blockingGet()
+        assertEquals(null, stats)
+    }
+
+    @Test
+    fun saveAndRead_allEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(getSemester(), "Wszystkie").blockingGet()
+        assertEquals(null, 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 {
+        return GradeStatistics(studentId, semesterId, subject, 5, 5, false)
+    }
+
+    private fun getGradePointsStatistics(subject: String, studentId: Int, semesterId: Int): GradePointsStatistics {
+        return GradePointsStatistics(studentId, semesterId, subject, 5.0, 5.0)
+    }
+}
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
new file mode 100644
index 000000000..65ef1fcbf
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -0,0 +1,49 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import androidx.room.Room
+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 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.now
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class LuckyNumberLocalTest {
+
+    private lateinit var luckyNumberLocal: LuckyNumberLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
+
+        val luckyNumber = luckyNumberLocal.getLuckyNumber(Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", 1, false, now()),
+            LocalDate.of(2019, 1, 20)
+        ).blockingGet()
+
+        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
new file mode 100644
index 000000000..22578e41e
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+import androidx.room.Room
+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.Recipient
+import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDateTime
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class RecipientLocalTest {
+
+    private lateinit var recipientLocal: RecipientLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        recipientLocal = RecipientLocal(testDb.recipientDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        recipientLocal.saveRecipients(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")
+        ))
+
+        val recipients = recipientLocal.getRecipients(
+            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", 1, true, LocalDateTime.now()),
+            2,
+            ReportingUnit(1, 4, "", 0, "", emptyList())
+        ).blockingGet()
+
+        assertEquals(2, recipients.size)
+        assertEquals(1, recipients[0].studentId)
+        assertEquals("3rPracownik", recipients[1].realId)
+        assertEquals("Kowalski Jan", recipients[0].name)
+        assertEquals("Kowalska Karolina [KK] - Pracownik (Fake123456)", recipients[1].realName)
+        assertEquals(3, recipients[0].loginId)
+        assertEquals(4, recipients[1].unitId)
+        assertEquals(2, recipients[0].role)
+        assertEquals("hash", recipients[1].hash)
+    }
+}
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
new file mode 100644
index 000000000..530bfb3f7
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -0,0 +1,44 @@
+package io.github.wulkanowy.data.repositories.student
+
+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.db.AppDatabase
+import io.github.wulkanowy.data.repositories.getStudent
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class StudentLocalTest {
+
+    private lateinit var studentLocal: StudentLocal
+
+    private lateinit var testDb: AppDatabase
+
+    private val student = getStudent()
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
+            .build()
+        studentLocal = StudentLocal(testDb.studentDao, context)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        studentLocal.saveStudents(listOf(student)).blockingGet()
+
+        val student = studentLocal.getCurrentStudent(true).blockingGet()
+        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
new file mode 100644
index 000000000..aa35fe790
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -0,0 +1,48 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.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(
+        studentId = 1,
+        diaryId = 2,
+        number = number,
+        start = start,
+        end = now(),
+        date = start.toLocalDate(),
+        subject = subject,
+        subjectOld = "",
+        group = "",
+        room = room,
+        roomOld = "",
+        teacher = teacher,
+        teacherOld = "",
+        info = "",
+        isStudentPlan = true,
+        changes = changes,
+        canceled = false
+    )
+}
+
+fun createTimetableRemote(start: LocalDateTime, number: Int = 1, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
+    return TimetableRemote(
+        number = number,
+        start = start,
+        end = start.plusMinutes(45),
+        date = start.toLocalDate(),
+        subject = subject,
+        group = "",
+        room = room,
+        teacher = teacher,
+        info = "",
+        changes = changes,
+        canceled = false,
+        roomOld = "",
+        subjectOld = "",
+        teacherOld = "",
+        studentPlan = true
+    )
+}
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
new file mode 100644
index 000000000..a66e5843c
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -0,0 +1,53 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import androidx.room.Room
+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 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 kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class TimetableLocalTest {
+
+    private lateinit var timetableDb: TimetableLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun createDb() {
+        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+            .build()
+        timetableDb = TimetableLocal(testDb.timetableDao)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        timetableDb.saveTimetable(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)
+        ))
+
+        val exams = timetableDb.getTimetable(
+            Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1),
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 14)
+        ).blockingGet()
+
+        assertEquals(2, exams.size)
+        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
+    }
+}
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
new file mode 100644
index 000000000..75f2f0b83
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -0,0 +1,166 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import android.os.Build.VERSION_CODES.P
+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.db.AppDatabase
+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.data.repositories.getStudent
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.sdk.Sdk
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.reactivex.Single
+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 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
+    private lateinit var studentMock: Student
+
+    private val student = getStudent()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    @MockK
+    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
+
+    private lateinit var timetableRemote: TimetableRemote
+
+    private lateinit var timetableLocal: TimetableLocal
+
+    private lateinit var testDb: AppDatabase
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+        testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
+        timetableLocal = TimetableLocal(testDb.timetableDao)
+        timetableRemote = TimetableRemote(mockSdk)
+
+        every { timetableNotificationSchedulerHelper.scheduleNotifications(any(), any()) } returns mockk()
+        every { timetableNotificationSchedulerHelper.cancelScheduled(any(), any()) } returns mockk()
+
+        every { studentMock.studentId } returns 1
+        every { studentMock.studentName } returns "Jan Kowalski"
+
+        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
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @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")
+        ))
+
+        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")
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
+
+        assertEquals(4, lessons.size)
+        assertEquals("123", lessons[0].room)
+        assertEquals("321", lessons[1].room)
+        assertEquals("213", lessons[2].room)
+    }
+
+    @Test
+    fun copyTeacherToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(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),
+            createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+
+            createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "Joanna Wtorkowska", false),
+            createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "Joanna Środowska", true),
+            createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "Joanna Środowska", true),
+
+            createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "", false),
+            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)
+        ))
+
+        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),
+
+            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),
+
+            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)
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote, timetableNotificationSchedulerHelper)
+            .getTimetable(student, semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
+            .blockingGet()
+
+        assertEquals(12, lessons.size)
+
+        assertEquals("Paweł Poniedziałkowski", lessons[0].teacher)
+        assertEquals("Jakub Wtorkowski", lessons[1].teacher)
+        assertEquals("Joanna Poniedziałkowska", lessons[2].teacher)
+        assertEquals("Joanna Wtorkowska", lessons[3].teacher)
+
+        assertEquals("Joanna Wtorkowska", lessons[4].teacher)
+        assertEquals("", lessons[5].teacher)
+        assertEquals("", lessons[6].teacher)
+        assertEquals("", lessons[7].teacher)
+
+        assertEquals("Paweł Środowski", lessons[8].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[9].teacher)
+        assertEquals("Paweł Środowski", lessons[10].teacher)
+        assertEquals("Paweł Czwartkowski", lessons[11].teacher)
+    }
+}
diff --git a/app/src/debug/agconnect-services.json b/app/src/debug/agconnect-services.json
deleted file mode 100644
index 48192df01..000000000
--- a/app/src/debug/agconnect-services.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"agcgw":{
-		"backurl":"connect-dre.dbankcloud.cn",
-		"url":"connect-dre.hispace.hicloud.com"
-	},
-	"client":{
-		"cp_id":"890048000024105546",
-		"product_id":"",
-		"client_id":"",
-		"client_secret":"",
-		"app_id":"101440411",
-		"package_name":"io.github.wulkanowy.dev",
-		"api_key":""
-	},
-	"service":{
-		"analytics":{
-			"collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-			"resource_id":"p1",
-			"channel_id":""
-		},
-		"search":{
-			"url":"https://search-dre.cloud.huawei.com"
-		},
-		"cloudstorage":{
-			"storage_url":"https://ops-dre.agcstorage.link"
-		},
-		"ml":{
-			"mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
-		}
-	},
-	"region":"DE",
-	"configuration_version":"1.0"
-}
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml
deleted file mode 100644
index ac99d4a89..000000000
--- a/app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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">
-  <group
-      android:scaleX="0.92"
-      android:scaleY="0.92"
-      android:translateX="0.96"
-      android:translateY="0.96">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M3.9512,2A2,2 0,0 0,2 4L2,18A2,2 0,0 0,4 20L10.0996,20C11.3596,21.24 13.09,22 15,22A7,7 0,0 0,15.7988 21.9551L15.7988,19.7832A4.85,4.85 0,0 1,15 19.8496C12.32,19.8496 10.1504,17.68 10.1504,15A4.85,4.85 0,0 1,15 10.1504C17.4677,10.1504 19.4978,11.9912 19.8047,14.375C20.566,14.3758 21.3108,14.5325 21.9922,14.834C21.9491,12.9905 21.2036,11.3226 20,10.0996L20,4A2,2 0,0 0,18 2L4,2A2,2 0,0 0,3.9512 2zM4,5L10,5L10,8L4,8L4,5zM12,5L18,5L18,8L12,8L12,5zM4,10L10.0996,10C9.2596,10.82 8.6291,11.85 8.2891,13L4,13L4,10zM14,12L14,15.6895L15.7988,16.7266L15.7988,14.9922L15.5,14.8203L15.5,12L14,12zM4,15L8,15C8,16.07 8.2399,17.09 8.6699,18L4,18L4,15z" />
-    <path
-        android:fillColor="#FFF"
-        android:pathData="m17.298,24v-8.1249h2.5c0.7143,0 1.3523,0.1618 1.9141,0.4855 0.5655,0.3199 1.0063,0.7775 1.3225,1.3728 0.3162,0.5915 0.4743,1.2649 0.4743,2.0201v0.3739c0,0.7552 -0.1562,1.4267 -0.4687,2.0145 -0.3088,0.5878 -0.7459,1.0435 -1.3114,1.3672C21.1633,23.8326 20.5253,23.9963 19.8148,24ZM18.9721,17.2311v5.4241h0.8091c0.6548,0 1.1551,-0.2139 1.5011,-0.6417 0.346,-0.4278 0.5227,-1.0398 0.5301,-1.8359v-0.4297c0,-0.8259 -0.1711,-1.4509 -0.5134,-1.875 -0.3423,-0.4278 -0.8426,-0.6417 -1.5011,-0.6417z" />
-  </group>
-</vector>
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png
deleted file mode 100644
index 10b27cee7..000000000
Binary files a/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png
deleted file mode 100644
index db5747b0d..000000000
Binary files a/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png
deleted file mode 100644
index 8d9858292..000000000
Binary files a/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png
deleted file mode 100644
index 232108e87..000000000
Binary files a/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
similarity index 65%
rename from app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt
rename to app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index 5d58270d4..6351997d0 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -2,12 +2,13 @@
 
 package io.github.wulkanowy.utils
 
+import android.content.Context
 import timber.log.Timber
 
 open class TimberTreeNoOp : Timber.Tree() {
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
 }
 
-class CrashLogTree : TimberTreeNoOp()
+class CrashlyticsTree : TimberTreeNoOp()
 
-class CrashLogExceptionTree : TimberTreeNoOp()
+class CrashlyticsExceptionTree : TimberTreeNoOp()
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
similarity index 75%
rename from app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
rename to app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index 3bf7e1693..f23645bc3 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -6,7 +6,7 @@ import javax.inject.Singleton
 
 @Singleton
 @Suppress("UNUSED_PARAMETER")
-class AnalyticsHelper @Inject constructor() {
+class FirebaseAnalyticsHelper @Inject constructor() {
 
     fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         // do nothing
@@ -15,8 +15,4 @@ class AnalyticsHelper @Inject constructor() {
     fun setCurrentScreen(activity: Activity, name: String?) {
         // do nothing
     }
-
-    fun popCurrentScreen(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
deleted file mode 100644
index 3abab9629..000000000
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/UpdateHelper.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-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/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
deleted file mode 100644
index 5d33825f1..000000000
--- a/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.app.Activity
-import android.content.Context
-import android.os.Bundle
-import com.huawei.hms.analytics.HiAnalytics
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
-
-    private val analytics by lazy { HiAnalytics.getInstance(context) }
-
-    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
-        Bundle().apply {
-            params.forEach {
-                if (it.second == null) return@forEach
-                when (it.second) {
-                    is String, is String? -> putString(it.first, it.second as String)
-                    is Int, is Int? -> putInt(it.first, it.second as Int)
-                    is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
-                }
-            }
-            analytics.onEvent(name, this)
-        }
-    }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        analytics.pageStart(name, activity::class.simpleName)
-    }
-
-    fun popCurrentScreen(name: String?) {
-        analytics.pageEnd(name)
-    }
-}
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
deleted file mode 100644
index b5fb6ad71..000000000
--- a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.util.Log
-import com.huawei.agconnect.crash.AGConnectCrash
-import fr.bipi.tressence.base.FormatterPriorityTree
-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
-
-class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
-
-    private val connectCrash by lazy { AGConnectCrash.getInstance() }
-
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        if (skipLog(priority, tag, message, t)) return
-
-        connectCrash.log(format(priority, tag, message))
-    }
-}
-
-class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) {
-
-    private val connectCrash by lazy { AGConnectCrash.getInstance() }
-
-    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
-        return when (t) {
-            is FeatureDisabledException,
-            is FeatureNotAvailableException,
-            is UnknownHostException,
-            is SocketTimeoutException,
-            is InterruptedIOException -> true
-            else -> super.skipLog(priority, tag, message, t)
-        }
-    }
-
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        if (skipLog(priority, tag, message, t)) return
-
-        // Disabled due to a bug in the Huawei library
-
-        /*connectCrash.setCustomKey("priority", priority)
-        connectCrash.setCustomKey("tag", tag.orEmpty())
-        connectCrash.setCustomKey("message", message)
-
-        if (t != null) {
-            connectCrash.recordException(t)
-        } else {
-            connectCrash.recordException(StackTraceRecorder(format(priority, tag, message)))
-        }*/
-    }
-}
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt
deleted file mode 100644
index 3abab9629..000000000
--- a/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-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 7b714fb26..802cf1ad2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,29 +9,6 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="http" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="https" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="mailto" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="tel" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="geo" />
-        </intent>
-    </queries>
-
     <application
         android:name=".WulkanowyApp"
         android:allowBackup="false"
@@ -41,7 +18,8 @@
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
+        tools:replace="android:supportsRtl,android:allowBackup">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
@@ -56,7 +34,7 @@
             android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login_title"
-            android:theme="@style/WulkanowyTheme.Login"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.main.MainActivity"
@@ -68,7 +46,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.MessageSend"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
@@ -133,10 +111,6 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <meta-data
-            android:name="install_channel"
-            android:value="${install_channel}" />
-
         <!-- 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
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
index 3b11c971c..40aff4c48 100644
--- a/app/src/main/assets/contributors.json
+++ b/app/src/main/assets/contributors.json
@@ -33,18 +33,6 @@
   },
   {
     "displayName": "Mateusz Idziejczak",
-    "githubUsername": "Luncenok"
-  },
-  {
-    "displayName": "MRmlik12",
-    "githubUsername": "MRmlik12"
-  },
-  {
-    "displayName": "Damian Czupryn",
-    "githubUsername": "Daxxxis"
-  },
-  {
-    "displayName": "Kamil Studziński",
-    "githubUsername": "studzinskik"
+    "githubUsername": "PanTajemnic"
   }
 ]
diff --git a/app/src/main/assets/message-print-page.html b/app/src/main/assets/message-print-page.html
deleted file mode 100644
index 8da7dec6e..000000000
--- a/app/src/main/assets/message-print-page.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!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
deleted file mode 100644
index 9bfbe2c02..000000000
--- a/app/src/main/assets/wulkanowy-logo-black.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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 d01a953d8..0e094f699 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,35 +1,34 @@
 package io.github.wulkanowy
 
-import android.annotation.SuppressLint
-import android.app.Application
 import android.content.Context
 import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
-import android.webkit.WebView
-import androidx.fragment.app.FragmentManager
-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.hilt.android.HiltAndroidApp
+import dagger.android.AndroidInjector
+import dagger.android.support.DaggerApplication
 import fr.bipi.tressence.file.FileLoggerTree
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.di.DaggerAppComponent
+import io.github.wulkanowy.services.sync.SyncWorkerFactory
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
-import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.CrashLogExceptionTree
-import io.github.wulkanowy.utils.CrashLogTree
+import io.github.wulkanowy.utils.CrashlyticsExceptionTree
+import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
+import io.reactivex.exceptions.UndeliverableException
+import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject
 
-@HiltAndroidApp
-class WulkanowyApp : Application(), Configuration.Provider {
+class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     @Inject
-    lateinit var workerFactory: HiltWorkerFactory
+    lateinit var workerFactory: SyncWorkerFactory
 
     @Inject
     lateinit var themeManager: ThemeManager
@@ -37,63 +36,48 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var appInfo: AppInfo
 
-    @Inject
-    lateinit var preferencesRepository: PreferencesRepository
-
-    @Inject
-    lateinit var analyticsHelper: AnalyticsHelper
-
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         MultiDex.install(this)
     }
 
-    @SuppressLint("UnsafeOptInUsageWarning")
     override fun onCreate() {
         super.onCreate()
-        FragmentManager.enableNewStateManager(false)
-        initializeAppLanguage()
+        AndroidThreeTen.init(this)
+        RxJavaPlugins.setErrorHandler(::onError)
+        Lingver.init(this)
         themeManager.applyDefaultTheme()
+
         initLogging()
-        fixWebViewLocale()
     }
 
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
-            Timber.plant(
-                FileLoggerTree.Builder()
-                    .withFileName("wulkanowy.%g.log")
-                    .withDirName(applicationContext.filesDir.absolutePath)
-                    .withFileLimit(10)
-                    .withMinPriority(DEBUG)
-                    .build()
+            Timber.plant(FileLoggerTree.Builder()
+                .withFileName("wulkanowy.%g.log")
+                .withDirName(applicationContext.filesDir.absolutePath)
+                .withFileLimit(10)
+                .withMinPriority(DEBUG)
+                .build()
             )
         } else {
-            Timber.plant(CrashLogExceptionTree())
-            Timber.plant(CrashLogTree())
+            Timber.plant(CrashlyticsExceptionTree())
+            Timber.plant(CrashlyticsTree())
         }
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
-    private fun initializeAppLanguage() {
-        Lingver.init(this)
-
-        if (preferencesRepository.appLanguage == "system") {
-            Lingver.getInstance().setFollowSystemLocale(this)
-            analyticsHelper.logEvent("language", "startup" to appInfo.systemLanguage)
-        } else {
-            analyticsHelper.logEvent("language", "startup" to preferencesRepository.appLanguage)
-        }
+    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
     }
 
-    private fun fixWebViewLocale() {
-        //https://stackoverflow.com/questions/40398528/android-webview-language-changes-abruptly-on-android-7-0-and-above
-        try {
-            WebView(this).destroy()
-        } catch (e: Exception) {
-            //Ignore exceptions
-        }
+    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
+        return DaggerAppComponent.factory().create(this)
     }
 
     override fun getWorkManagerConfiguration() = Configuration.Builder()
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 f61af4afd..9540372fc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -1,54 +1,53 @@
 package io.github.wulkanowy.data
 
+import android.app.AlarmManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.AssetManager
 import android.content.res.Resources
+import androidx.core.content.getSystemService
 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.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.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AppInfo
 import timber.log.Timber
 import javax.inject.Singleton
 
 @Module
-@InstallIn(SingletonComponent::class)
 internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckerCollector: ChuckerCollector, @ApplicationContext context: Context): Sdk {
+    fun provideInternetObservingSettings(): InternetObservingSettings {
+        return InternetObservingSettings.builder()
+            .strategy(WalledGardenInternetObservingStrategy())
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideSdk(chuckerCollector: ChuckerCollector, 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(
-                ChuckerInterceptor.Builder(context)
-                    .collector(chuckerCollector)
-                    .alwaysReadResponseBody(true)
-                    .build(), network = true
-            )
+            addInterceptor(ChuckerInterceptor(context, chuckerCollector), true)
         }
     }
 
     @Singleton
     @Provides
-    fun provideChuckerCollector(
-        @ApplicationContext context: Context,
-        prefRepository: PreferencesRepository
-    ): ChuckerCollector {
+    fun provideChuckerCollector(context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
         return ChuckerCollector(
             context = context,
             showNotification = prefRepository.isDebugNotificationEnable,
@@ -58,24 +57,19 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideDatabase(
-        @ApplicationContext context: Context,
-        sharedPrefProvider: SharedPrefProvider,
-        appInfo: AppInfo
-    ) = AppDatabase.newInstance(context, sharedPrefProvider, appInfo)
+    fun provideDatabase(context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides
-    fun provideResources(@ApplicationContext context: Context): Resources = context.resources
+    fun provideResources(context: Context): Resources = context.resources
 
     @Singleton
     @Provides
-    fun provideAssets(@ApplicationContext context: Context): AssetManager = context.assets
+    fun provideAssets(context: Context): AssetManager = context.assets
 
     @Singleton
     @Provides
-    fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
-        PreferenceManager.getDefaultSharedPreferences(context)
+    fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
     @Singleton
     @Provides
@@ -95,16 +89,11 @@ internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideGradePartialStatisticsDao(database: AppDatabase) = database.gradePartialStatisticsDao
+    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
 
     @Singleton
     @Provides
-    fun provideGradeSemesterStatisticsDao(database: AppDatabase) =
-        database.gradeSemesterStatisticsDao
-
-    @Singleton
-    @Provides
-    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatisticsDao
+    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
 
     @Singleton
     @Provides
@@ -169,16 +158,4 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
-
-    @Singleton
-    @Provides
-    fun provideConferenceDao(database: AppDatabase) = database.conferenceDao
-
-    @Singleton
-    @Provides
-    fun provideTimetableAdditionalDao(database: AppDatabase) = database.timetableAdditionalDao
-
-    @Singleton
-    @Provides
-    fun provideStudentInfoDao(database: AppDatabase) = database.studentInfoDao
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/Resource.kt b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
deleted file mode 100644
index 406440c83..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/Resource.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-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/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index ac05695b8..762c52f8f 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
@@ -6,15 +6,14 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
+import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
-import io.github.wulkanowy.data.db.dao.ConferenceDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
+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
@@ -27,20 +26,16 @@ import io.github.wulkanowy.data.db.dao.ReportingUnitDao
 import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.data.db.dao.StudentInfoDao
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.dao.TeacherDao
-import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Conference
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.LuckyNumber
@@ -53,11 +48,9 @@ import io.github.wulkanowy.data.db.entities.ReportingUnit
 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.data.db.entities.StudentInfo
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
 import io.github.wulkanowy.data.db.migrations.Migration12
@@ -75,24 +68,13 @@ 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.Migration28
-import io.github.wulkanowy.data.db.migrations.Migration29
 import io.github.wulkanowy.data.db.migrations.Migration3
-import io.github.wulkanowy.data.db.migrations.Migration30
-import io.github.wulkanowy.data.db.migrations.Migration31
-import io.github.wulkanowy.data.db.migrations.Migration32
-import io.github.wulkanowy.data.db.migrations.Migration33
-import io.github.wulkanowy.data.db.migrations.Migration34
-import io.github.wulkanowy.data.db.migrations.Migration35
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
 import io.github.wulkanowy.data.db.migrations.Migration6
 import io.github.wulkanowy.data.db.migrations.Migration7
 import io.github.wulkanowy.data.db.migrations.Migration8
 import io.github.wulkanowy.data.db.migrations.Migration9
-import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Singleton
 
 @Singleton
@@ -106,9 +88,8 @@ import javax.inject.Singleton
         AttendanceSummary::class,
         Grade::class,
         GradeSummary::class,
-        GradePartialStatistics::class,
+        GradeStatistics::class,
         GradePointsStatistics::class,
-        GradeSemesterStatistics::class,
         Message::class,
         MessageAttachment::class,
         Note::class,
@@ -120,10 +101,7 @@ import javax.inject.Singleton
         Recipient::class,
         MobileDevice::class,
         Teacher::class,
-        School::class,
-        Conference::class,
-        TimetableAdditional::class,
-        StudentInfo::class,
+        School::class
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -132,55 +110,45 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 35
+        const val VERSION_SCHEMA = 25
 
-        fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
-            Migration2(),
-            Migration3(),
-            Migration4(),
-            Migration5(),
-            Migration6(),
-            Migration7(),
-            Migration8(),
-            Migration9(),
-            Migration10(),
-            Migration11(),
-            Migration12(),
-            Migration13(),
-            Migration14(),
-            Migration15(),
-            Migration16(),
-            Migration17(),
-            Migration18(),
-            Migration19(sharedPrefProvider),
-            Migration20(),
-            Migration21(),
-            Migration22(),
-            Migration23(),
-            Migration24(),
-            Migration25(),
-            Migration26(),
-            Migration27(),
-            Migration28(),
-            Migration29(),
-            Migration30(),
-            Migration31(),
-            Migration32(),
-            Migration33(),
-            Migration34(),
-            Migration35(appInfo)
-        )
+        fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
+            return arrayOf(
+                Migration2(),
+                Migration3(),
+                Migration4(),
+                Migration5(),
+                Migration6(),
+                Migration7(),
+                Migration8(),
+                Migration9(),
+                Migration10(),
+                Migration11(),
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15(),
+                Migration16(),
+                Migration17(),
+                Migration18(),
+                Migration19(sharedPrefProvider),
+                Migration20(),
+                Migration21(),
+                Migration22(),
+                Migration23(),
+                Migration24(),
+                Migration25()
+            )
+        }
 
-        fun newInstance(
-            context: Context,
-            sharedPrefProvider: SharedPrefProvider,
-            appInfo: AppInfo
-        ) = Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
-            .setJournalMode(TRUNCATE)
-            .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
-            .fallbackToDestructiveMigrationOnDowngrade()
-            .addMigrations(*getMigrations(sharedPrefProvider, appInfo))
-            .build()
+        fun newInstance(context: Context, sharedPrefProvider: SharedPrefProvider): AppDatabase {
+            return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
+                .setJournalMode(TRUNCATE)
+                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
+                .fallbackToDestructiveMigrationOnDowngrade()
+                .addMigrations(*getMigrations(sharedPrefProvider))
+                .build()
+        }
     }
 
     abstract val studentDao: StudentDao
@@ -199,11 +167,9 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val gradeSummaryDao: GradeSummaryDao
 
-    abstract val gradePartialStatisticsDao: GradePartialStatisticsDao
+    abstract val gradeStatistics: GradeStatisticsDao
 
-    abstract val gradePointsStatisticsDao: GradePointsStatisticsDao
-
-    abstract val gradeSemesterStatisticsDao: GradeSemesterStatisticsDao
+    abstract val gradePointsStatistics: GradePointsStatisticsDao
 
     abstract val messagesDao: MessagesDao
 
@@ -228,10 +194,4 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val teacherDao: TeacherDao
 
     abstract val schoolDao: SchoolDao
-
-    abstract val conferenceDao: ConferenceDao
-
-    abstract val timetableAdditionalDao: TimetableAdditionalDao
-
-    abstract val studentInfoDao: StudentInfoDao
 }
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 def0b3715..294f73d3d 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,31 +1,21 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
-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 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 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 {
-        Date(value).toInstant().atZone(ZoneOffset.UTC).toLocalDate()
+        DateTimeUtils.toInstant(Date(value)).atZone(ZoneOffset.UTC).toLocalDate()
     }
 
     @TypeConverter
@@ -50,22 +40,22 @@ class Converters {
     fun intToMonth(value: Int?) = value?.let { Month.of(it) }
 
     @TypeConverter
-    fun intListToJson(list: List<Int>): String {
-        return integerListAdapter.toJson(list)
+    fun intListToGson(list: List<Int>): String {
+        return Gson().toJson(list)
     }
 
     @TypeConverter
-    fun jsonToIntList(value: String): List<Int> {
-        return integerListAdapter.fromJson(value).orEmpty()
+    fun gsonToIntList(value: String): List<Int> {
+        return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
     }
 
     @TypeConverter
-    fun stringPairListToJson(list: List<Pair<String, String>>): String {
-        return stringListPairAdapter.toJson(list)
+    fun stringPairListToGson(list: List<Pair<String, String>>): String {
+        return Gson().toJson(list)
     }
 
     @TypeConverter
-    fun jsonToStringPairList(value: String): List<Pair<String, String>> {
-        return stringListPairAdapter.fromJson(value).orEmpty()
+    fun gsonToStringPairList(value: String): List<Pair<String, String>> {
+        return Gson().fromJson(value, object : TypeToken<List<Pair<String, String>>>() {}.type)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
index 9301d5fa9..4a4aaf74f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@@ -6,9 +6,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SharedPrefProvider @Inject constructor(
-    private val sharedPref: SharedPreferences
-) {
+class SharedPrefProvider @Inject constructor(private val sharedPref: SharedPreferences) {
 
     companion object {
         const val APP_VERSION_CODE_KEY = "app_version_code"
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
deleted file mode 100644
index 4a9b168dd..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-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 8ef3fd446..3eb57473d 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 kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.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): Flow<List<Attendance>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<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 4218855ca..fd58533f1 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @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): Flow<List<AttendanceSummary>>
+    fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Maybe<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 048e9e3cd..32dbadb86 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
-    suspend fun insertAll(items: List<T>): List<Long>
+    fun insertAll(items: List<T>): List<Long>
 
     @Update
-    suspend fun updateAll(items: List<T>)
+    fun updateAll(items: List<T>)
 
     @Delete
-    suspend fun deleteAll(items: List<T>)
+    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 097ad7c81..e13e569b6 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 kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.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(studentId: Int, diaryId: Int, from: LocalDate, end: LocalDate): Flow<List<CompletedLesson>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt
deleted file mode 100644
index 4ed9aecf5..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.Conference
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Singleton
-
-@Dao
-@Singleton
-interface ConferenceDao : BaseDao<Conference> {
-
-    @Query("SELECT * FROM Conferences WHERE diary_id = :diaryId AND student_id = :studentId")
-    fun loadAll(diaryId: Int, studentId: Int): Flow<List<Conference>>
-}
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 311eeb9c5..ca6b32dfc 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 kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.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): Flow<List<Exam>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<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 12e70bde6..c74d1937f 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,6 @@ 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): Flow<List<Grade>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
+
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePartialStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePartialStatisticsDao.kt
deleted file mode 100644
index bce6ce572..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePartialStatisticsDao.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface GradePartialStatisticsDao : BaseDao<GradePartialStatistics> {
-
-    @Query("SELECT * FROM GradePartialStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradePartialStatistics>>
-}
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 e8074f003..da1828666 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 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): Flow<List<GradePointsStatistics>>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<List<GradePointsStatistics>>
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradePointsStatistics>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSemesterStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSemesterStatisticsDao.kt
deleted file mode 100644
index 09ae81714..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSemesterStatisticsDao.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface GradeSemesterStatisticsDao : BaseDao<GradeSemesterStatistics> {
-
-    @Query("SELECT * FROM GradeSemesterStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradeSemesterStatistics>>
-}
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
new file mode 100644
index 000000000..6faa35d0b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
@@ -0,0 +1,18 @@
+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 javax.inject.Singleton
+
+@Singleton
+@Dao
+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>>
+
+    @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>>
+}
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 fc9ad66ed..1165ef07f 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 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): Flow<List<GradeSummary>>
+    fun loadAll(semesterId: Int, studentId: Int): Maybe<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 2092de49d..1947a0dfe 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 kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.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): Flow<List<Homework>>
+    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<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 d9aa24364..f16c28d9e 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 kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,8 +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): Flow<LuckyNumber?>
-
-    @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date >= :start AND date <= :end")
-    fun getAll(studentId: Int, start: LocalDate, end: LocalDate): Flow<List<LuckyNumber>>
+    fun load(studentId: Int, date: LocalDate): Maybe<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
index b69083a1a..3c511a277 100644
--- 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
@@ -9,5 +9,5 @@ import io.github.wulkanowy.data.db.entities.MessageAttachment
 interface MessageAttachmentDao : BaseDao<MessageAttachment> {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertAttachments(items: List<MessageAttachment>): List<Long>
+    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 729ba6a68..7a69e2707 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
@@ -5,15 +5,19 @@ import androidx.room.Query
 import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
+import io.reactivex.Single
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
 
     @Transaction
     @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment?>
+    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Single<MessageWithAttachment>
 
-    @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>>
+    @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>>
+
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
+    fun loadDeleted(studentId: Int): Maybe<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 081e859a5..b05b2d9cc 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
-    @Query("SELECT * FROM MobileDevices WHERE student_id = :userLoginId ORDER BY date DESC")
-    fun loadAll(userLoginId: Int): Flow<List<MobileDevice>>
+    @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
+    fun loadAll(studentId: Int): Maybe<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 e89a4135a..ea2fc6eb2 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 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): Flow<List<Note>>
+    fun loadAll(studentId: Int): Maybe<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 c2787ac3b..afb941b1a 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,12 +3,13 @@ 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
 @Dao
 interface RecipientDao : BaseDao<Recipient> {
 
-    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND unit_id = :unitId AND role = :role")
-    suspend fun loadAll(studentId: Int, unitId: Int, role: Int): List<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>>
 }
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 ca697eda8..6ddfd4941 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,6 +3,7 @@ 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
@@ -10,8 +11,8 @@ import javax.inject.Singleton
 interface ReportingUnitDao : BaseDao<ReportingUnit> {
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    suspend fun load(studentId: Int): List<ReportingUnit>
+    fun load(studentId: Int): Maybe<List<ReportingUnit>>
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    suspend fun loadOne(studentId: Int, unitId: Int): ReportingUnit?
+    fun loadOne(studentId: Int, unitId: Int): Maybe<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 f39791f63..e9bd67557 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 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): Flow<School?>
+    fun load(studentId: Int, classId: Int): Maybe<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 4d171907c..654b80f38 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,19 +1,15 @@
 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")
-    suspend fun loadAll(studentId: Int, classId: Int): List<Semester>
+    fun loadAll(studentId: Int, classId: Int): Maybe<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 0ad2ee590..901ddc73f 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,11 +5,8 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.ABORT
 import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -17,30 +14,23 @@ import javax.inject.Singleton
 interface StudentDao {
 
     @Insert(onConflict = ABORT)
-    suspend fun insertAll(student: List<Student>): List<Long>
+    fun insertAll(student: List<Student>): List<Long>
 
     @Delete
-    suspend fun delete(student: Student)
-
-    @Update(entity = Student::class)
-    suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
+    fun delete(student: Student)
 
     @Query("SELECT * FROM Students WHERE is_current = 1")
-    suspend fun loadCurrent(): Student?
+    fun loadCurrent(): Maybe<Student>
 
     @Query("SELECT * FROM Students WHERE id = :id")
-    suspend fun loadById(id: Long): Student?
+    fun loadById(id: Int): Maybe<Student>
 
     @Query("SELECT * FROM Students")
-    suspend fun loadAll(): List<Student>
-
-    @Transaction
-    @Query("SELECT * FROM Students")
-    suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
+    fun loadAll(): Maybe<List<Student>>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
-    suspend fun updateCurrent(id: Long)
+    fun updateCurrent(id: Long)
 
     @Query("UPDATE Students SET is_current = 0")
-    suspend fun resetCurrent()
+    fun resetCurrent()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentInfoDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentInfoDao.kt
deleted file mode 100644
index 5ec86af12..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentInfoDao.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface StudentInfoDao : BaseDao<StudentInfo> {
-
-    @Query("SELECT * FROM StudentInfo WHERE student_id = :studentId")
-    fun loadStudentInfo(studentId: Int): Flow<StudentInfo?>
-}
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 4cd742b56..525a7129a 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 
 @Dao
 interface SubjectDao : BaseDao<Subject> {
 
     @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
-    fun loadAll(diaryId: Int, studentId: Int): Flow<List<Subject>>
+    fun loadAll(diaryId: Int, studentId: Int): Maybe<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 6adac220d..5ea237a84 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 kotlinx.coroutines.flow.Flow
+import io.reactivex.Maybe
 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): Flow<List<Teacher>>
+    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableAdditionalDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableAdditionalDao.kt
deleted file mode 100644
index 335e003e1..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableAdditionalDao.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
-import javax.inject.Singleton
-
-@Dao
-@Singleton
-interface TimetableAdditionalDao : BaseDao<TimetableAdditional> {
-
-    @Query("SELECT * FROM TimetableAdditional WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<TimetableAdditional>>
-}
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 5e6eec668..6b62cc82a 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 kotlinx.coroutines.flow.Flow
-import java.time.LocalDate
+import io.reactivex.Maybe
+import org.threeten.bp.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): Flow<List<Timetable>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<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 f141d5d52..aa8da8db7 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(
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 7d628ebaa..d2e1f174e 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 e305d467a..775f3f558 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/Conference.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt
deleted file mode 100644
index 8ddcbbb0b..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-import java.time.LocalDateTime
-
-@Entity(tableName = "Conferences")
-data class Conference(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
-
-    val title: String,
-
-    val subject: String,
-
-    val agenda: String,
-
-    @ColumnInfo(name = "present_on_conference")
-    val presentOnConference: String,
-
-    @ColumnInfo(name = "conference_id")
-    val conferenceId: Int,
-
-    val date: LocalDateTime
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
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 50ed343a9..9ae795e71 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 a0f1c3a6d..3f69c61b1 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/GradePartialStatistics.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePartialStatistics.kt
deleted file mode 100644
index db164afde..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradePartialStatistics.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "GradePartialStatistics")
-data class GradePartialStatistics(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "semester_id")
-    val semesterId: Int,
-
-    val subject: String,
-
-    @ColumnInfo(name = "class_average")
-    val classAverage: String,
-
-    @ColumnInfo(name = "student_average")
-    val studentAverage: String,
-
-    @ColumnInfo(name = "class_amounts")
-    val classAmounts: List<Int>,
-
-    @ColumnInfo(name = "student_amounts")
-    val studentAmounts: List<Int>
-
-) {
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSemesterStatistics.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
similarity index 61%
rename from app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSemesterStatistics.kt
rename to app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
index e747271ce..8ad8b8b8d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSemesterStatistics.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeStatistics.kt
@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity(tableName = "GradeSemesterStatistics")
-data class GradeSemesterStatistics(
+@Entity(tableName = "GradesStatistics")
+data class GradeStatistics(
 
     @ColumnInfo(name = "student_id")
     val studentId: Int,
@@ -15,14 +15,13 @@ data class GradeSemesterStatistics(
 
     val subject: String,
 
-    val amounts: List<Int>,
+    val grade: Int,
 
-    @ColumnInfo(name = "student_grade")
-    val studentGrade: Int
+    val amount: Int,
+
+    @ColumnInfo(name = "is_semester")
+    val semester: Boolean
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-    @Transient
-    var average: String = ""
 }
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 fb7b60bbc..6e29112b2 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,7 +3,6 @@ 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(
@@ -37,16 +36,4 @@ 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 5b21445b4..cd7d153e9 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(
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 7c24c8f5c..5b9130f5d 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 7b6e0dbf2..058298415 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,14 +3,14 @@ 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(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Long,
+    val studentId: Int,
 
     @ColumnInfo(name = "real_id")
     val realId: Int,
@@ -29,6 +29,8 @@ data class Message(
 
     val subject: String,
 
+    var content: String,
+
     val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
@@ -36,6 +38,12 @@ data class Message(
 
     var unread: Boolean,
 
+    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int,
+
+    @ColumnInfo(name = "read_by")
+    val readBy: Int,
+
     val removed: Boolean,
 
     @ColumnInfo(name = "has_attachments")
@@ -47,12 +55,4 @@ 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/MobileDevice.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
index 83d82c0b9..f67ed599f 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,14 +3,14 @@ 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(
 
     @ColumnInfo(name = "student_id")
-    val userLoginId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "device_id")
     val deviceId: Int,
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 cfd549625..6f707a66a 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(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
index 0570a2ffd..601d8aac7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
@@ -12,7 +12,7 @@ data class ReportingUnit(
     val studentId: Int,
 
     @ColumnInfo(name = "real_id")
-    val unitId: Int,
+    val realId: Int,
 
     @ColumnInfo(name = "short")
     val shortName: String,
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 3b1f0add5..0641e0b6d 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,8 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import java.io.Serializable
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
@@ -37,7 +36,7 @@ data class Semester(
 
     @ColumnInfo(name = "unit_id")
     val unitId: Int
-): Serializable {
+) {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
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 af9fe831a..905979f99 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,16 +4,10 @@ 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
-    )]
-)
+@Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
 data class Student(
 
     @ColumnInfo(name = "scrapper_base_url")
@@ -49,16 +43,13 @@ 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")
+    @ColumnInfo(name ="school_short")
     val schoolShortName: String,
 
     @ColumnInfo(name = "school_name")
@@ -79,9 +70,4 @@ data class Student(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-    var nick = ""
-
-    @ColumnInfo(name = "avatar_color")
-    var avatarColor = 0L
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentInfo.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentInfo.kt
deleted file mode 100644
index 7366e547f..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentInfo.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Embedded
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import io.github.wulkanowy.data.enums.Gender
-import java.io.Serializable
-import java.time.LocalDate
-
-@Entity(tableName = "StudentInfo")
-data class StudentInfo(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "full_name")
-    val fullName: String,
-
-    @ColumnInfo(name = "first_name")
-    val firstName: String,
-
-    @ColumnInfo(name = "second_name")
-    val secondName: String,
-
-    val surname: String,
-
-    @ColumnInfo(name = "birth_date")
-    val birthDate: LocalDate,
-
-    @ColumnInfo(name = "birth_place")
-    val birthPlace: String,
-
-    val gender: Gender,
-
-    @ColumnInfo(name = "has_polish_citizenship")
-    val hasPolishCitizenship: Boolean,
-
-    @ColumnInfo(name = "family_name")
-    val familyName: String,
-
-    @ColumnInfo(name = "parents_names")
-    val parentsNames: String,
-
-    val address: String,
-
-    @ColumnInfo(name = "registered_address")
-    val registeredAddress: String,
-
-    @ColumnInfo(name = "correspondence_address")
-    val correspondenceAddress: String,
-
-    @ColumnInfo(name = "phone_number")
-    val phoneNumber: String,
-
-    @ColumnInfo(name = "cell_phone_number")
-    val cellPhoneNumber: String,
-
-    val email: String,
-
-    @Embedded(prefix = "first_guardian_")
-    val firstGuardian: StudentGuardian?,
-
-    @Embedded(prefix = "second_guardian_")
-    val secondGuardian: StudentGuardian?
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
-
-data class StudentGuardian(
-
-    @ColumnInfo(name = "full_name")
-    val fullName: String,
-
-    val kinship: String,
-
-    val address: String,
-
-    val phones: String,
-
-    val email: String
-) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentNickAndAvatar.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentNickAndAvatar.kt
deleted file mode 100644
index 546059eea..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentNickAndAvatar.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity
-data class StudentNickAndAvatar(
-
-    val nick: String,
-
-    @ColumnInfo(name = "avatar_color")
-    var avatarColor: Long
-
-) : Serializable {
-
-    @PrimaryKey
-    var id: Long = 0
-}
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
deleted file mode 100644
index 9362a954e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-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 1bf159efd..cad3b7c69 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(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableAdditional.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableAdditional.kt
deleted file mode 100644
index c1f1365f9..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableAdditional.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-import java.time.LocalDate
-import java.time.LocalDateTime
-
-@Entity(tableName = "TimetableAdditional")
-data class TimetableAdditional(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "diary_id")
-    val diaryId: Int,
-
-    val start: LocalDateTime,
-
-    val end: LocalDateTime,
-
-    val date: LocalDate,
-
-    val subject: String,
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
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
deleted file mode 100644
index 7130d86d8..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 6592228a1..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-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/Migration28.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration28.kt
deleted file mode 100644
index 51e7628b5..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration28.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration28 : Migration(27, 28) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS Conferences (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                diary_id INTEGER NOT NULL,
-                title TEXT NOT NULL,
-                subject TEXT NOT NULL,
-                agenda TEXT NOT NULL,
-                present_on_conference TEXT NOT NULL,
-                conference_id INTEGER NOT NULL,
-                date INTEGER NOT NULL
-            )
-        """)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration29.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration29.kt
deleted file mode 100644
index 327552d75..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration29.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration29 : Migration(28, 29) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS GradesStatistics")
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradeSemesterStatistics (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                semester_id INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                amounts TEXT NOT NULL,
-                student_grade INTEGER NOT NULL
-            )
-        """)
-        database.execSQL("""
-            CREATE TABLE IF NOT EXISTS GradePartialStatistics (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                semester_id INTEGER NOT NULL,
-                subject TEXT NOT NULL,
-                class_average TEXT NOT NULL,
-                student_average TEXT NOT NULL,
-                class_amounts TEXT NOT NULL,
-                student_amounts TEXT NOT NULL
-            )
-        """)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration30.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration30.kt
deleted file mode 100644
index b33914fec..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration30.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration30 : Migration(29, 30) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("""
-            CREATE TABLE TimetableAdditional (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                student_id INTEGER NOT NULL,
-                diary_id INTEGER NOT NULL,
-                start INTEGER NOT NULL,
-                `end` INTEGER NOT NULL,
-                date INTEGER NOT NULL,
-                subject TEXT NOT NULL
-            )
-        """)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration31.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration31.kt
deleted file mode 100644
index 064a3e5bc..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration31.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration31 : Migration(30, 31) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL(
-            """CREATE TABLE IF NOT EXISTS StudentInfo (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
-                student_id INTEGER NOT NULL, 
-                full_name TEXT NOT NULL, 
-                first_name TEXT NOT NULL, 
-                second_name TEXT NOT NULL, 
-                surname TEXT NOT NULL, 
-                birth_date INTEGER NOT NULL, 
-                birth_place TEXT NOT NULL, 
-                gender TEXT NOT NULL, 
-                has_polish_citizenship INTEGER NOT NULL, 
-                family_name TEXT NOT NULL, 
-                parents_names TEXT NOT NULL, 
-                address TEXT NOT NULL, 
-                registered_address TEXT NOT NULL, 
-                correspondence_address TEXT NOT NULL, 
-                phone_number TEXT NOT NULL, 
-                cell_phone_number TEXT NOT NULL,
-                email TEXT NOT NULL, 
-                first_guardian_full_name TEXT NOT NULL, 
-                first_guardian_kinship TEXT NOT NULL, 
-                first_guardian_address TEXT NOT NULL, 
-                first_guardian_phones TEXT NOT NULL, 
-                first_guardian_email TEXT NOT NULL, 
-                second_guardian_full_name TEXT NOT NULL, 
-                second_guardian_kinship TEXT NOT NULL, 
-                second_guardian_address TEXT NOT NULL, 
-                second_guardian_phones TEXT NOT NULL, 
-                second_guardian_email TEXT NOT NULL)
-            """
-        )
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration32.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration32.kt
deleted file mode 100644
index 508485e08..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration32.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration32 : Migration(31, 32) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN nick TEXT NOT NULL DEFAULT \"\"")
-    }
-}
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration33.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration33.kt
deleted file mode 100644
index 4a57880d4..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration33.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration33 : Migration(32, 33) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE IF EXISTS StudentInfo")
-
-        database.execSQL(
-            """CREATE TABLE IF NOT EXISTS StudentInfo (
-                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
-                student_id INTEGER NOT NULL, 
-                full_name TEXT NOT NULL, 
-                first_name TEXT NOT NULL, 
-                second_name TEXT NOT NULL, 
-                surname TEXT NOT NULL, 
-                birth_date INTEGER NOT NULL, 
-                birth_place TEXT NOT NULL, 
-                gender TEXT NOT NULL, 
-                has_polish_citizenship INTEGER NOT NULL, 
-                family_name TEXT NOT NULL, 
-                parents_names TEXT NOT NULL, 
-                address TEXT NOT NULL, 
-                registered_address TEXT NOT NULL, 
-                correspondence_address TEXT NOT NULL, 
-                phone_number TEXT NOT NULL, 
-                cell_phone_number TEXT NOT NULL,
-                email TEXT NOT NULL, 
-                first_guardian_full_name TEXT, 
-                first_guardian_kinship TEXT, 
-                first_guardian_address TEXT, 
-                first_guardian_phones TEXT, 
-                first_guardian_email TEXT, 
-                second_guardian_full_name TEXT, 
-                second_guardian_kinship TEXT, 
-                second_guardian_address TEXT, 
-                second_guardian_phones TEXT, 
-                second_guardian_email TEXT)
-            """
-        )
-    }
-}
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration34.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration34.kt
deleted file mode 100644
index 2c57eb00a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration34.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration34 : Migration(33, 34) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM ReportingUnits")
-        database.execSQL("DELETE FROM Recipients")
-    }
-}
-
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration35.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration35.kt
deleted file mode 100644
index cc540388c..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration35.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.core.database.getLongOrNull
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-import io.github.wulkanowy.utils.AppInfo
-
-class Migration35(private val appInfo: AppInfo) : Migration(34, 35) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("ALTER TABLE Students ADD COLUMN `avatar_color` INTEGER NOT NULL DEFAULT 0")
-
-        val studentsCursor = database.query("SELECT * FROM Students")
-
-        while (studentsCursor.moveToNext()) {
-            val studentId = studentsCursor.getLongOrNull(0)
-            database.execSQL(
-                """UPDATE Students 
-                SET avatar_color = ${appInfo.defaultColorsForAvatar.random()} 
-                WHERE id = $studentId"""
-            )
-        }
-    }
-}
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 dbcd916ba..fe0dec48f 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 java.time.LocalDateTime.now
-import java.time.ZoneOffset
+import org.threeten.bp.LocalDateTime.now
+import org.threeten.bp.ZoneOffset
 
 class Migration5 : Migration(4, 5) {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/Gender.kt b/app/src/main/java/io/github/wulkanowy/data/enums/Gender.kt
deleted file mode 100644
index df93dcbef..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/enums/Gender.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package io.github.wulkanowy.data.enums
-
-enum class Gender { MALE, FEMALE }
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt
deleted file mode 100644
index 46e67fdaa..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
-import io.github.wulkanowy.sdk.pojo.AttendanceSummary as SdkAttendanceSummary
-
-fun List<SdkAttendance>.mapToEntities(semester: Semester) = 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
-    )
-}
-
-fun List<SdkAttendanceSummary>.mapToEntities(semester: Semester, subjectId: Int) = 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/mappers/CompletedLessonsMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/CompletedLessonsMapper.kt
deleted file mode 100644
index c42126eb7..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/CompletedLessonsMapper.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.CompletedLesson as SdkCompletedLesson
-
-fun List<SdkCompletedLesson>.mapToEntities(semester: Semester) = map {
-    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/mappers/ConferenceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt
deleted file mode 100644
index 52dc9b30b..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.Conference as SdkConference
-
-fun List<SdkConference>.mapToEntities(semester: Semester) = map {
-    Conference(
-        studentId = semester.studentId,
-        diaryId = semester.diaryId,
-        agenda = it.agenda,
-        conferenceId = it.id,
-        date = it.date,
-        presentOnConference = it.presentOnConference,
-        subject = it.subject,
-        title = it.title
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt
deleted file mode 100644
index bdb5efbba..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.Exam as SdkExam
-
-fun List<SdkExam>.mapToEntities(semester: Semester) = 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/mappers/GradeMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt
deleted file mode 100644
index 178de682a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-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.sdk.pojo.GradeSummary as SdkGradeSummary
-import io.github.wulkanowy.sdk.pojo.Grade as SdkGrade
-
-fun List<SdkGrade>.mapToEntities(semester: Semester) = 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
-    )
-}
-
-@JvmName("mapGradeSummaryToEntities")
-fun List<SdkGradeSummary>.mapToEntities(semester: Semester) = 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/mappers/GradeStatisticsMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/GradeStatisticsMapper.kt
deleted file mode 100644
index b25802d22..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/GradeStatisticsMapper.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.sdk.pojo.GradePointsStatistics as SdkGradePointsStatistics
-import io.github.wulkanowy.sdk.pojo.GradeStatisticsSemester as SdkGradeStatisticsSemester
-import io.github.wulkanowy.sdk.pojo.GradeStatisticsSubject as SdkGradeStatisticsSubject
-
-@JvmName("mapToEntitiesSubject")
-fun List<SdkGradeStatisticsSubject>.mapToEntities(semester: Semester) = map {
-    GradePartialStatistics(
-        semesterId = semester.semesterId,
-        studentId = semester.studentId,
-        subject = it.subject,
-        classAverage = it.classAverage,
-        studentAverage = it.studentAverage,
-        classAmounts = it.classItems
-            .sortedBy { item -> item.grade }
-            .map { item -> item.amount },
-        studentAmounts = it.studentItems.map { item -> item.amount }
-    )
-}
-
-@JvmName("mapToEntitiesSemester")
-fun List<SdkGradeStatisticsSemester>.mapToEntities(semester: Semester) = map {
-    GradeSemesterStatistics(
-        semesterId = semester.semesterId,
-        studentId = semester.studentId,
-        subject = it.subject,
-        amounts = it.items
-            .sortedBy { item -> item.grade }
-            .map { item -> item.amount },
-        studentGrade = it.items.singleOrNull { item -> item.isStudentHere }?.grade ?: 0
-    )
-}
-
-@JvmName("mapToEntitiesPoints")
-fun List<SdkGradePointsStatistics>.mapToEntities(semester: Semester) = map {
-    GradePointsStatistics(
-        semesterId = semester.semesterId,
-        studentId = semester.studentId,
-        subject = it.subject,
-        others = it.others,
-        student = it.student
-    )
-}
-
-fun List<GradePartialStatistics>.mapPartialToStatisticItems() = filterNot { it.classAmounts.isEmpty() }.map {
-    GradeStatisticsItem(
-        type = GradeStatisticsItem.DataType.PARTIAL,
-        average = it.classAverage,
-        partial = it,
-        points = null,
-        semester = null
-    )
-}
-
-fun List<GradeSemesterStatistics>.mapSemesterToStatisticItems() = filterNot { it.amounts.isEmpty() }.map {
-    GradeStatisticsItem(
-        type = GradeStatisticsItem.DataType.SEMESTER,
-        partial = null,
-        points = null,
-        average = "",
-        semester = it
-    )
-}
-
-fun List<GradePointsStatistics>.mapPointsToStatisticsItems() = map {
-    GradeStatisticsItem(
-        type = GradeStatisticsItem.DataType.POINTS,
-        partial = null,
-        semester = null,
-        average = "",
-        points = it
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/HomeworkMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/HomeworkMapper.kt
deleted file mode 100644
index 880a26d6d..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/HomeworkMapper.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.sdk.pojo.Homework as SdkHomework
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.db.entities.Semester
-
-fun List<SdkHomework>.mapToEntities(semester: Semester) = 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/mappers/LuckyNumberMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/LuckyNumberMapper.kt
deleted file mode 100644
index 78ebe1d6e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/LuckyNumberMapper.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
-import java.time.LocalDate
-import io.github.wulkanowy.sdk.pojo.LuckyNumber as SdkLuckyNumber
-
-fun SdkLuckyNumber.mapToEntity(student: Student) = LuckyNumber(
-    studentId = student.studentId,
-    date = LocalDate.now(),
-    luckyNumber = number
-)
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
deleted file mode 100644
index 913e4d030..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-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.Student
-import java.time.LocalDateTime
-import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
-import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
-import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
-
-fun List<SdkMessage>.mapToEntities(student: Student) = map {
-    Message(
-        studentId = student.id,
-        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 ?: LocalDateTime.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
-    }
-}
-
-fun List<SdkMessageAttachment>.mapToEntities() = map {
-    MessageAttachment(
-        realId = it.id,
-        messageId = it.messageId,
-        oneDriveId = it.oneDriveId,
-        url = it.url,
-        filename = it.filename
-    )
-}
-
-fun List<Recipient>.mapFromEntities() = map {
-    SdkRecipient(
-        id = it.realId,
-        name = it.realName,
-        loginId = it.loginId,
-        reportingUnitId = it.unitId,
-        role = it.role,
-        hash = it.hash,
-        shortName = it.name
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
deleted file mode 100644
index f0c375bfa..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.sdk.pojo.Token as SdkToken
-import io.github.wulkanowy.sdk.pojo.Device as SdkDevice
-
-fun List<SdkDevice>.mapToEntities(semester: Semester) = map {
-    MobileDevice(
-        userLoginId = semester.studentId,
-        date = it.createDate,
-        deviceId = it.id,
-        name = it.name
-    )
-}
-
-fun SdkToken.mapToMobileDeviceToken() = MobileDeviceToken(
-    token = token,
-    symbol = symbol,
-    pin = pin,
-    qr = qrCodeImage
-)
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/NoteMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/NoteMapper.kt
deleted file mode 100644
index 70941799b..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/NoteMapper.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.Note as SdkNote
-
-fun List<SdkNote>.mapToEntities(semester: Semester) = 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/mappers/RecipientMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt
deleted file mode 100644
index 80bddaab1..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
-
-fun List<SdkRecipient>.mapToEntities(userLoginId: Int) = map {
-    Recipient(
-        studentId = userLoginId,
-        realId = it.id,
-        realName = it.name,
-        name = it.shortName,
-        hash = it.hash,
-        loginId = it.loginId,
-        role = it.role,
-        unitId = it.reportingUnitId ?: 0
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt
deleted file mode 100644
index 6a21d59fc..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.pojo.ReportingUnit as SdkReportingUnit
-
-fun List<SdkReportingUnit>.mapToEntities(student: Student) = map {
-    ReportingUnit(
-        studentId = student.id.toInt(),
-        unitId = it.id,
-        roles = it.roles,
-        senderId = it.senderId,
-        senderName = it.senderName,
-        shortName = it.short
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/SchoolInfoMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/SchoolInfoMapper.kt
deleted file mode 100644
index dc3a5a9e9..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/SchoolInfoMapper.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.School
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.pojo.School as SdkSchool
-
-fun SdkSchool.mapToEntity(semester: Semester) = School(
-    studentId = semester.studentId,
-    classId = semester.classId,
-    name = name,
-    address = address,
-    contact = contact,
-    headmaster = headmaster,
-    pedagogue = pedagogue
-)
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
deleted file mode 100644
index acd93a91a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-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/StudentInfoMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentInfoMapper.kt
deleted file mode 100644
index 9e8533901..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentInfoMapper.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.StudentGuardian
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import io.github.wulkanowy.data.enums.Gender
-import io.github.wulkanowy.sdk.pojo.StudentGuardian as SdkStudentGuardian
-import io.github.wulkanowy.sdk.pojo.StudentInfo as SdkStudentInfo
-
-fun SdkStudentInfo.mapToEntity(semester: Semester) = StudentInfo(
-    studentId = semester.studentId,
-    fullName = fullName,
-    firstName = firstName,
-    secondName = secondName,
-    surname = surname,
-    birthDate = birthDate,
-    birthPlace = birthPlace,
-    gender = Gender.valueOf(gender.name),
-    hasPolishCitizenship = hasPolishCitizenship,
-    familyName = familyName,
-    parentsNames = parentsNames,
-    address = address,
-    registeredAddress = registeredAddress,
-    correspondenceAddress = correspondenceAddress,
-    phoneNumber = phoneNumber,
-    cellPhoneNumber = phoneNumber,
-    email = email,
-    firstGuardian = guardianFirst?.mapToEntity(),
-    secondGuardian = guardianSecond?.mapToEntity()
-)
-
-fun SdkStudentGuardian.mapToEntity() = StudentGuardian(
-    fullName = fullName,
-    kinship = kinship,
-    address = address,
-    phones = phones,
-    email = email
-)
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
deleted file mode 100644
index c93323038..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-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 = "", colors: List<Long>) = 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,
-        ).apply {
-            avatarColor = colors.random()
-        },
-        semesters = it.semesters.mapToEntities(it.studentId)
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/SubjectMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/SubjectMapper.kt
deleted file mode 100644
index 4dc95aaa7..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/SubjectMapper.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.sdk.pojo.Subject as SdkSubject
-
-fun List<SdkSubject>.mapToEntities(semester: Semester) = 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/mappers/TeacherMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/TeacherMapper.kt
deleted file mode 100644
index 49cb7c294..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/TeacherMapper.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Teacher
-import io.github.wulkanowy.sdk.pojo.Teacher as SdkTeacher
-
-fun List<SdkTeacher>.mapToEntities(semester: Semester) = 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/mappers/TimetableMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt
deleted file mode 100644
index ffd2ae34e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
-import io.github.wulkanowy.sdk.pojo.TimetableAdditional as SdkTimetableAdditional
-
-fun List<SdkTimetable>.mapToEntities(semester: Semester) = 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
-    )
-}
-
-@JvmName("mapToEntitiesTimetableAdditional")
-fun List<SdkTimetableAdditional>.mapToEntities(semester: Semester) = map {
-    TimetableAdditional(
-        studentId = semester.studentId,
-        diaryId = semester.diaryId,
-        subject = it.subject,
-        date = it.date,
-        start = it.start,
-        end = it.end
-    )
-}
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
index d2338c281..e792bde46 100644
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
@@ -1,9 +1,3 @@
 package io.github.wulkanowy.data.pojos
 
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-class Contributor(
-    val displayName: String,
-    val githubUsername: String
-)
+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
index bdcd049df..34b62abdb 100644
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
@@ -1,25 +1,14 @@
 package io.github.wulkanowy.data.pojos
 
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
 
 data class GradeStatisticsItem(
 
-    val type: DataType,
+    val type: ViewType,
 
-    val average: String,
-
-    val partial: GradePartialStatistics?,
-
-    val semester: GradeSemesterStatistics?,
+    val partial: List<GradeStatistics>,
 
     val points: GradePointsStatistics?
-
-) {
-    enum class DataType {
-        SEMESTER,
-        PARTIAL,
-        POINTS,
-    }
-}
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
deleted file mode 100644
index aea8632ac..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
deleted file mode 100644
index ffccb059e..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.Absent
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-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 kotlinx.coroutines.sync.Mutex
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceRepository @Inject constructor(
-    private val attendanceDb: AttendanceDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "attendance"
-
-    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getAttendance(start.monday, end.sunday, semester.semesterId)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            attendanceDb.deleteAll(old uniqueSubtract new)
-            attendanceDb.insertAll(new uniqueSubtract old)
-
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
-
-    suspend fun excuseForAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String? = null) {
-        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/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
deleted file mode 100644
index cd4403c7d..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AttendanceSummaryRepository @Inject constructor(
-    private val attendanceDb: AttendanceSummaryDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "attendance_summary"
-
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
-        query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getAttendanceSummary(subjectId)
-                .mapToEntities(semester, subjectId)
-        },
-        saveFetchResult = { old, new ->
-            attendanceDb.deleteAll(old uniqueSubtract new)
-            attendanceDb.insertAll(new uniqueSubtract old)
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
-        }
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt
deleted file mode 100644
index 99ef56f4b..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepository.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-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 kotlinx.coroutines.sync.Mutex
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class CompletedLessonsRepository @Inject constructor(
-    private val completedLessonsDb: CompletedLessonsDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "completed"
-
-    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { completedLessonsDb.loadAll(semester.studentId, semester.diaryId, start.monday, end.sunday) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getCompletedLessons(start.monday, end.sunday)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            completedLessonsDb.deleteAll(old uniqueSubtract new)
-            completedLessonsDb.insertAll(new uniqueSubtract old)
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
deleted file mode 100644
index 0a839d27b..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.ConferenceDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ConferenceRepository @Inject constructor(
-    private val conferenceDb: ConferenceDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "conference"
-
-    fun getConferences(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
-        query = { conferenceDb.loadAll(semester.diaryId, student.studentId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getConferences()
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            conferenceDb.deleteAll(old uniqueSubtract new)
-            conferenceDb.insertAll(new uniqueSubtract old)
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
-        }
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
deleted file mode 100644
index a8912f100..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.ExamDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.endExamsDay
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.startExamsDay
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ExamRepository @Inject constructor(
-    private val examDb: ExamDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "exam"
-
-    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { examDb.loadAll(semester.diaryId, semester.studentId, start.startExamsDay, start.endExamsDay) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getExams(start.startExamsDay, start.endExamsDay, semester.semesterId)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            examDb.deleteAll(old uniqueSubtract new)
-            examDb.insertAll(new uniqueSubtract old)
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
-        },
-        filterResult = { it.filter { item -> item.date in start..end } }
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
deleted file mode 100644
index 9880e4641..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.sync.Mutex
-import java.time.LocalDateTime
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeRepository @Inject constructor(
-    private val gradeDb: GradeDao,
-    private val gradeSummaryDb: GradeSummaryDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "grade"
-
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { (details, summaries) ->
-            val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester))
-            details.isEmpty() || summaries.isEmpty() || forceRefresh || isShouldBeRefreshed
-        },
-        query = {
-            val detailsFlow = gradeDb.loadAll(semester.semesterId, semester.studentId)
-            val summaryFlow = gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
-            detailsFlow.combine(summaryFlow) { details, summaries -> details to summaries }
-        },
-        fetch = {
-            val (details, summary) = sdk.init(student)
-                .switchDiary(semester.diaryId, semester.schoolYear)
-                .getGrades(semester.semesterId)
-
-            details.mapToEntities(semester) to summary.mapToEntities(semester)
-        },
-        saveFetchResult = { (oldDetails, oldSummary), (newDetails, newSummary) ->
-            refreshGradeDetails(student, oldDetails, newDetails, notify)
-            refreshGradeSummaries(oldSummary, newSummary, notify)
-
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
-        }
-    )
-
-    private suspend fun refreshGradeDetails(student: Student, oldGrades: List<Grade>, newDetails: List<Grade>, notify: Boolean) {
-        val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date ?: student.registrationDate.toLocalDate()
-        gradeDb.deleteAll(oldGrades uniqueSubtract newDetails)
-        gradeDb.insertAll((newDetails uniqueSubtract oldGrades).onEach {
-            if (it.date >= notifyBreakDate) it.apply {
-                isRead = false
-                if (notify) isNotified = false
-            }
-        })
-    }
-
-    private suspend fun refreshGradeSummaries(oldSummaries: List<GradeSummary>, newSummary: List<GradeSummary>, notify: Boolean) {
-        gradeSummaryDb.deleteAll(oldSummaries uniqueSubtract newSummary)
-        gradeSummaryDb.insertAll((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 getUnreadGrades(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { grade -> !grade.isRead }
-        }
-    }
-
-    fun getNotNotifiedGrades(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { grade -> !grade.isNotified }
-        }
-    }
-
-    fun getNotNotifiedPredictedGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified }
-        }
-    }
-
-    fun getNotNotifiedFinalGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified }
-        }
-    }
-
-    suspend fun updateGrade(grade: Grade) {
-        return gradeDb.updateAll(listOf(grade))
-    }
-
-    suspend fun updateGrades(grades: List<Grade>) {
-        return gradeDb.updateAll(grades)
-    }
-
-    suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
-        return gradeSummaryDb.updateAll(gradesSummary)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt
deleted file mode 100644
index 9cd8e711d..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepository.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
-import io.github.wulkanowy.data.db.entities.GradePartialStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapPartialToStatisticItems
-import io.github.wulkanowy.data.mappers.mapPointsToStatisticsItems
-import io.github.wulkanowy.data.mappers.mapSemesterToStatisticItems
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
-import java.util.Locale
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeStatisticsRepository @Inject constructor(
-    private val gradePartialStatisticsDb: GradePartialStatisticsDao,
-    private val gradePointsStatisticsDb: GradePointsStatisticsDao,
-    private val gradeSemesterStatisticsDb: GradeSemesterStatisticsDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val partialMutex = Mutex()
-    private val semesterMutex = Mutex()
-    private val pointsMutex = Mutex()
-
-    private val partialCacheKey = "grade_stats_partial"
-    private val semesterCacheKey = "grade_stats_semester"
-    private val pointsCacheKey = "grade_stats_points"
-
-    fun getGradesPartialStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
-        mutex = partialMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(partialCacheKey, semester)) },
-        query = { gradePartialStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getGradesPartialStatistics(semester.semesterId)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            gradePartialStatisticsDb.deleteAll(old uniqueSubtract new)
-            gradePartialStatisticsDb.insertAll(new uniqueSubtract old)
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(partialCacheKey, semester))
-        },
-        mapResult = { items ->
-            when (subjectName) {
-                "Wszystkie" -> {
-                    val numerator = items.map {
-                        it.classAverage.replace(",", ".").toDoubleOrNull() ?: .0
-                    }.filterNot { it == .0 }
-                    (items.reversed() + GradePartialStatistics(
-                        studentId = semester.studentId,
-                        semesterId = semester.semesterId,
-                        subject = subjectName,
-                        classAverage = if (numerator.isEmpty()) "" else numerator.average().let {
-                            "%.2f".format(Locale.FRANCE, it)
-                        },
-                        studentAverage = "",
-                        classAmounts = items.map { it.classAmounts }.sumGradeAmounts(),
-                        studentAmounts = items.map { it.studentAmounts }.sumGradeAmounts()
-                    )).reversed()
-                }
-                else -> items.filter { it.subject == subjectName }
-            }.mapPartialToStatisticItems()
-        }
-    )
-
-    fun getGradesSemesterStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
-        mutex = semesterMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(semesterCacheKey, semester)) },
-        query = { gradeSemesterStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getGradesSemesterStatistics(semester.semesterId)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            gradeSemesterStatisticsDb.deleteAll(old uniqueSubtract new)
-            gradeSemesterStatisticsDb.insertAll(new uniqueSubtract old)
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(semesterCacheKey, semester))
-        },
-        mapResult = { items ->
-            val itemsWithAverage = items.map { item ->
-                item.copy().apply {
-                    val denominator = item.amounts.sum()
-                    average = if (denominator == 0) "" else (item.amounts.mapIndexed { gradeValue, amount ->
-                        (gradeValue + 1) * amount
-                    }.sum().toDouble() / denominator).let {
-                        "%.2f".format(Locale.FRANCE, it)
-                    }
-                }
-            }
-            when (subjectName) {
-                "Wszystkie" -> (itemsWithAverage.reversed() + GradeSemesterStatistics(
-                    studentId = semester.studentId,
-                    semesterId = semester.semesterId,
-                    subject = subjectName,
-                    amounts = itemsWithAverage.map { it.amounts }.sumGradeAmounts(),
-                    studentGrade = 0
-                ).apply {
-                    average = itemsWithAverage.mapNotNull { it.average.replace(",", ".").toDoubleOrNull() }.average().let {
-                        "%.2f".format(Locale.FRANCE, it)
-                    }
-                }).reversed()
-                else -> itemsWithAverage.filter { it.subject == subjectName }
-            }.mapSemesterToStatisticItems()
-        }
-    )
-
-    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
-        mutex = pointsMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(pointsCacheKey, semester)) },
-        query = { gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getGradesPointsStatistics(semester.semesterId)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            gradePointsStatisticsDb.deleteAll(old uniqueSubtract new)
-            gradePointsStatisticsDb.insertAll(new uniqueSubtract old)
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(pointsCacheKey, semester))
-        },
-        mapResult = { items ->
-            when (subjectName) {
-                "Wszystkie" -> items
-                else -> items.filter { it.subject == subjectName }
-            }.mapPointsToStatisticsItems()
-        }
-    )
-
-    private fun List<List<Int>>.sumGradeAmounts(): List<Int> {
-        val result = mutableListOf(0, 0, 0, 0, 0, 0)
-        forEach {
-            it.forEachIndexed { grade, amount ->
-                result[grade] += amount
-            }
-        }
-        return result
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
deleted file mode 100644
index 068fd9a5c..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-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 kotlinx.coroutines.sync.Mutex
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class HomeworkRepository @Inject constructor(
-    private val homeworkDb: HomeworkDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "homework"
-
-    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { homeworkDb.loadAll(semester.semesterId, semester.studentId, start.monday, end.sunday) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getHomework(start.monday, end.sunday)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            homeworkDb.deleteAll(old uniqueSubtract new)
-            homeworkDb.insertAll(new uniqueSubtract old)
-
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
-        }
-    )
-
-    suspend fun toggleDone(homework: Homework) {
-        homeworkDb.updateAll(listOf(homework.apply {
-            isDone = !isDone
-        }))
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/LoggerRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/LoggerRepository.kt
deleted file mode 100644
index 6d509b026..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/LoggerRepository.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt
deleted file mode 100644
index b904b7dba..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.sync.Mutex
-import java.time.LocalDate
-import java.time.LocalDate.now
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class LuckyNumberRepository @Inject constructor(
-    private val luckyNumberDb: LuckyNumberDao,
-    private val sdk: Sdk
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    fun getLuckyNumber(student: Student, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it == null || forceRefresh },
-        query = { luckyNumberDb.load(student.studentId, now()) },
-        fetch = { sdk.init(student).getLuckyNumber(student.schoolShortName)?.mapToEntity(student) },
-        saveFetchResult = { old, new ->
-            if (new != old) {
-                old?.let { luckyNumberDb.deleteAll(listOfNotNull(it)) }
-                luckyNumberDb.insertAll(listOfNotNull((new?.apply {
-                    if (notify) isNotified = false
-                })))
-            }
-        }
-    )
-
-    fun getLuckyNumberHistory(student: Student, start: LocalDate, end: LocalDate) =
-        luckyNumberDb.getAll(student.studentId, start, end)
-
-    suspend fun getNotNotifiedLuckyNumber(student: Student) = luckyNumberDb.load(student.studentId, now()).map {
-        if (it?.isNotified == false) it else null
-    }.first()
-
-    suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) = luckyNumberDb.updateAll(listOfNotNull(luckyNumber))
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
deleted file mode 100644
index 5f5554187..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.Recipient
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.enums.MessageFolder
-import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.mappers.mapFromEntities
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.Folder
-import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.sync.Mutex
-import timber.log.Timber
-import java.time.LocalDateTime.now
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MessageRepository @Inject constructor(
-    private val messagesDb: MessagesDao,
-    private val messageAttachmentDao: MessageAttachmentDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "message"
-
-    @Suppress("UNUSED_PARAMETER")
-    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student, folder)) },
-        query = { messagesDb.loadAll(student.id.toInt(), folder.id) },
-        fetch = { sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).mapToEntities(student) },
-        saveFetchResult = { old, new ->
-            messagesDb.deleteAll(old uniqueSubtract new)
-            messagesDb.insertAll((new uniqueSubtract old).onEach {
-                it.isNotified = !notify
-            })
-
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder))
-        }
-    )
-
-    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 = { messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId) },
-        fetch = {
-            sdk.init(student).getMessageDetails(it!!.message.messageId, message.folderId, markAsRead, message.realId).let { details ->
-                details.content to details.attachments.mapToEntities()
-            }
-        },
-        saveFetchResult = { old, (downloadedMessage, attachments) ->
-            checkNotNull(old, { "Fetched message no longer exist!" })
-            messagesDb.updateAll(listOf(old.message.copy(unread = !markAsRead).apply {
-                id = old.message.id
-                content = content.ifBlank { downloadedMessage }
-            }))
-            messageAttachmentDao.insertAttachments(attachments)
-            Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
-        }
-    )
-
-    fun getNotNotifiedMessages(student: Student): Flow<List<Message>> {
-        return messagesDb.loadAll(student.id.toInt(), RECEIVED.id).map { it.filter { message -> !message.isNotified && message.unread } }
-    }
-
-    suspend fun updateMessages(messages: List<Message>) {
-        return messagesDb.updateAll(messages)
-    }
-
-    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
-        return sdk.init(student).sendMessage(
-            subject = subject,
-            content = content,
-            recipients = recipients.mapFromEntities()
-        )
-    }
-
-    suspend fun deleteMessage(student: Student, message: Message) {
-        val isDeleted = sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
-
-        if (message.folderId != MessageFolder.TRASHED.id) {
-            if (isDeleted) messagesDb.updateAll(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
-                id = message.id
-                content = message.content
-            }))
-        } else messagesDb.deleteAll(listOf(message))
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
deleted file mode 100644
index 4b333bc6d..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.data.mappers.mapToMobileDeviceToken
-import io.github.wulkanowy.data.pojos.MobileDeviceToken
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MobileDeviceRepository @Inject constructor(
-    private val mobileDb: MobileDeviceDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "devices"
-
-    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student)) },
-        query = { mobileDb.loadAll(student.userLoginId.takeIf { it != 0 } ?: student.studentId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getRegisteredDevices()
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            mobileDb.deleteAll(old uniqueSubtract new)
-            mobileDb.insertAll(new uniqueSubtract old)
-
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
-        }
-    )
-
-    suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
-        sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .unregisterDevice(device.deviceId)
-
-        mobileDb.deleteAll(listOf(device))
-    }
-
-    suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
-        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-            .getToken()
-            .mapToMobileDeviceToken()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
deleted file mode 100644
index 85339dfa9..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.NoteDao
-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.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NoteRepository @Inject constructor(
-    private val noteDb: NoteDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "note"
-
-    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
-        query = { noteDb.loadAll(student.studentId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getNotes(semester.semesterId)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            noteDb.deleteAll(old uniqueSubtract new)
-            noteDb.insertAll((new uniqueSubtract old).onEach {
-                if (it.date >= student.registrationDate.toLocalDate()) it.apply {
-                    isRead = false
-                    if (notify) isNotified = false
-                }
-            })
-
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
-        }
-    )
-
-    fun getNotNotifiedNotes(student: Student): Flow<List<Note>> {
-        return noteDb.loadAll(student.studentId).map { it.filter { note -> !note.isNotified } }
-    }
-
-    suspend fun updateNote(note: Note) {
-        noteDb.updateAll(listOf(note))
-    }
-
-    suspend fun updateNotes(notes: List<Note>) {
-        noteDb.updateAll(notes)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
deleted file mode 100644
index 5bd1f3c12..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ /dev/null
@@ -1,162 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.core.content.edit
-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,
-    @ApplicationContext val context: Context
-) {
-    val startMenuIndex: Int
-        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
-
-    val isShowPresent: Boolean
-        get() = getBoolean(
-            R.string.pref_key_attendance_present,
-            R.bool.pref_default_attendance_present
-        )
-
-    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
-        )
-
-    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)
-
-    val gradeColorTheme: String
-        get() = getString(
-            R.string.pref_key_grade_color_scheme,
-            R.string.pref_default_grade_color_scheme
-        )
-
-    val appLanguageKey = context.getString(R.string.pref_key_app_language)
-    val appLanguage
-        get() = getString(appLanguageKey, R.string.pref_default_app_language)
-
-    val serviceEnableKey = context.getString(R.string.pref_key_services_enable)
-    val isServiceEnabled: Boolean
-        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
-
-    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
-    val servicesInterval: Long
-        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
-
-    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
-    val isServicesOnlyWifi: Boolean
-        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
-
-    val notificationsEnableKey = context.getString(R.string.pref_key_notifications_enable)
-    val isNotificationsEnable: Boolean
-        get() = getBoolean(notificationsEnableKey, 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)
-
-    val gradePlusModifier: Double
-        get() = getString(
-            R.string.pref_key_grade_modifier_plus,
-            R.string.pref_default_grade_modifier_plus
-        ).toDouble()
-
-    val gradeMinusModifier: Double
-        get() = getString(
-            R.string.pref_key_grade_modifier_minus,
-            R.string.pref_default_grade_modifier_minus
-        ).toDouble()
-
-    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
-        )
-
-    var isKitkatDialogDisabled: Boolean
-        get() = sharedPref.getBoolean("kitkat_dialog_disabled", false)
-        set(value) = sharedPref.edit { putBoolean("kitkat_dialog_disabled", value) }
-
-    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)
-
-    private fun getBoolean(id: Int, default: Int) = getBoolean(context.getString(id), default)
-
-    private fun getBoolean(id: String, default: Int) =
-        sharedPref.getBoolean(id, context.resources.getBoolean(default))
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
deleted file mode 100644
index 975a30a20..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.RecipientDao
-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.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecipientRepository @Inject constructor(
-    private val recipientDb: RecipientDao,
-    private val sdk: Sdk
-) {
-
-    suspend fun refreshRecipients(student: Student, unit: ReportingUnit, role: Int) {
-        val new = sdk.init(student).getRecipients(unit.unitId, role).mapToEntities(unit.studentId)
-        val old = recipientDb.loadAll(unit.studentId, unit.unitId, role)
-
-        recipientDb.deleteAll(old uniqueSubtract new)
-        recipientDb.insertAll(new uniqueSubtract old)
-    }
-
-    suspend fun getRecipients(student: Student, unit: ReportingUnit, role: Int): List<Recipient> {
-        return recipientDb.loadAll(unit.studentId, unit.unitId, role).ifEmpty {
-            refreshRecipients(student, unit, role)
-
-            recipientDb.loadAll(unit.studentId, unit.unitId, role)
-        }
-    }
-
-    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
-        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId).mapToEntities(student.studentId)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
deleted file mode 100644
index 5e1063558..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/RecoverRepository.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.sdk.Sdk
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class RecoverRepository @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/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
deleted file mode 100644
index b9caf978b..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ReportingUnitRepository @Inject constructor(
-    private val reportingUnitDb: ReportingUnitDao,
-    private val sdk: Sdk
-) {
-
-    suspend fun refreshReportingUnits(student: Student) {
-        val new = sdk.init(student).getReportingUnits().mapToEntities(student)
-        val old = reportingUnitDb.load(student.id.toInt())
-
-        reportingUnitDb.deleteAll(old.uniqueSubtract(new))
-        reportingUnitDb.insertAll(new.uniqueSubtract(old))
-    }
-
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return reportingUnitDb.load(student.id.toInt()).ifEmpty {
-            refreshReportingUnits(student)
-
-            reportingUnitDb.load(student.id.toInt())
-        }
-    }
-
-    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
-        return reportingUnitDb.loadOne(student.id.toInt(), unitId) ?: run {
-            refreshReportingUnits(student)
-
-            return reportingUnitDb.loadOne(student.id.toInt(), unitId)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt
deleted file mode 100644
index 8b59cb589..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolRepository.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.SchoolDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SchoolRepository @Inject constructor(
-    private val schoolDb: SchoolDao,
-    private val sdk: Sdk
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean) =
-        networkBoundResource(
-            mutex = saveFetchResultMutex,
-            shouldFetch = { it == null || forceRefresh },
-            query = { schoolDb.load(semester.studentId, semester.classId) },
-            fetch = {
-                sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).getSchool()
-                    .mapToEntity(semester)
-            },
-            saveFetchResult = { old, new ->
-                if (old != null && new != old) {
-                    with(schoolDb) {
-                        deleteAll(listOf(old))
-                        insertAll(listOf(new))
-                    }
-                } else if (old == null) {
-                    schoolDb.insertAll(listOf(new))
-                }
-            }
-        )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
deleted file mode 100644
index 8942391c8..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-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.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.getCurrentOrLast
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.isCurrent
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SemesterRepository @Inject constructor(
-    private val semesterDb: SemesterDao,
-    private val sdk: Sdk,
-    private val dispatchers: DispatchersProvider
-) {
-
-    suspend fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false) = withContext(dispatchers.backgroundThread) {
-        val semesters = semesterDb.loadAll(student.studentId, student.classId)
-
-        if (isShouldFetch(student, semesters, forceRefresh, refreshOnNoCurrent)) {
-            refreshSemesters(student)
-            semesterDb.loadAll(student.studentId, student.classId)
-        } else semesters
-    }
-
-    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 = sdk.init(student).getSemesters().mapToEntities(student.studentId)
-        if (new.isEmpty()) return Timber.i("Empty semester list!")
-
-        val old = semesterDb.loadAll(student.studentId, student.classId)
-        semesterDb.deleteAll(old.uniqueSubtract(new))
-        semesterDb.insertSemesters(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/StudentInfoRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt
deleted file mode 100644
index de66ad20f..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentInfoRepository.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.StudentInfoDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class StudentInfoRepository @Inject constructor(
-    private val studentInfoDao: StudentInfoDao,
-    private val sdk: Sdk
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    fun getStudentInfo(student: Student, semester: Semester, forceRefresh: Boolean) =
-        networkBoundResource(
-            mutex = saveFetchResultMutex,
-            shouldFetch = { it == null || forceRefresh },
-            query = { studentInfoDao.loadStudentInfo(student.studentId) },
-            fetch = {
-                sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                    .getStudentInfo().mapToEntity(semester)
-            },
-            saveFetchResult = { old, new ->
-                if (old != null && new != old) {
-                    with(studentInfoDao) {
-                        deleteAll(listOf(old))
-                        insertAll(listOf(new))
-                    }
-                } else if (old == null) {
-                    studentInfoDao.insertAll(listOf(new))
-                }
-            }
-        )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
deleted file mode 100644
index c2f364b3d..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.DispatchersProvider
-import io.github.wulkanowy.utils.security.decrypt
-import io.github.wulkanowy.utils.security.encrypt
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class StudentRepository @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val dispatchers: DispatchersProvider,
-    private val studentDb: StudentDao,
-    private val semesterDb: SemesterDao,
-    private val sdk: Sdk,
-    private val appInfo: AppInfo
-) {
-
-    suspend fun isStudentSaved() = getSavedStudents(false).isNotEmpty()
-
-    suspend fun isCurrentStudentSet() = studentDb.loadCurrent()?.isCurrent ?: false
-
-    suspend fun getStudentsApi(
-        pin: String,
-        symbol: String,
-        token: String
-    ): List<StudentWithSemesters> =
-        sdk.getStudentsFromMobileApi(token, pin, symbol, "")
-            .mapToEntities(colors = appInfo.defaultColorsForAvatar)
-
-    suspend fun getStudentsScrapper(
-        email: String,
-        password: String,
-        scrapperBaseUrl: String,
-        symbol: String
-    ): List<StudentWithSemesters> =
-        sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol)
-            .mapToEntities(password, appInfo.defaultColorsForAvatar)
-
-    suspend fun getStudentsHybrid(
-        email: String,
-        password: String,
-        scrapperBaseUrl: String,
-        symbol: String
-    ): List<StudentWithSemesters> =
-        sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
-            .mapToEntities(password, appInfo.defaultColorsForAvatar)
-
-    suspend fun getSavedStudents(decryptPass: Boolean = true) =
-        studentDb.loadStudentsWithSemesters()
-            .map {
-                it.apply {
-                    if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-                        student.password = withContext(dispatchers.backgroundThread) {
-                            decrypt(student.password)
-                        }
-                    }
-                }
-            }
-
-    suspend fun getStudentById(id: Long, decryptPass: Boolean = true): Student {
-        val student = studentDb.loadById(id) ?: throw NoCurrentStudentException()
-
-        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-            student.password = withContext(dispatchers.backgroundThread) {
-                decrypt(student.password)
-            }
-        }
-        return student
-    }
-
-    suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
-        val student = studentDb.loadCurrent() ?: throw NoCurrentStudentException()
-
-        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-            student.password = withContext(dispatchers.backgroundThread) {
-                decrypt(student.password)
-            }
-        }
-        return student
-    }
-
-    suspend fun saveStudents(studentsWithSemesters: List<StudentWithSemesters>): List<Long> {
-        val semesters = studentsWithSemesters.flatMap { it.semesters }
-        val students = studentsWithSemesters.map { it.student }
-            .map {
-                it.apply {
-                    if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) {
-                        password = withContext(dispatchers.backgroundThread) {
-                            encrypt(password, context)
-                        }
-                    }
-                }
-            }
-
-        semesterDb.insertSemesters(semesters)
-        return studentDb.insertAll(students)
-    }
-
-    suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
-        with(studentDb) {
-            resetCurrent()
-            updateCurrent(studentWithSemesters.student.id)
-        }
-    }
-
-    suspend fun logoutStudent(student: Student) = studentDb.delete(student)
-
-    suspend fun updateStudentNickAndAvatar(studentNickAndAvatar: StudentNickAndAvatar) =
-        studentDb.update(studentNickAndAvatar)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt
deleted file mode 100644
index b4bfef188..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SubjectRepository.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.SubjectDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SubjectRepository @Inject constructor(
-    private val subjectDao: SubjectDao,
-    private val sdk: Sdk
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { subjectDao.loadAll(semester.diaryId, semester.studentId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getSubjects().mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            subjectDao.deleteAll(old uniqueSubtract new)
-            subjectDao.insertAll(new uniqueSubtract old)
-        }
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
deleted file mode 100644
index 7135edbe9..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.TeacherDao
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.networkBoundResource
-import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TeacherRepository @Inject constructor(
-    private val teacherDb: TeacherDao,
-    private val sdk: Sdk
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh },
-        query = { teacherDb.loadAll(semester.studentId, semester.classId) },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getTeachers(semester.semesterId)
-                .mapToEntities(semester)
-        },
-        saveFetchResult = { old, new ->
-            teacherDb.deleteAll(old uniqueSubtract new)
-            teacherDb.insertAll(new uniqueSubtract old)
-        }
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
deleted file mode 100644
index 927565b53..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
-import io.github.wulkanowy.data.db.dao.TimetableDao
-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.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-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 kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.sync.Mutex
-import java.time.LocalDate
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class TimetableRepository @Inject constructor(
-    private val timetableDb: TimetableDao,
-    private val timetableAdditionalDb: TimetableAdditionalDao,
-    private val sdk: Sdk,
-    private val schedulerHelper: TimetableNotificationSchedulerHelper,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "timetable"
-
-    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean, refreshAdditional: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { (timetable, additional) -> timetable.isEmpty() || (additional.isEmpty() && refreshAdditional) || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = {
-            timetableDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
-                .map { schedulerHelper.scheduleNotifications(it, student); it }
-                .combine(timetableAdditionalDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)) { timetable, additional ->
-                    timetable to additional
-                }
-        },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getTimetable(start.monday, end.sunday)
-                .let { (normal, additional) -> normal.mapToEntities(semester) to additional.mapToEntities(semester) }
-
-        },
-        saveFetchResult = { (oldTimetable, oldAdditional), (newTimetable, newAdditional) ->
-            refreshTimetable(student, oldTimetable, newTimetable)
-            refreshAdditional(oldAdditional, newAdditional)
-
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
-        },
-        filterResult = { (timetable, additional) ->
-            timetable.filter { item ->
-                item.date in start..end
-            } to additional.filter { item ->
-                item.date in start..end
-            }
-        }
-    )
-
-    private suspend fun refreshTimetable(student: Student, old: List<Timetable>, new: List<Timetable>) {
-        timetableDb.deleteAll(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
-        timetableDb.insertAll(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
-                    )
-                }
-            }
-        })
-    }
-
-    private suspend fun refreshAdditional(old: List<TimetableAdditional>, new: List<TimetableAdditional>) {
-        timetableAdditionalDb.deleteAll(old.uniqueSubtract(new))
-        timetableAdditionalDb.insertAll(new.uniqueSubtract(old))
-    }
-}
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..6a0b2d32e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.repositories.appcreator
+
+import android.content.res.AssetManager
+import com.google.gson.Gson
+import io.github.wulkanowy.data.pojos.Contributor
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppCreatorRepository @Inject constructor(private val assets: AssetManager) {
+    fun getAppCreators(): Single<List<Contributor>> {
+        return Single.fromCallable<List<Contributor>> {
+            Gson().fromJson(
+                assets.open("contributors.json").bufferedReader().use { it.readText() },
+                Array<Contributor>::class.java
+            ).toList()
+        }
+    }
+}
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
new file mode 100644
index 000000000..0f5873766
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
@@ -0,0 +1,25 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) {
+
+    fun saveAttendance(attendance: List<Attendance>) {
+        attendanceDb.insertAll(attendance)
+    }
+
+    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() }
+    }
+}
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
new file mode 100644
index 000000000..f64d920db
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -0,0 +1,53 @@
+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.github.wulkanowy.sdk.pojo.Absent
+import io.github.wulkanowy.utils.init
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getAttendance(startDate, endDate, semester.semesterId)
+            .map { attendance ->
+                attendance.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
+                    )
+                }
+            }
+    }
+
+    fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Single<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
new file mode 100644
index 000000000..68e7c5f12
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -0,0 +1,45 @@
+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.data.db.entities.Student
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+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(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean): Single<List<Attendance>> {
+        return local.getAttendance(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getAttendance(student, semester, start.monday, end.sunday)
+                else Single.error(UnknownHostException())
+            }.flatMap { newAttendance ->
+                local.getAttendance(semester, start.monday, end.sunday)
+                    .toSingle(emptyList())
+                    .doOnSuccess { oldAttendance ->
+                        local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
+                        local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
+                    }
+            }.flatMap {
+                local.getAttendance(semester, start.monday, end.sunday)
+                    .toSingle(emptyList())
+            }).map { list -> list.filter { it.date in start..end } }
+    }
+
+    fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null): Single<Boolean> {
+        return remote.excuseAbsence(student, semester, attendanceList, reason)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/SentExcuseStatus.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
similarity index 60%
rename from app/src/main/java/io/github/wulkanowy/data/enums/SentExcuseStatus.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
index 99878152f..50d6b8ed5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/SentExcuseStatus.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.enums
+package io.github.wulkanowy.data.repositories.attendance
 
 enum class SentExcuseStatus(val id: Int = 0) {
     WAITING,
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
new file mode 100644
index 000000000..2e9a10067
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
@@ -0,0 +1,24 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) {
+
+    fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
+        attendanceDb.insertAll(attendance)
+    }
+
+    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() }
+    }
+}
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
new file mode 100644
index 000000000..8fef5c391
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -0,0 +1,36 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
+        return sdk.init(student).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
+                    )
+                }
+            }
+    }
+}
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
new file mode 100644
index 000000000..5f0b2b346
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -0,0 +1,35 @@
+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.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(student: Student, 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(student, 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()) })
+    }
+}
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
new file mode 100644
index 000000000..9b275908e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
@@ -0,0 +1,25 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsLocal @Inject constructor(private val completedLessonsDb: CompletedLessonsDao) {
+
+    fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
+        completedLessonsDb.insertAll(completedLessons)
+    }
+
+    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() }
+    }
+}
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
new file mode 100644
index 000000000..bb115111e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -0,0 +1,38 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
+        return sdk.init(student).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
+                    )
+                }
+            }
+    }
+}
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
new file mode 100644
index 000000000..72cc93eb4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -0,0 +1,42 @@
+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.data.db.entities.Student
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+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(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
+        return local.getCompletedLessons(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getCompletedLessons(student, semester, start.monday, end.sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getCompletedLessons(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteCompleteLessons(old.uniqueSubtract(new))
+                            local.saveCompletedLessons(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getCompletedLessons(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.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
new file mode 100644
index 000000000..0f484d323
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
@@ -0,0 +1,26 @@
+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 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>> {
+        return examDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
+                .filter { !it.isEmpty() }
+    }
+
+    fun saveExams(exams: List<Exam>) {
+        examDb.insertAll(exams)
+    }
+
+    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
new file mode 100644
index 000000000..fb105ceee
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -0,0 +1,36 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ExamRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
+        return sdk.init(student).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
+                    )
+                }
+            }
+    }
+}
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
new file mode 100644
index 000000000..f29e4fdf8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -0,0 +1,42 @@
+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.data.db.entities.Student
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+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(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
+        return local.getExams(semester, start.monday, end.sunday).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getExams(student, semester, start.monday, end.sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getExams(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteExams(old.uniqueSubtract(new))
+                            local.saveExams(new.uniqueSubtract(old))
+                        }
+                }.flatMap {
+                    local.getExams(semester, start.monday, end.sunday)
+                        .toSingle(emptyList())
+                }).map { list -> list.filter { it.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
new file mode 100644
index 000000000..944ed34ae
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -0,0 +1,45 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeLocal @Inject constructor(
+    private val gradeDb: GradeDao,
+    private val gradeSummaryDb: GradeSummaryDao
+) {
+
+    fun saveGrades(grades: List<Grade>) {
+        gradeDb.insertAll(grades)
+    }
+
+    fun deleteGrades(grades: List<Grade>) {
+        gradeDb.deleteAll(grades)
+    }
+
+    fun updateGrades(grades: List<Grade>) {
+        gradeDb.updateAll(grades)
+    }
+
+    fun getGradesDetails(semester: Semester): Maybe<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
+
+    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/grade/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
new file mode 100644
index 000000000..abb2f98c9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -0,0 +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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getGrades(student: Student, semester: Semester): Single<Pair<List<Grade>, List<GradeSummary>>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGrades(semester.semesterId)
+            .map { (details, summary) ->
+                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
new file mode 100644
index 000000000..e28350a51
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -0,0 +1,73 @@
+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.uniqueSubtract
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+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<Pair<List<Grade>, List<GradeSummary>>> {
+        return local.getGradesDetails(semester).flatMap { details ->
+            local.getGradesSummary(semester).map { summary -> details to summary }
+        }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                if (it) remote.getGrades(student, semester)
+                else Single.error(UnknownHostException())
+            }.flatMap { (newDetails, newSummary) ->
+                local.getGradesDetails(semester).toSingle(emptyList())
+                    .doOnSuccess { old ->
+                        val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
+                        local.deleteGrades(old.uniqueSubtract(newDetails))
+                        local.saveGrades(newDetails.uniqueSubtract(old)
+                            .onEach {
+                                if (it.date >= notifyBreakDate) it.apply {
+                                    isRead = false
+                                    if (notify) isNotified = false
+                                }
+                            })
+                    }.flatMap {
+                        local.getGradesSummary(semester).toSingle(emptyList())
+                            .doOnSuccess { old ->
+                                local.deleteGradesSummary(old.uniqueSubtract(newSummary))
+                                local.saveGradesSummary(newSummary.uniqueSubtract(old))
+                            }
+                    }
+            }.flatMap {
+                local.getGradesDetails(semester).toSingle(emptyList()).flatMap { details ->
+                    local.getGradesSummary(semester).toSingle(emptyList()).map { summary ->
+                        details to summary
+                    }
+                }
+            })
+    }
+
+    fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+    }
+
+    fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+    }
+
+    fun updateGrade(grade: Grade): Completable {
+        return Completable.fromCallable { local.updateGrades(listOf(grade)) }
+    }
+
+    fun updateGrades(grades: List<Grade>): Completable {
+        return Completable.fromCallable { local.updateGrades(grades) }
+    }
+}
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
new file mode 100644
index 000000000..7994bd758
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.data.repositories.gradestatistics
+
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeStatisticsLocal @Inject constructor(
+    private val gradeStatisticsDb: GradeStatisticsDao,
+    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 getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
+        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    }
+
+    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)
+                } + list
+            }
+            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<List<GradePointsStatistics>> {
+        return when (subjectName) {
+            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
+            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
+        }.filter { it.isNotEmpty() }
+    }
+
+    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+        gradeStatisticsDb.insertAll(gradesStatistics)
+    }
+
+    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
+        gradePointsStatisticsDb.insertAll(gradePointsStatistics)
+    }
+
+    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+        gradeStatisticsDb.deleteAll(gradesStatistics)
+    }
+
+    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
new file mode 100644
index 000000000..99e0cb987
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -0,0 +1,49 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): Single<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
+                )
+            }
+        }
+    }
+
+    fun getGradePointsStatistics(student: Student, semester: Semester): Single<List<GradePointsStatistics>> {
+        return sdk.init(student).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
+                    )
+                }
+            }
+    }
+}
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
new file mode 100644
index 000000000..8d96d2f57
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -0,0 +1,75 @@
+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.uniqueSubtract
+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(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatisticsItem>> {
+        return local.getGradesStatistics(semester, isSemester, subjectName).map { it.mapToStatisticItems() }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradeStatistics(student, 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).map { it.mapToStatisticItems() }.toSingle(emptyList()) })
+    }
+
+    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean): Single<List<GradeStatisticsItem>> {
+        return local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getGradePointsStatistics(student, semester)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getGradesPointsStatistics(semester).toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
+                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
+                        }
+                }.flatMap { local.getGradesPointsStatistics(semester, subjectName).map { it.mapToStatisticsItem() }.toSingle(emptyList()) })
+    }
+
+    private fun List<GradeStatistics>.mapToStatisticItems(): List<GradeStatisticsItem> {
+        return groupBy { it.subject }.map {
+            GradeStatisticsItem(
+                type = ViewType.PARTIAL,
+                partial = it.value
+                    .sortedByDescending { item -> item.grade }
+                    .filter { item -> item.amount != 0 },
+                points = null
+            )
+        }
+    }
+
+    private fun List<GradePointsStatistics>.mapToStatisticsItem(): List<GradeStatisticsItem> {
+        return 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
new file mode 100644
index 000000000..fdae45182
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -0,0 +1,30 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
+
+    fun saveHomework(homework: List<Homework>) {
+        homeworkDb.insertAll(homework)
+    }
+
+    fun deleteHomework(homework: List<Homework>) {
+        homeworkDb.deleteAll(homework)
+    }
+
+    fun updateHomework(homework: List<Homework>) {
+        homeworkDb.updateAll(homework)
+    }
+
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<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
new file mode 100644
index 000000000..20ffee99c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -0,0 +1,35 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
+        return sdk.init(student).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,
+                        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
new file mode 100644
index 000000000..7e8fd5c30
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -0,0 +1,49 @@
+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.data.db.entities.Student
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+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(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
+        return Single.fromCallable { start.monday to end.sunday }.flatMap { (monday, friday) ->
+            local.getHomework(semester, monday, friday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                    .flatMap {
+                        if (it) remote.getHomework(student, 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 toggleDone(homework: Homework): Completable {
+        return Completable.fromCallable {
+            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..be6ad2f48
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
@@ -0,0 +1,39 @@
+package io.github.wulkanowy.data.repositories.logger
+
+import android.content.Context
+import io.reactivex.Single
+import java.io.File
+import java.io.FileNotFoundException
+import javax.inject.Inject
+
+class LoggerRepository @Inject constructor(private val context: Context) {
+
+    fun getLastLogLines(): Single<List<String>> {
+        return getLastModified()
+            .map { it.readText() }
+            .map { it.split("\n") }
+    }
+
+    fun getLogFiles(): Single<List<File>> {
+        return Single.fromCallable {
+            File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
+                it.name.endsWith(".log")
+            }
+        }
+    }
+
+    private fun getLastModified(): Single<File> {
+        return Single.fromCallable {
+            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
new file mode 100644
index 000000000..0f4f79c84
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -0,0 +1,29 @@
+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.Student
+import io.reactivex.Maybe
+import org.threeten.bp.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))
+    }
+
+    fun updateLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.updateAll(listOf(luckyNumber))
+    }
+
+    fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
+        luckyNumberDb.deleteAll(listOf(luckyNumber))
+    }
+
+    fun getLuckyNumber(student: Student, date: LocalDate): Maybe<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
new file mode 100644
index 000000000..0c71897a6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return sdk.init(student).getLuckyNumber(student.schoolShortName).map {
+            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
new file mode 100644
index 000000000..374b9a294
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -0,0 +1,54 @@
+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.Student
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+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(student: Student, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMapMaybe {
+                    if (it) remote.getLuckyNumber(student)
+                    else Maybe.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getLuckyNumber(student, 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(student, LocalDate.now()) }, { Maybe.error(it) },
+                    { local.getLuckyNumber(student, LocalDate.now()) })
+            )
+    }
+
+    fun getNotNotifiedLuckyNumber(student: Student): Maybe<LuckyNumber> {
+        return local.getLuckyNumber(student, LocalDate.now()).filter { !it.isNotified }
+    }
+
+    fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
+        return Completable.fromCallable { local.updateLuckyNumber(luckyNumber) }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
similarity index 63%
rename from app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
rename to app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
index 899ba9085..06f5a1e05 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/MessageFolder.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageFolder.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.enums
+package io.github.wulkanowy.data.repositories.message
 
 enum class MessageFolder(val id: Int = 1) {
     RECEIVED(1),
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
new file mode 100644
index 000000000..53cf0a983
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -0,0 +1,47 @@
+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 io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MessageLocal @Inject constructor(
+    private val messagesDb: MessagesDao,
+    private val messageAttachmentDao: MessageAttachmentDao
+) {
+
+    fun saveMessages(messages: List<Message>) {
+        messagesDb.insertAll(messages)
+    }
+
+    fun updateMessages(messages: List<Message>) {
+        messagesDb.updateAll(messages)
+    }
+
+    fun deleteMessages(messages: List<Message>) {
+        messagesDb.deleteAll(messages)
+    }
+
+    fun getMessageWithAttachment(student: Student, message: Message): Single<MessageWithAttachment> {
+        return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
+    }
+
+    fun saveMessageAttachments(attachments: List<MessageAttachment>) {
+        messageAttachmentDao.insertAttachments(attachments)
+    }
+
+    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() }
+    }
+}
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
new file mode 100644
index 000000000..2df2e20a3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -0,0 +1,80 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import org.threeten.bp.LocalDateTime.now
+import javax.inject.Inject
+import javax.inject.Singleton
+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.init(student).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,
+                    hasAttachments = it.hasAttachments
+                )
+            }
+        }
+    }
+
+    fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Single<Pair<String, List<MessageAttachment>>> {
+        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).map { details ->
+            details.content to details.attachments.map {
+                MessageAttachment(
+                    realId = it.id,
+                    messageId = it.messageId,
+                    oneDriveId = it.oneDriveId,
+                    url = it.url,
+                    filename = it.filename
+                )
+            }
+        }
+    }
+
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return sdk.init(student).sendMessage(
+            subject = subject,
+            content = content,
+            recipients = recipients.map {
+                SdkRecipient(
+                    id = it.realId,
+                    name = it.realName,
+                    loginId = it.loginId,
+                    reportingUnitId = it.unitId,
+                    role = it.role,
+                    hash = it.hash,
+                    shortName = it.name
+                )
+            }
+        )
+    }
+
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+        return sdk.init(student).deleteMessages(listOf(message.messageId to 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
new file mode 100644
index 000000000..2d2c0430c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -0,0 +1,105 @@
+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.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+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.uniqueSubtract
+import io.reactivex.Completable
+import io.reactivex.Single
+import timber.log.Timber
+import java.net.UnknownHostException
+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
+) {
+
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
+        return 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 getMessage(student: Student, message: Message, markAsRead: Boolean = false): Single<MessageWithAttachment> {
+        return local.getMessageWithAttachment(student, message)
+            .filter {
+                it.message.content.isNotEmpty().also { status ->
+                    Timber.d("Message content in db empty: ${!status}")
+                } && !it.message.unread
+            }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) local.getMessageWithAttachment(student, message)
+                    else Single.error(UnknownHostException())
+                }
+                .flatMap { dbMessage ->
+                    remote.getMessagesContentDetails(student, dbMessage.message, markAsRead).doOnSuccess { (downloadedMessage, attachments) ->
+                        local.updateMessages(listOf(dbMessage.message.copy(unread = !markAsRead).apply {
+                            id = dbMessage.message.id
+                            content = content.ifBlank { downloadedMessage }
+                        }))
+                        local.saveMessageAttachments(attachments)
+                        Timber.d("Message ${message.messageId} with blank content: ${dbMessage.message.content.isBlank()}, marked as read")
+                    }
+                }.flatMap {
+                    local.getMessageWithAttachment(student, message)
+                }
+            )
+    }
+
+    fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
+        return local.getMessages(student, RECEIVED)
+            .map { it.filter { message -> !message.isNotified && message.unread } }
+            .toSingle(emptyList())
+    }
+
+    fun updateMessages(messages: List<Message>): Completable {
+        return Completable.fromCallable { local.updateMessages(messages) }
+    }
+
+    fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.sendMessage(student, subject, content, recipients)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun deleteMessage(student: Student, message: Message): Single<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.deleteMessage(student, message)
+                else Single.error(UnknownHostException())
+            }
+            .doOnSuccess {
+                if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).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
new file mode 100644
index 000000000..473ffa7fe
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
@@ -0,0 +1,24 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MobileDeviceLocal @Inject constructor(private val mobileDb: MobileDeviceDao) {
+
+    fun saveDevices(devices: List<MobileDevice>) {
+        mobileDb.insertAll(devices)
+    }
+
+    fun deleteDevices(devices: List<MobileDevice>) {
+        mobileDb.deleteAll(devices)
+    }
+
+    fun getDevices(semester: Semester): Maybe<List<MobileDevice>> {
+        return mobileDb.loadAll(semester.studentId).filter { it.isNotEmpty() }
+    }
+}
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
new file mode 100644
index 000000000..800f95971
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
@@ -0,0 +1,48 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getDevices(student: Student, semester: Semester): Single<List<MobileDevice>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getRegisteredDevices()
+            .map { devices ->
+                devices.map {
+                    MobileDevice(
+                        studentId = semester.studentId,
+                        date = it.createDate,
+                        deviceId = it.id,
+                        name = it.name
+                    )
+                }
+            }
+    }
+
+    fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .unregisterDevice(device.deviceId)
+    }
+
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getToken()
+            .map {
+                MobileDeviceToken(
+                    token = it.token,
+                    symbol = it.symbol,
+                    pin = it.pin,
+                    qr = it.qrCodeImage
+                )
+            }
+    }
+}
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
new file mode 100644
index 000000000..545846e85
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
@@ -0,0 +1,53 @@
+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.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(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
+        return local.getDevices(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getDevices(student, 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 unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Single<Boolean> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.unregisterDevice(student, semester, device)
+                else Single.error(UnknownHostException())
+            }
+    }
+
+    fun getToken(student: Student, semester: Semester): Single<MobileDeviceToken> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getToken(student, semester)
+                else Single.error(UnknownHostException())
+            }
+    }
+}
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
new file mode 100644
index 000000000..784e61f0f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
@@ -0,0 +1,28 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
+
+    fun saveNotes(notes: List<Note>) {
+        noteDb.insertAll(notes)
+    }
+
+    fun updateNotes(notes: List<Note>) {
+        noteDb.updateAll(notes)
+    }
+
+    fun deleteNotes(notes: List<Note>) {
+        noteDb.deleteAll(notes)
+    }
+
+    fun getNotes(student: Student): Maybe<List<Note>> {
+        return noteDb.loadAll(student.studentId).filter { it.isNotEmpty() }
+    }
+}
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
new file mode 100644
index 000000000..2c62b608d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -0,0 +1,34 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NoteRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getNotes(student: Student, semester: Semester): Single<List<Note>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getNotes(semester.semesterId)
+            .map { notes ->
+                notes.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
new file mode 100644
index 000000000..e155e2bad
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -0,0 +1,54 @@
+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.uniqueSubtract
+import io.reactivex.Completable
+import io.reactivex.Single
+import java.net.UnknownHostException
+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(student, 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 getNotNotifiedNotes(student: Student): Single<List<Note>> {
+        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }.toSingle(emptyList())
+    }
+
+    fun updateNote(note: Note): Completable {
+        return Completable.fromCallable { local.updateNotes(listOf(note)) }
+    }
+
+    fun updateNotes(notes: List<Note>): Completable {
+        return Completable.fromCallable { 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
new file mode 100644
index 000000000..7715cde0d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -0,0 +1,89 @@
+package io.github.wulkanowy.data.repositories.preferences
+
+import android.content.Context
+import android.content.SharedPreferences
+import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PreferencesRepository @Inject constructor(
+    private val sharedPref: SharedPreferences,
+    val context: Context
+) {
+    val startMenuIndex: Int
+        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
+
+    val isShowPresent: Boolean
+        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
+
+    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)
+
+    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)
+
+    val gradeColorTheme: String
+        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
+
+    val appLanguageKey = context.getString(R.string.pref_key_app_language)
+    val appLanguage
+        get() = getString(appLanguageKey, R.string.pref_default_app_language)
+
+    val serviceEnableKey = context.getString(R.string.pref_key_services_enable)
+    val isServiceEnabled: Boolean
+        get() = getBoolean(serviceEnableKey, R.bool.pref_default_services_enable)
+
+    val servicesIntervalKey = context.getString(R.string.pref_key_services_interval)
+    val servicesInterval: Long
+        get() = getString(servicesIntervalKey, R.string.pref_default_services_interval).toLong()
+
+    val servicesOnlyWifiKey = context.getString(R.string.pref_key_services_wifi_only)
+    val isServicesOnlyWifi: Boolean
+        get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
+
+    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)
+
+    val gradePlusModifier: Double
+        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
+
+    val gradeMinusModifier: Double
+        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
+
+    val fillMessageContent: Boolean
+        get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
+
+    val showWholeClassPlan: String
+        get() = getString(R.string.pref_key_timetable_show_whole_class, R.string.pref_default_timetable_show_whole_class)
+
+    val showTimetableTimers: Boolean
+        get() = getBoolean(R.string.pref_key_timetable_show_timers, R.bool.pref_default_timetable_show_timers)
+
+    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)
+
+    private fun getBoolean(id: Int, default: Int) = getBoolean(context.getString(id), default)
+
+    private fun getBoolean(id: String, default: Int) = sharedPref.getBoolean(id, context.resources.getBoolean(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
new file mode 100644
index 000000000..9b1d4ac2f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.repositories.recipient
+
+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() }
+    }
+
+    fun saveRecipients(recipients: List<Recipient>): List<Long> {
+        return recipientDb.insertAll(recipients)
+    }
+
+    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
new file mode 100644
index 000000000..e5b16a156
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -0,0 +1,43 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
+
+@Singleton
+class RecipientRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Single<List<Recipient>> {
+        return sdk.init(student).getRecipients(unit.realId, role)
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
+    }
+
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
+        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
+            .map { recipients ->
+                recipients.map { it.toRecipient() }
+            }
+    }
+
+    private fun SdkRecipient.toRecipient(): Recipient {
+        return Recipient(
+            studentId = sdk.studentId,
+            realId = id,
+            realName = name,
+            name = shortName,
+            hash = hash,
+            loginId = loginId,
+            role = role,
+            unitId = reportingUnitId ?: 0
+        )
+    }
+}
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
new file mode 100644
index 000000000..6f8a72af2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -0,0 +1,47 @@
+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.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
+) {
+
+    fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
+        return local.getRecipients(student, role, unit).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getRecipients(student, 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())
+                }
+            )
+    }
+
+    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getMessageRecipients(student, message)
+                else Single.error(UnknownHostException())
+            }
+    }
+}
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..f27891250
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.repositories.recover
+
+import io.github.wulkanowy.sdk.Sdk
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecoverRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
+        return sdk.getPasswordResetCaptchaCode(host, symbol)
+    }
+
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<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..86d4ba1b3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.repositories.recover
+
+import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecoverRepository @Inject constructor(private val settings: InternetObservingSettings, private val remote: RecoverRemote) {
+
+    fun getReCaptchaSiteKey(host: String, symbol: String): Single<Pair<String, String>> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.getReCaptchaSiteKey(host, symbol)
+            else Single.error(UnknownHostException())
+        }
+    }
+
+    fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): Single<String> {
+        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+            if (it) remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
+            else Single.error(UnknownHostException())
+        }
+    }
+}
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
new file mode 100644
index 000000000..6f9eec3fc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
@@ -0,0 +1,28 @@
+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() }
+    }
+
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+        return reportingUnitDb.loadOne(student.studentId, unitId)
+    }
+
+    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
+        return reportingUnitDb.insertAll(reportingUnits)
+    }
+
+    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
new file mode 100644
index 000000000..1fd8b08e3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -0,0 +1,28 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getReportingUnits(student: Student): Single<List<ReportingUnit>> {
+        return sdk.init(student).getReportingUnits().map {
+            it.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
new file mode 100644
index 000000000..ee5440984
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -0,0 +1,48 @@
+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.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
+) {
+
+    fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
+        return local.getReportingUnits(student).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getReportingUnits(student)
+                    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()) }
+            )
+    }
+
+    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+        return local.getReportingUnit(student, unitId)
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) getReportingUnits(student, true)
+                    else Single.error(UnknownHostException())
+                }.flatMapMaybe {
+                    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
new file mode 100644
index 000000000..d87272875
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
@@ -0,0 +1,22 @@
+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 javax.inject.Inject
+
+class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
+
+    fun saveSchool(school: School) {
+        schoolDb.insertAll(listOf(school))
+    }
+
+    fun deleteSchool(school: School) {
+        schoolDb.deleteAll(listOf(school))
+    }
+
+    fun getSchool(semester: Semester): Maybe<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
new file mode 100644
index 000000000..6a95a446b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
@@ -0,0 +1,28 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+
+class SchoolRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getSchoolInfo(student: Student, semester: Semester): Single<School> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getSchool()
+            .map {
+                School(
+                    studentId = semester.studentId,
+                    classId = semester.classId,
+                    name = it.name,
+                    address = it.address,
+                    contact = it.contact,
+                    headmaster = it.headmaster,
+                    pedagogue = it.pedagogue
+                )
+            }
+    }
+}
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
new file mode 100644
index 000000000..1715a28d5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
@@ -0,0 +1,42 @@
+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.github.wulkanowy.data.db.entities.Student
+import io.reactivex.Maybe
+import io.reactivex.Single
+import java.net.UnknownHostException
+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(student: Student, semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
+        return local.getSchool(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSchoolInfo(student, 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) })
+            )
+    }
+}
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
new file mode 100644
index 000000000..3d98785cd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -0,0 +1,24 @@
+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)
+    }
+
+    fun deleteSemesters(semesters: List<Semester>) {
+        semesterDb.deleteAll(semesters)
+    }
+
+    fun getSemesters(student: Student): Maybe<List<Semester>> {
+        return semesterDb.loadAll(student.studentId, student.classId).filter { it.isNotEmpty() }
+    }
+}
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
new file mode 100644
index 000000000..90f0e1d71
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -0,0 +1,32 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+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.init(student).getSemesters().map { semesters ->
+            semesters.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
new file mode 100644
index 000000000..68946beef
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -0,0 +1,47 @@
+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.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.getCurrentOrLast
+import io.github.wulkanowy.utils.isCurrent
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import java.net.UnknownHostException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SemesterRepository @Inject constructor(
+    private val remote: SemesterRemote,
+    private val local: SemesterLocal,
+    private val settings: InternetObservingSettings
+) {
+
+    fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false): Single<List<Semester>> {
+        return local.getSemesters(student).filter { !forceRefresh }.filter { semesters ->
+            when {
+                Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> semesters.firstOrNull { it.isCurrent }?.diaryId != 0
+                refreshOnNoCurrent -> semesters.any { semester -> semester.isCurrent }
+                else -> true
+            }
+        }.switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+            .flatMap {
+                if (it) remote.getSemesters(student)
+                else Single.error(UnknownHostException())
+            }.flatMap { new ->
+                if (new.isEmpty()) throw IllegalArgumentException("Empty semester list!")
+
+                local.getSemesters(student).toSingle(emptyList()).doOnSuccess { old ->
+                    local.deleteSemesters(old.uniqueSubtract(new))
+                    local.saveSemesters(new.uniqueSubtract(old))
+                }
+            }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
+    }
+
+    fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {
+        return getSemesters(student, forceRefresh).map { it.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
new file mode 100644
index 000000000..06b9bb4ac
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -0,0 +1,64 @@
+package io.github.wulkanowy.data.repositories.student
+
+import android.content.Context
+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.security.decrypt
+import io.github.wulkanowy.utils.security.encrypt
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StudentLocal @Inject constructor(
+    private val studentDb: StudentDao,
+    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
+            })
+        }
+    }
+
+    fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
+        return studentDb.loadAll()
+            .map { list -> list.map { it.apply { if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password) } } }
+            .filter { it.isNotEmpty() }
+    }
+
+    fun getStudentById(id: Int): Maybe<Student> {
+        return studentDb.loadById(id).map {
+            it.apply {
+                if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+            }
+        }
+    }
+
+    fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
+        return studentDb.loadCurrent().map {
+            it.apply {
+                if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+            }
+        }
+    }
+
+    fun setCurrentStudent(student: Student): Completable {
+        return Completable.fromCallable {
+            studentDb.run {
+                resetCurrent()
+                updateCurrent(student.id)
+            }
+        }
+    }
+
+    fun logoutStudent(student: Student): Completable {
+        return Completable.fromCallable { 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
new file mode 100644
index 000000000..15c336505
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.data.repositories.student
+
+import io.github.wulkanowy.data.db.entities.Student
+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,
+                schoolShortName = student.schoolShortName,
+                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
+            )
+        }
+    }
+
+    fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
+        return sdk.getStudentsFromMobileApi(token, pin, symbol, "").map { mapStudents(it, "", "") }
+    }
+
+    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) }
+    }
+}
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
new file mode 100644
index 000000000..bebd1eb9c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -0,0 +1,73 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StudentRepository @Inject constructor(
+    private val local: StudentLocal,
+    private val remote: StudentRemote,
+    private val settings: InternetObservingSettings
+) {
+
+    fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
+
+    fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
+
+    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"))
+        }
+    }
+
+    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"))
+        }
+    }
+
+    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"))
+        }
+    }
+
+    fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {
+        return local.getStudents(decryptPass).toSingle(emptyList())
+    }
+
+    fun getStudentById(id: Int): Single<Student> {
+        return local.getStudentById(id)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
+    }
+
+    fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
+        return local.getCurrentStudent(decryptPass)
+            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
+            .toSingle()
+    }
+
+    fun saveStudents(students: List<Student>): Single<List<Long>> {
+        return local.saveStudents(students)
+    }
+
+    fun switchStudent(student: Student): Completable {
+        return local.setCurrentStudent(student)
+    }
+
+    fun logoutStudent(student: Student): Completable {
+        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
new file mode 100644
index 000000000..f8c13e6c2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -0,0 +1,25 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
+
+    fun getSubjects(semester: Semester): Maybe<List<Subject>> {
+        return subjectDao.loadAll(semester.diaryId, semester.studentId)
+            .filter { it.isNotEmpty() }
+    }
+
+    fun saveSubjects(subjects: List<Subject>) {
+        subjectDao.insertAll(subjects)
+    }
+
+    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
new file mode 100644
index 000000000..d30232f82
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -0,0 +1,29 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SubjectRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getSubjects(student: Student, semester: Semester): Single<List<Subject>> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getSubjects()
+            .map { subjects ->
+                subjects.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
new file mode 100644
index 000000000..649904da1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -0,0 +1,38 @@
+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.Student
+import io.github.wulkanowy.data.db.entities.Subject
+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(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
+        return local.getSubjects(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getSubjects(student, 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())
+                })
+    }
+}
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
new file mode 100644
index 000000000..dd2be5e58
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
@@ -0,0 +1,22 @@
+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 javax.inject.Inject
+
+class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
+
+    fun saveTeachers(teachers: List<Teacher>) {
+        teacherDb.insertAll(teachers)
+    }
+
+    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() }
+    }
+}
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
new file mode 100644
index 000000000..01552f748
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
@@ -0,0 +1,30 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TeacherRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getTeachers(student: Student, semester: Semester): Single<List<Teacher>> {
+        return sdk.init(student).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
+                    )
+                }
+            }
+    }
+}
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
new file mode 100644
index 000000000..3c10be73f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
@@ -0,0 +1,35 @@
+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.Student
+import io.github.wulkanowy.data.db.entities.Teacher
+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(student: Student, semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
+        return local.getTeachers(semester).filter { !forceRefresh }
+            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
+                .flatMap {
+                    if (it) remote.getTeachers(student, 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()) })
+    }
+}
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
new file mode 100644
index 000000000..e074ce2a1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
@@ -0,0 +1,25 @@
+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 javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) {
+
+    fun saveTimetable(timetables: List<Timetable>) {
+        timetableDb.insertAll(timetables)
+    }
+
+    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() }
+    }
+}
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
new file mode 100644
index 000000000..22cb947db
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -0,0 +1,43 @@
+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.github.wulkanowy.utils.init
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TimetableRemote @Inject constructor(private val sdk: Sdk) {
+
+    fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
+        return sdk.init(student).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,
+                        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
new file mode 100644
index 000000000..4a7a0eb24
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -0,0 +1,53 @@
+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.Student
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.uniqueSubtract
+import io.reactivex.Single
+import org.threeten.bp.LocalDate
+import java.net.UnknownHostException
+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 schedulerHelper: TimetableNotificationSchedulerHelper
+) {
+
+    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
+        return Single.fromCallable { start.monday to end.sunday }.flatMap { (monday, sunday) ->
+            local.getTimetable(semester, monday, sunday).filter { !forceRefresh }
+                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
+                    if (it) remote.getTimetable(student, semester, monday, sunday)
+                    else Single.error(UnknownHostException())
+                }.flatMap { new ->
+                    local.getTimetable(semester, monday, sunday)
+                        .toSingle(emptyList())
+                        .doOnSuccess { old ->
+                            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
+                                        )
+                                    }
+                                }
+                            })
+                        }
+                }.flatMap {
+                    local.getTimetable(semester, monday, sunday).toSingle(emptyList())
+                }).map { list -> list.filter { it.date in start..end }.also { schedulerHelper.scheduleNotifications(it, student) } }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
new file mode 100644
index 000000000..c0329f7d7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
@@ -0,0 +1,22 @@
+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 4efb4d84a..db5ff59b3 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -5,23 +5,29 @@ import android.content.Context
 import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.WulkanowyApp
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Singleton
 
 @Module
-@InstallIn(SingletonComponent::class)
 internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideDispatchersProvider() = DispatchersProvider()
+    fun provideContext(app: WulkanowyApp): Context = app
 
     @Singleton
     @Provides
-    fun provideAppWidgetManager(@ApplicationContext context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
+    fun provideSchedulersProvider() = SchedulersProvider()
+
+    @Singleton
+    @Provides
+    fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
+
+    @Singleton
+    @Provides
+    fun provideAppInfo() = AppInfo()
 
     @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
new file mode 100644
index 000000000..1b462964d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import io.github.wulkanowy.di.scopes.PerActivity
+import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver
+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 {
+
+    @ContributesAndroidInjector
+    abstract fun bindErrorDialog(): ErrorDialog
+
+    @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
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableNotificationReceiver(): TimetableNotificationReceiver
+}
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
new file mode 100644
index 000000000..c1b4352a4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..08884dac5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..1203d7d88
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt
@@ -0,0 +1,7 @@
+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
deleted file mode 100644
index 1e795d439..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-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 891f07da0..b87f0e683 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -5,12 +5,11 @@ 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.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
+import dagger.android.ContributesAndroidInjector
 import dagger.multibindings.IntoSet
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.services.sync.channels.DebugChannel
@@ -18,8 +17,8 @@ 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.channels.PushChannel
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
 import io.github.wulkanowy.services.sync.works.CompletedLessonWork
@@ -34,27 +33,31 @@ 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")
-@Module
-@InstallIn(SingletonComponent::class)
+@AssistedModule
+@Module(includes = [AssistedInject_ServicesModule::class])
 abstract class ServicesModule {
 
     companion object {
 
         @Provides
-        fun provideWorkManager(@ApplicationContext context: Context) = WorkManager.getInstance(context)
+        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
 
         @Singleton
         @Provides
-        fun provideNotificationManager(@ApplicationContext context: Context) = NotificationManagerCompat.from(context)
+        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
 
         @Singleton
         @Provides
-        fun provideAlarmManager(@ApplicationContext context: Context): AlarmManager = context.getSystemService()!!
+        fun provideAlarmManager(context: Context): AlarmManager = context.getSystemService()!!
     }
 
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+
     @Binds
     @IntoSet
     abstract fun provideGradeWork(work: GradeWork): Work
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
index 8eefc032f..0130f4673 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
@@ -3,35 +3,33 @@ package io.github.wulkanowy.services.alarm
 import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.BroadcastReceiver
 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 dagger.android.AndroidInjection
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.services.HiltBroadcastReceiver
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 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.SchedulersProvider
 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() {
+class TimetableNotificationReceiver : BroadcastReceiver() {
 
     @Inject
     lateinit var studentRepository: StudentRepository
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     companion object {
         const val NOTIFICATION_TYPE_CURRENT = 1
         const val NOTIFICATION_TYPE_UPCOMING = 2
@@ -52,17 +50,17 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
 
     @SuppressLint("CheckResult")
     override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
         Timber.d("Receiving intent... ${intent.toUri(0)}")
+        AndroidInjection.inject(this, context)
 
-        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)
+        studentRepository.getCurrentStudent(false)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                val studentId = intent.getIntExtra(STUDENT_ID, 0)
+                if (it.studentId == studentId) prepareNotification(context, intent)
+                else Timber.d("Notification studentId($studentId) differs from current(${it.studentId})")
+            }, { Timber.e(it) })
     }
 
     private fun prepareNotification(context: Context, intent: Intent) {
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
index c5a5590b9..54b245ddb 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
@@ -8,10 +8,9 @@ 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.PreferencesRepository
+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
@@ -26,107 +25,69 @@ import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companio
 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.nickOrName
 import io.github.wulkanowy.utils.toTimestamp
-import kotlinx.coroutines.withContext
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 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 context: Context,
     private val alarmManager: AlarmManager,
-    private val preferencesRepository: PreferencesRepository,
-    private val dispatchersProvider: DispatchersProvider,
+    private val preferencesRepository: PreferencesRepository
 ) {
 
-    private fun getRequestCode(time: LocalDateTime, studentId: Int) =
-        (time.toTimestamp() * studentId).toInt()
+    private fun getRequestCode(time: LocalDateTime, studentId: Int) = (time.toTimestamp() * studentId).toInt()
 
-    private fun getUpcomingLessonTime(
-        index: Int,
-        day: List<Timetable>,
-        lesson: Timetable
-    ) = day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
+    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))
+    fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
+        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")
-            }
+            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)
-        )
+        alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_UPDATE_CURRENT))
     }
 
-    fun cancelNotification() =
-        NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
+    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)
-        }
+    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 }
+        lessons.groupBy { it.date }
+            .map { it.value.sortedBy { lesson -> lesson.start } }
+            .map { it.filter { lesson -> !lesson.canceled && lesson.isStudentPlan } }
+            .map { day ->
+                day.forEachIndexed { index, lesson ->
+                    val intent = createIntent(student, lesson, day.getOrNull(index + 1))
 
-                    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, day, lesson))
+                    }
 
-                        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
-                                )
-                            }
+                    if (lesson.end > now()) {
+                        scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
+                        if (day.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.nickOrName)
+            putExtra(STUDENT_NAME, student.studentName)
             putExtra(LESSON_ROOM, lesson.room)
             putExtra(LESSON_START, lesson.start.toTimestamp())
             putExtra(LESSON_END, lesson.end.toTimestamp())
@@ -136,23 +97,13 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
         }
     }
 
-    private fun scheduleBroadcast(
-        intent: Intent,
-        studentId: Int,
-        notificationType: Int,
-        time: LocalDateTime
-    ) {
-        AlarmManagerCompat.setExactAndAllowWhileIdle(
-            alarmManager, RTC_WAKEUP, time.toTimestamp(),
+    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"
-        )
+        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 b94d97e33..965ed0ad9 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
@@ -3,7 +3,6 @@ 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
@@ -16,15 +15,16 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import com.paulinasadowska.rxworkmanagerobservers.extensions.getWorkInfoByIdObservable
 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.PreferencesRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
-import kotlinx.coroutines.flow.Flow
+import io.reactivex.Observable
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate.now
 import java.util.concurrent.TimeUnit.MINUTES
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -44,7 +44,6 @@ class SyncManager @Inject constructor(
 
         if (SDK_INT >= O) {
             channels.forEach { it.create() }
-            notificationManager.deleteNotificationChannel("lesson_channel")
             notificationManager.deleteNotificationChannel("new_entries_channel")
         }
 
@@ -68,7 +67,7 @@ class SyncManager @Inject constructor(
         }
     }
 
-    fun startOneTimeSyncWorker(): Flow<WorkInfo> {
+    fun startOneTimeSyncWorker(): Observable<WorkInfo> {
         val work = OneTimeWorkRequestBuilder<SyncWorker>()
             .setInputData(
                 Data.Builder()
@@ -78,8 +77,7 @@ class SyncManager @Inject constructor(
             .build()
 
         workManager.enqueueUniqueWork("${SyncWorker::class.java.simpleName}_one_time", ExistingWorkPolicy.REPLACE, work)
-
-        return workManager.getWorkInfoByIdLiveData(work.id).asFlow()
+        return workManager.getWorkInfoByIdObservable(work.id)
     }
 
     fun stopSyncWorker() {
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 8b6bc65d1..126d856aa 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,26 +5,26 @@ 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.hilt.work.HiltWorker
-import androidx.work.CoroutineWorker
 import androidx.work.Data
+import androidx.work.ListenableWorker
+import androidx.work.RxWorker
 import androidx.work.WorkerParameters
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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 kotlinx.coroutines.coroutineScope
+import io.reactivex.Completable
+import io.reactivex.Single
 import timber.log.Timber
 import kotlin.random.Random
 
-@HiltWorker
 class SyncWorker @AssistedInject constructor(
     @Assisted appContext: Context,
     @Assisted workerParameters: WorkerParameters,
@@ -33,60 +33,61 @@ class SyncWorker @AssistedInject constructor(
     private val works: Set<@JvmSuppressWildcards Work>,
     private val preferencesRepository: PreferencesRepository,
     private val notificationManager: NotificationManagerCompat
-) : CoroutineWorker(appContext, workerParameters) {
+) : RxWorker(appContext, workerParameters) {
 
-    override suspend fun doWork() = coroutineScope {
+    override fun createWork(): Single<Result> {
         Timber.i("SyncWorker is starting")
-
-        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
+        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)
+                                .onErrorResumeNext {
+                                    if (it is FeatureDisabledException || it is FeatureNotAvailableException) Completable.complete()
+                                    else Completable.error(it)
+                                }
+                                .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") }
+                        })
+                    }
+            }
+            .toSingleDefault(Result.success())
+            .onErrorReturn {
+                Timber.e(it, "There was an error during synchronization")
+                when {
+                    inputData.getBoolean("one_time", false) -> {
+                        Result.failure(Data.Builder()
+                            .putString("error", it.toString())
+                            .build()
+                        )
+                    }
+                    else -> Result.retry()
                 }
             }
-        }
-        val result = when {
-            exceptions.isNotEmpty() && inputData.getBoolean("one_time", false) -> {
-                Result.failure(
-                    Data.Builder()
-                        .putString("error", exceptions.map { it.stackTraceToString() }.toString())
-                        .build()
-                )
+            .doOnSuccess {
+                if (preferencesRepository.isDebugNotificationEnable) notify(it)
+                Timber.i("SyncWorker result: $it")
             }
-            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_stat_push)
-                .setAutoCancel(true)
-                .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
-                .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
-                .setPriority(PRIORITY_DEFAULT)
-                .build()
-        )
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
+            .setContentTitle("Debug notification")
+            .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
new file mode 100644
index 000000000..aadfc27f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
@@ -0,0 +1,20 @@
+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/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
index 2c7565195..a67350550 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,7 +6,6 @@ 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
@@ -14,7 +13,7 @@ import javax.inject.Inject
 @TargetApi(26)
 class DebugChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val appInfo: AppInfo
 ) : Channel {
 
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
index 8025bd76c..ae228edd7 100644
--- 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
@@ -6,14 +6,13 @@ 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
+    private val context: Context
 ) : Channel {
 
     companion object {
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
index 5d5727d35..7d6f275d9 100644
--- 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
@@ -6,14 +6,13 @@ 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
+    private val context: Context
 ) : Channel {
 
     companion object {
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
index 962fbfa24..49f39c6be 100644
--- 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
@@ -6,14 +6,13 @@ 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
+    private val context: Context
 ) : Channel {
 
     companion object {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
index c6e79b393..d80d43dc5 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
@@ -6,14 +6,13 @@ 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 NewNotesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    @ApplicationContext private val context: Context
+    private val context: Context
 ) : Channel {
 
     companion object {
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
index 1d7376b92..a0e24ab45 100644
--- 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
@@ -6,14 +6,13 @@ 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
+    private val context: Context
 ) : Channel {
 
     companion object {
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
index 63b3a4f91..a292c8b53 100644
--- 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
@@ -6,18 +6,17 @@ 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
+    private val context: Context
 ) : Channel {
 
     companion object {
-        const val CHANNEL_ID = "upcoming_lesson_channel"
+        const val CHANNEL_ID = "lesson_channel"
     }
 
     override fun create() {
@@ -26,7 +25,6 @@ class UpcomingLessonsChannel @Inject constructor(
                 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 cbe1fe6bd..5f7d7efa2 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
@@ -2,15 +2,16 @@ 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.AttendanceSummaryRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class AttendanceSummaryWork @Inject constructor(
     private val attendanceSummaryRepository: AttendanceSummaryRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).ignoreElement()
     }
 }
+
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 788e4ea2c..063b74825 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
@@ -2,16 +2,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.AttendanceRepository
-import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        attendanceRepository.getAttendance(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return attendanceRepository.getAttendance(student, semester, now().monday, now().sunday, true)
+            .ignoreElement()
     }
 }
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 17bd61292..26f79a0d5 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
@@ -2,18 +2,20 @@ 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.CompletedLessonsRepository
-import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class CompletedLessonWork @Inject constructor(
     private val completedLessonsRepository: CompletedLessonsRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true)
+            .ignoreElement()
     }
 }
+
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 b75499301..1ef97f59c 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
@@ -2,14 +2,16 @@ 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.ExamRepository
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.data.repositories.exam.ExamRepository
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        examRepository.getExams(student, semester, now(), now(), true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return examRepository.getExams(student, semester, now().monday, now().sunday, true).ignoreElement()
     }
 }
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 4575b419b..327c71740 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
@@ -2,19 +2,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.GradeStatisticsRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
+import io.reactivex.Completable
 import javax.inject.Inject
 
-class GradeStatisticsWork @Inject constructor(
-    private val gradeStatisticsRepository: GradeStatisticsRepository
-) : Work {
+class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        with(gradeStatisticsRepository) {
-            getGradesPartialStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
-            getGradesSemesterStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
-            getGradesPointsStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return gradeStatisticsRepository.getGradesStatistics(student, semester, "Wszystkie", false, 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 19c26edd0..6e90826ad 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,51 +7,40 @@ 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.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 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.github.wulkanowy.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class GradeWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val gradeRepository: GradeRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    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 })
-        }
+    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 })
+            }
     }
 
-    private fun getNotificationBuilder(): NotificationCompat.Builder {
-        return NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
+    private fun notify(grades: List<Grade>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewGradesChannel.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))
             .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
@@ -60,12 +49,6 @@ 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}") }
@@ -74,30 +57,4 @@ 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 a16841e9a..186d57b03 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
@@ -2,16 +2,16 @@ 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.HomeworkRepository
-import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.LocalDate.now
 import javax.inject.Inject
 
 class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).ignoreElement()
     }
 }
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 9f5365535..f19af4df6 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,35 +7,34 @@ 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.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 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.github.wulkanowy.utils.waitForResult
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class LuckyNumberWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val luckyNumberRepository: LuckyNumberRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    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 })
-        }
+    override fun create(student: Student, semester: Semester): Completable {
+        return luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable)
+            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(student) }
+            .flatMapCompletable {
+                notify(it)
+                luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
+            }
     }
 
     private fun notify(luckyNumber: 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 93c30b57c..b8773dbca 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,37 +7,35 @@ 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
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.MessageRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+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.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.github.wulkanowy.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class MessageWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val messageRepository: MessageRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    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 })
-        }
+    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 })
+            }
     }
 
     private fun notify(messages: List<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 50f418ed3..4fc92ffcc 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,57 +7,40 @@ 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.NoteRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-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.data.repositories.note.NoteRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 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.github.wulkanowy.utils.waitForResult
-import kotlinx.coroutines.flow.first
+import io.reactivex.Completable
 import javax.inject.Inject
 import kotlin.random.Random
 
 class NoteWork @Inject constructor(
-    @ApplicationContext private val context: Context,
+    private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val noteRepository: NoteRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    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 })
-        }
+    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 })
+            }
     }
 
     private fun notify(notes: List<Note>) {
         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)
-                }
-            )
+            .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))
             .setSmallIcon(R.drawable.ic_stat_note)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
@@ -67,13 +50,7 @@ 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(
-                    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)
-                    }
-                )
+                setSummaryText(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 34ab3db04..fa610dee4 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
@@ -2,8 +2,9 @@ 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.RecipientRepository
-import io.github.wulkanowy.data.repositories.ReportingUnitRepository
+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(
@@ -11,13 +12,13 @@ class RecipientWork @Inject constructor(
     private val recipientRepository: RecipientRepository
 ) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        reportingUnitRepository.refreshReportingUnits(student)
-
-        reportingUnitRepository.getReportingUnits(student).let { units ->
-            units.map {
-                recipientRepository.refreshRecipients(student, it, 2)
+    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()
+                })
             }
-        }
     }
 }
+
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 7c614c6c5..5a7a41d8d 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
@@ -2,13 +2,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.TeacherRepository
-import io.github.wulkanowy.utils.waitForResult
+import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
+import io.reactivex.Completable
 import javax.inject.Inject
 
 class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
 
-    override suspend fun doWork(student: Student, semester: Semester) {
-        teacherRepository.getTeachers(student, semester, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return teacherRepository.getTeachers(student, semester, true).ignoreElement()
     }
 }
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 2df2c9dcb..d79d24033 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
@@ -2,18 +2,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.TimetableRepository
-import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.waitForResult
-import java.time.LocalDate.now
+import io.github.wulkanowy.utils.monday
+import io.reactivex.Completable
+import org.threeten.bp.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 suspend fun doWork(student: Student, semester: Semester) {
-        timetableRepository.getTimetable(student, semester, now().monday, now().sunday, true).waitForResult()
+    override fun create(student: Student, semester: Semester): Completable {
+        return timetableRepository.getTimetable(student, semester, now().monday, now().sunday, true)
+            .ignoreElement()
     }
 }
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 c41f41ce2..1601a103b 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,8 +2,10 @@ 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 {
 
-    suspend fun doWork(student: Student, semester: Semester)
+    fun create(student: Student, semester: Semester): Completable
 }
+
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 45cd2b04e..e5ccf963c 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,17 +2,16 @@ package io.github.wulkanowy.services.widgets
 
 import android.content.Intent
 import android.widget.RemoteViewsService
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+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 timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TimetableWidgetService : RemoteViewsService() {
 
     @Inject
@@ -30,8 +29,11 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
-        Timber.d("TimetableWidgetFactory created")
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, applicationContext, intent)
+        AndroidInjection.inject(this)
+        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, schedulers, 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 9b93953d4..f20fb22f3 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
@@ -14,6 +14,9 @@ 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
@@ -22,10 +25,13 @@ import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
 
 abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
-    AppCompatActivity(), BaseView {
+    AppCompatActivity(), BaseView, HasAndroidInjector {
 
     protected var binding: VB by lifecycleAwareVariable()
 
+    @Inject
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
+
     @Inject
     lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
 
@@ -36,8 +42,8 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
     abstract var presenter: T
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        inject()
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
         themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
@@ -45,9 +51,7 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
         if (SDK_INT >= LOLLIPOP) {
             @Suppress("DEPRECATION")
-            setTaskDescription(
-                ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface))
-            )
+            setTaskDescription(ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface)))
         }
     }
 
@@ -88,8 +92,5 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         presenter.onDetachView()
     }
 
-    //https://github.com/google/dagger/releases/tag/dagger-2.33
-    protected open fun inject() {
-        throw UnsupportedOperationException()
-    }
+    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 1c31976ee..0279dccf4 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,16 +1,11 @@
 package io.github.wulkanowy.ui.base
 
 import android.widget.Toast
-import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
-import io.github.wulkanowy.utils.AnalyticsHelper
+import dagger.android.support.DaggerAppCompatDialogFragment
 import io.github.wulkanowy.utils.lifecycleAwareVariable
-import javax.inject.Inject
 
-abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView {
-
-    @Inject
-    lateinit var analyticsHelper: AnalyticsHelper
+abstract class BaseDialogFragment<VB : ViewBinding> : DaggerAppCompatDialogFragment(), BaseView {
 
     protected var binding: VB by lifecycleAwareVariable()
 
@@ -33,14 +28,4 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
-
-    override fun onResume() {
-        super.onResume()
-        analyticsHelper.setCurrentScreen(requireActivity(), this::class.simpleName)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        analyticsHelper.popCurrentScreen(this::class.simpleName)
-    }
 }
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 c6a2e1d1c..83f787654 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
@@ -2,14 +2,14 @@ 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<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragment(layoutId),
+abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : DaggerFragment(layoutId),
     BaseView {
 
     protected var binding: VB by lifecycleAwareVariable()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
index bd735535d..5f8bf4178 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt
@@ -4,7 +4,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 
-//TODO  Use ViewPager2
 class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) :
     FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
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 b222b0abb..9f0b4047c 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,34 +1,22 @@
 package io.github.wulkanowy.ui.base
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.StudentRepository
-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 io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
+import io.reactivex.disposables.CompositeDisposable
 import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
 
 open class BasePresenter<T : BaseView>(
     protected val errorHandler: ErrorHandler,
-    protected val studentRepository: StudentRepository
-) : CoroutineScope {
+    protected val studentRepository: StudentRepository,
+    protected val schedulers: SchedulersProvider
+) {
 
-    private var job: Job = Job()
-
-    private val jobs = mutableMapOf<String, Job>()
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main + job
+    val disposable = CompositeDisposable()
 
     var view: T? = null
 
     open fun onAttachView(view: T) {
-        job = Job()
         this.view = view
         errorHandler.apply {
             showErrorMessage = view::showError
@@ -38,47 +26,30 @@ open class BasePresenter<T : BaseView>(
     }
 
     fun onExpiredLoginSelected() {
-        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])
+        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()
             }
-        }.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()
-        }
+            .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)
+            }))
     }
 
     open fun onDetachView() {
         view = null
-        job.cancel()
+        disposable.clear()
         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 4ce977709..896e4ff1c 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
@@ -11,27 +11,23 @@ import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.DialogErrorBinding
+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.sdk.scrapper.exception.ServiceUnavailableException
+import io.github.wulkanowy.sdk.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
 
-@AndroidEntryPoint
 class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
 
     private lateinit var error: Throwable
@@ -42,8 +38,10 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
     companion object {
         private const val ARGUMENT_KEY = "Data"
 
-        fun newInstance(error: Throwable) = ErrorDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, error) }
+        fun newInstance(error: Throwable): ErrorDialog {
+            return ErrorDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, error) }
+            }
         }
     }
 
@@ -55,14 +53,12 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogErrorBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogErrorBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         val stringWriter = StringWriter().apply {
             error.printStackTrace(PrintWriter(this))
@@ -87,8 +83,6 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
             errorDialogReport.isEnabled = when (error) {
                 is UnknownHostException,
                 is InterruptedIOException,
-                is ConnectException,
-                is StreamResetException,
                 is SocketTimeoutException,
                 is ServiceUnavailableException,
                 is FeatureDisabledException,
@@ -114,17 +108,11 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
             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}-${appInfo.buildFlavor}"
+            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
-                )
+                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 34dd3ec16..f746b36f8 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,14 +1,15 @@
 package io.github.wulkanowy.ui.base
 
 import android.content.res.Resources
+import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
+import io.github.wulkanowy.sdk.exception.BadCredentialsException
 import io.github.wulkanowy.utils.getString
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
 import javax.inject.Inject
 
-open class ErrorHandler @Inject constructor(protected val resources: Resources) {
+open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckerCollector: ChuckerCollector) {
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
@@ -17,15 +18,16 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources)
     var onNoCurrentStudent: () -> Unit = {}
 
     fun dispatch(error: Throwable) {
+        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) {
-        showErrorMessage(resources.getString(error), error)
         when (error) {
             is ScramblerException, is BadCredentialsException -> onSessionExpired()
             is NoCurrentStudentException -> onNoCurrentStudent()
+            else -> showErrorMessage(resources.getString(error), error)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
index b560ed2e7..501348612 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -7,10 +7,7 @@ import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -20,13 +17,7 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
     fun applyActivityTheme(activity: AppCompatActivity) {
         if (isThemeApplicable(activity)) {
             applyDefaultTheme()
-            if (preferencesRepository.appTheme == "black") {
-                when (activity) {
-                    is MainActivity -> activity.setTheme(R.style.WulkanowyTheme_Black)
-                    is LoginActivity -> activity.setTheme(R.style.WulkanowyTheme_Login_Black)
-                    is SendMessageActivity -> activity.setTheme(R.style.WulkanowyTheme_MessageSend_Black)
-                }
-            }
+            if (preferencesRepository.appTheme == "black") activity.setTheme(R.style.WulkanowyTheme_Black)
         }
     }
 
@@ -42,13 +33,8 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
     }
 
     private fun isThemeApplicable(activity: AppCompatActivity): Boolean {
-        return activity.packageManager
-            .getPackageInfo(activity.packageName, GET_ACTIVITIES)
-            .activities.singleOrNull { it.name == activity::class.java.canonicalName }
-            ?.theme.let {
-                it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar
-                    || it == R.style.WulkanowyTheme_Login || it == R.style.WulkanowyTheme_Login_Black
-                    || it == R.style.WulkanowyTheme_MessageSend || it == R.style.WulkanowyTheme_MessageSend_Black
-            }
+        return activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
+            .activities.singleOrNull { it.name == activity::class.java.canonicalName }?.theme
+            .let { it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar }
     }
 }
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
index a43aaffb7..cefe6ed75 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
@@ -1,25 +1,19 @@
 package io.github.wulkanowy.ui.base
 
 import android.annotation.SuppressLint
+import android.graphics.PorterDuff
 import android.view.LayoutInflater
 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.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.nickOrName
 import javax.inject.Inject
 
-class WidgetConfigureAdapter @Inject constructor() :
-    RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
+class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
 
-    var items = emptyList<StudentWithSemesters>()
-
-    var selectedId = -1L
+    var items = emptyList<Pair<Student, Boolean>>()
 
     var onClickListener: (Student) -> Unit = {}
 
@@ -31,33 +25,17 @@ class WidgetConfigureAdapter @Inject constructor() :
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (student, semesters) = items[position]
-        val semester = semesters.maxByOrNull { it.semesterId }
-        val context = holder.binding.root.context
-        val checkBackgroundColor = context.getThemeAttrColor(R.attr.colorSurface)
-        val avatar = context.createNameInitialsDrawable(student.nickOrName, student.avatarColor)
-        val isDuplicatedStudent = items.filter {
-            val studentToCompare = it.student
-
-            studentToCompare.studentId == student.studentId
-                && studentToCompare.schoolSymbol == student.schoolSymbol
-                && studentToCompare.symbol == student.symbol
-        }.size > 1
+        val (student, isCurrent) = items[position]
 
         with(holder.binding) {
-            accountItemName.text = "${student.nickOrName} ${semester?.diaryName.orEmpty()}"
+            accountItemName.text = "${student.studentName} ${student.className}"
             accountItemSchool.text = student.schoolName
-            accountItemImage.setImageDrawable(avatar)
 
-            with(accountItemAccountType) {
-                setText(if (student.isParent) R.string.account_type_parent else R.string.account_type_student)
-                isVisible = isDuplicatedStudent
-            }
+            with(accountItemImage) {
+                val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
 
-            with(accountItemCheck) {
-                isVisible = student.id == selectedId
-                borderColor = checkBackgroundColor
-                circleColor = checkBackgroundColor
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
             }
 
             root.setOnClickListener { onClickListener(student) }
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 1c613800d..d85d01e9e 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
@@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.View
 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
@@ -18,11 +17,8 @@ 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.toFormattedString
-import io.github.wulkanowy.utils.toLocalDateTime
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about), AboutView,
     MainView.TitledView {
 
@@ -37,9 +33,7 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
 
     override val versionRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            val buildTimestamp = appInfo.buildTimestamp.toLocalDateTime().toFormattedString("yyyy-MM-dd")
-            val versionSignature = "${appInfo.versionName}-${appInfo.buildFlavor} (${appInfo.versionCode}), $buildTimestamp"
-            Triple(getString(R.string.about_version), versionSignature, getCompatDrawable(R.drawable.ic_all_about))
+            Triple(getString(R.string.about_version), "${appInfo.versionName} (${appInfo.versionCode})", getCompatDrawable(R.drawable.ic_all_about))
         }
 
     override val creatorsRes: Triple<String, String, Drawable?>?
@@ -62,18 +56,9 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
             Triple(getString(R.string.about_discord), getString(R.string.about_discord_summary), getCompatDrawable(R.drawable.ic_about_discord))
         }
 
-    override val facebookRes: Triple<String, String, Drawable?>?
-        get() = context?.run {
-            Triple(getString(R.string.about_facebook), getString(R.string.about_facebook_summary), getCompatDrawable(R.drawable.ic_about_facebook))
-        }
-
     override val homepageRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(
-                getString(R.string.about_homepage),
-                getString(R.string.about_homepage_summary),
-                getCompatDrawable(R.drawable.ic_all_home)
-            )
+            Triple(getString(R.string.about_homepage), getString(R.string.about_homepage_summary), getCompatDrawable(R.drawable.ic_about_homepage))
         }
 
     override val licensesRes: Triple<String, String, Drawable?>?
@@ -126,10 +111,6 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openFacebookPage() {
-        context?.openInternetBrowser("https://www.facebook.com/wulkanowy", ::showMessage)
-    }
-
     override fun openHomepage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
     }
@@ -139,17 +120,11 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
             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}-${appInfo.buildFlavor}"
+            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
-                )
+                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
             }
         )
     }
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 fde20267d..ee892adfc 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,19 +1,21 @@
 package io.github.wulkanowy.ui.modules.about
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
 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: AnalyticsHelper
-) : BasePresenter<AboutView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<AboutView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: AboutView) {
         super.onAttachView(view)
@@ -46,11 +48,6 @@ class AboutPresenter @Inject constructor(
                     openDiscordInvite()
                     analytics.logEvent("about_open", "name" to "discord")
                 }
-                facebookRes?.first -> {
-                    Timber.i("Opening facebook")
-                    openFacebookPage()
-                    analytics.logEvent("about_open", "name" to "facebook")
-                }
                 homepageRes?.first -> {
                     Timber.i("Opening homepage")
                     openHomepage()
@@ -83,7 +80,6 @@ class AboutPresenter @Inject constructor(
                 feedbackRes,
                 faqRes,
                 discordRes,
-                facebookRes,
                 homepageRes,
                 licensesRes,
                 privacyRes
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 54882b302..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
@@ -15,8 +15,6 @@ interface AboutView : BaseView {
 
     val discordRes: Triple<String, String, Drawable?>?
 
-    val facebookRes: Triple<String, String, Drawable?>?
-
     val homepageRes: Triple<String, String, Drawable?>?
 
     val licensesRes: Triple<String, String, Drawable?>?
@@ -33,8 +31,6 @@ interface AboutView : BaseView {
 
     fun openDiscordInvite()
 
-    fun openFacebookPage()
-
     fun openEmailClient()
 
     fun openFaqPage()
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
index b6755c6a7..215cd27db 100644
--- 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
@@ -3,7 +3,7 @@ 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.api.load
 import coil.transform.RoundedCornersTransformation
 import io.github.wulkanowy.data.pojos.Contributor
 import io.github.wulkanowy.databinding.ItemContributorBinding
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
index 5d7e076c7..42eebd347 100644
--- 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
@@ -5,7 +5,6 @@ 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
@@ -15,7 +14,6 @@ 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 {
 
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
index ef4b540e6..416a59ce5 100644
--- 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
@@ -1,20 +1,19 @@
 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.AppCreatorRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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 io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class ContributorPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val appCreatorRepository: AppCreatorRepository
-) : BasePresenter<ContributorView>(errorHandler, studentRepository) {
+) : BasePresenter<ContributorView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: ContributorView) {
         super.onAttachView(view)
@@ -31,15 +30,10 @@ class ContributorPresenter @Inject constructor(
     }
 
     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()
+        disposable.add(appCreatorRepository.getAppCreators()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
     }
 }
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
index 6ae06bbe7..07025c09f 100644
--- 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
@@ -24,7 +24,7 @@ class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter
 
         with(holder.binding) {
             licenseItemName.text = item.libraryName
-            licenseItemSummary.text = item.licenses?.firstOrNull()?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
+            licenseItemSummary.text = item.license?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
 
             root.setOnClickListener { onClickListener(item) }
         }
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 4c3b608aa..f6c3b5698 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
@@ -4,19 +4,18 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import androidx.appcompat.app.AlertDialog
 import androidx.core.text.parseAsHtml
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.Lazy
 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 javax.inject.Inject
 
-@AndroidEntryPoint
 class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_license),
     LicenseView, MainView.TitledView {
 
@@ -26,9 +25,15 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
     @Inject
     lateinit var licenseAdapter: LicenseAdapter
 
+    @Inject
+    lateinit var libs: Lazy<Libs>
+
     override val titleStringId get() = R.string.license_title
 
-    override val appLibraries by lazy { Libs(requireContext()).libraries }
+    override val appLibraries: ArrayList<Library>?
+        get() = context?.let {
+            libs.get().prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+        }
 
     companion object {
         fun newInstance() = LicenseFragment()
@@ -58,7 +63,7 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
 
     override fun openLicense(licenseHtml: String) {
         context?.let {
-            MaterialAlertDialogBuilder(it).apply {
+            AlertDialog.Builder(it).apply {
                 setTitle(R.string.license_dialog_title)
                 setMessage(licenseHtml.parseAsHtml())
                 setPositiveButton(android.R.string.ok) { _, _ -> }
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
new file mode 100644
index 000000000..0ffc3d90e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
@@ -0,0 +1,15 @@
+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 cc430fc2c..d0f6d69e0 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,23 +1,18 @@
 package io.github.wulkanowy.ui.modules.about.license
 
 import com.mikepenz.aboutlibraries.entity.Library
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.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 io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
 import javax.inject.Inject
 
 class LicensePresenter @Inject constructor(
-    private val dispatchers: DispatchersProvider,
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<LicenseView>(errorHandler, studentRepository) {
+) : BasePresenter<LicenseView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LicenseView) {
         super.onAttachView(view)
@@ -26,22 +21,14 @@ class LicensePresenter @Inject constructor(
     }
 
     fun onItemSelected(library: Library) {
-        view?.run { library.licenses?.firstOrNull()?.licenseDescription?.let { openLicense(it) } }
+        view?.run { library.license?.licenseDescription?.let { openLicense(it) } }
     }
 
     private fun loadData() {
-        flowWithResource {
-            withContext(dispatchers.backgroundThread) {
-                view?.appLibraries.orEmpty()
-            }
-        }.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()
+        disposable.add(Single.fromCallable { view?.appLibraries.orEmpty() }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnEvent { _, _ -> view?.showProgress(false) }
+            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
     }
 }
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 6c97d8759..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
@@ -5,7 +5,7 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface LicenseView : BaseView {
 
-    val appLibraries: List<Library>
+    val appLibraries: ArrayList<Library>?
 
     fun initView()
 
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
index cf40975e7..08f91aff1 100644
--- 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
@@ -14,7 +14,6 @@ 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
@@ -23,7 +22,6 @@ 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 {
 
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
index 80020c81d..4485cb3eb 100644
--- 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
@@ -1,20 +1,19 @@
 package io.github.wulkanowy.ui.modules.about.logviewer
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.LoggerRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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 io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LogViewerPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val loggerRepository: LoggerRepository
-) : BasePresenter<LogViewerView>(errorHandler, studentRepository) {
+) : BasePresenter<LogViewerView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LogViewerView) {
         super.onAttachView(view)
@@ -23,19 +22,16 @@ class LogViewerPresenter @Inject constructor(
     }
 
     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")
+        disposable.add(loggerRepository.getLogFiles()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading logs files result: ${it.joinToString { it.name }}")
+                view?.shareLogs(it)
+            }, {
+                Timber.i("Loading logs files result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
         return true
     }
 
@@ -44,18 +40,15 @@ class LogViewerPresenter @Inject constructor(
     }
 
     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")
+        disposable.add(loggerRepository.getLastLogLines()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Loading last log file result: load ${it.size} lines")
+                view?.setLines(it)
+            }, {
+                Timber.i("Loading last log file result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
     }
 }
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
deleted file mode 100644
index dbcb499e8..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-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
index 523fbbd79..7df0ca378 100644
--- 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
@@ -1,115 +1,46 @@
 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.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.HeaderAccountBinding
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.nickOrName
 import javax.inject.Inject
 
-class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class AccountAdapter @Inject constructor() : RecyclerView.Adapter<AccountAdapter.ItemViewHolder>() {
 
-    var isAccountQuickDialogMode = false
+    var items = emptyList<Student>()
 
-    var items = emptyList<AccountItem<*>>()
-
-    var onClickListener: (StudentWithSemesters) -> Unit = {}
+    var onClickListener: (Student) -> 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,
-                position
-            )
-            is ItemViewHolder -> bindItemViewHolder(
-                holder.binding,
-                items[position].value as StudentWithSemesters
-            )
-        }
-    }
-
-    private fun bindHeaderViewHolder(
-        binding: HeaderAccountBinding,
-        account: Account,
-        position: Int
-    ) {
-        with(binding) {
-            accountHeaderDivider.visibility = if (position == 0) GONE else VISIBLE
-            accountHeaderEmail.text = account.email
-            accountHeaderType.setText(if (account.isParent) R.string.account_type_parent else R.string.account_type_student)
-        }
-    }
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
 
     @SuppressLint("SetTextI18n")
-    private fun bindItemViewHolder(
-        binding: ItemAccountBinding,
-        studentWithSemesters: StudentWithSemesters
-    ) {
-        val context = binding.root.context
-        val (student, semesters) = studentWithSemesters
-        val semester = semesters.maxByOrNull { it.semesterId }
-        val avatar = context.createNameInitialsDrawable(student.nickOrName, student.avatarColor)
-        val checkBackgroundColor =
-            context.getThemeAttrColor(if (isAccountQuickDialogMode) R.attr.colorBackgroundFloating else R.attr.colorSurface)
-        val isDuplicatedStudent = items.filter {
-            if (it.value !is StudentWithSemesters) return@filter false
-            val studentToCompare = it.value.student
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val student = items[position]
 
-            studentToCompare.studentId == student.studentId
-                && studentToCompare.schoolSymbol == student.schoolSymbol
-                && studentToCompare.symbol == student.symbol
-        }.size > 1 && isAccountQuickDialogMode
+        with(holder.binding) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
 
-        with(binding) {
-            accountItemName.text = "${student.nickOrName} ${semester?.diaryName.orEmpty()}"
-            accountItemSchool.text = studentWithSemesters.student.schoolName
-            accountItemImage.setImageDrawable(avatar)
+            with(accountItemImage) {
+                val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
 
-            with(accountItemAccountType) {
-                setText(if (student.isParent) R.string.account_type_parent else R.string.account_type_student)
-                isVisible = isDuplicatedStudent
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
             }
 
-            with(accountItemCheck) {
-                isVisible = student.isCurrent
-                borderColor = checkBackgroundColor
-                circleColor = checkBackgroundColor
-            }
-
-            root.setOnClickListener { onClickListener(studentWithSemesters) }
+            root.setOnClickListener { onClickListener(student) }
         }
     }
 
-    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
new file mode 100644
index 000000000..ce811e0b0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@@ -0,0 +1,101 @@
+package io.github.wulkanowy.ui.modules.account
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import android.widget.Toast.LENGTH_LONG
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.LinearLayoutManager
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.DialogAccountBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import javax.inject.Inject
+
+class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
+
+    @Inject
+    lateinit var presenter: AccountPresenter
+
+    @Inject
+    lateinit var accountAdapter: AccountAdapter
+
+    companion object {
+        fun newInstance() = AccountDialog()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogAccountBinding.inflate(inflater).apply { binding = this }.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        accountAdapter.onClickListener = presenter::onItemSelected
+
+        with(binding) {
+            accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
+            accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
+            accountDialogRecycler.apply {
+                layoutManager = LinearLayoutManager(context)
+                adapter = accountAdapter
+            }
+        }
+    }
+
+    override fun updateData(data: List<Student>) {
+        with(accountAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun showError(text: String, error: Throwable) {
+        showMessage(text)
+    }
+
+    override fun showMessage(text: String) {
+        Toast.makeText(context, text, LENGTH_LONG).show()
+    }
+
+    override fun dismissView() {
+        dismiss()
+    }
+
+    override fun openLoginView() {
+        activity?.let {
+            startActivity(LoginActivity.getStartIntent(it))
+        }
+    }
+
+    override fun showConfirmDialog() {
+        context?.let {
+            AlertDialog.Builder(it)
+                .setTitle(R.string.account_logout_student)
+                .setMessage(R.string.account_confirm)
+                .setPositiveButton(R.string.account_logout) { _, _ -> presenter.onLogoutConfirm() }
+                .setNegativeButton(android.R.string.cancel) { _, _ -> }
+                .show()
+        }
+    }
+
+    override fun recreateMainView() {
+        activity?.recreate()
+    }
+
+    override fun onDestroy() {
+        presenter.onDetachView()
+        super.onDestroy()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt
deleted file mode 100644
index 7a8f8585f..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.View
-import androidx.core.view.get
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.FragmentAccountBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsFragment
-import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AccountFragment : BaseFragment<FragmentAccountBinding>(R.layout.fragment_account),
-    AccountView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: AccountPresenter
-
-    @Inject
-    lateinit var accountAdapter: AccountAdapter
-
-    companion object {
-
-        fun newInstance() = AccountFragment()
-    }
-
-    override val titleStringId = R.string.account_title
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding = FragmentAccountBinding.bind(view)
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        binding.accountRecycler.apply {
-            layoutManager = LinearLayoutManager(context)
-            adapter = accountAdapter
-        }
-
-        accountAdapter.onClickListener = presenter::onItemSelected
-
-        binding.accountAdd.setOnClickListener { presenter.onAddSelected() }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        menu[0].isVisible = false
-    }
-
-    override fun updateData(data: List<AccountItem<*>>) {
-        with(accountAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun openLoginView() {
-        activity?.let {
-            startActivity(LoginActivity.getStartIntent(it))
-        }
-    }
-
-    override fun openAccountDetailsView(studentWithSemesters: StudentWithSemesters) {
-        (activity as? MainActivity)?.pushView(
-            AccountDetailsFragment.newInstance(studentWithSemesters)
-        )
-    }
-}
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
deleted file mode 100644
index 05a4a69ce..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package io.github.wulkanowy.ui.modules.account
-
-data class AccountItem<out T>(val value: T, val viewType: ViewType) {
-
-    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 8d1651395..3416a043f 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,24 +1,26 @@
 package io.github.wulkanowy.ui.modules.account
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.db.entities.Student
+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.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Single
 import timber.log.Timber
 import javax.inject.Inject
 
 class AccountPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-) : BasePresenter<AccountView>(errorHandler, studentRepository) {
+    private val syncManager: SyncManager
+) : BasePresenter<AccountView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: AccountView) {
         super.onAttachView(view)
         view.initView()
-        Timber.i("Account view was initialized")
+        Timber.i("Account dialog view was initialized")
         loadData()
     }
 
@@ -27,39 +29,71 @@ class AccountPresenter @Inject constructor(
         view?.openLoginView()
     }
 
-    fun onItemSelected(studentWithSemesters: StudentWithSemesters) {
-        view?.openAccountDetailsView(studentWithSemesters)
+    fun onRemoveSelected() {
+        Timber.i("Select remove account")
+        view?.showConfirmDialog()
+    }
+
+    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)
+            }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.dismissView() }
+            .subscribe({
+                view?.apply {
+                    if (it.isEmpty()) {
+                        Timber.i("Logout result: Open login view")
+                        syncManager.stopSyncWorker()
+                        openClearLoginView()
+                    } else {
+                        Timber.i("Logout result: Switch to another student")
+                        recreateMainView()
+                    }
+                }
+            }, {
+                Timber.i("Logout result: An exception occurred")
+                errorHandler.dispatch(it)
+            }))
+    }
+
+    fun onItemSelected(student: Student) {
+        Timber.i("Select student item ${student.id}")
+        if (student.isCurrent) {
+            view?.dismissView()
+        } else {
+            Timber.i("Attempt to change a student")
+            disposable.add(studentRepository.switchStudent(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)
+                }))
+        }
     }
 
     private fun loadData() {
-        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("load")
-    }
-
-    private fun createAccountItems(items: List<StudentWithSemesters>): List<AccountItem<*>> {
-        return items.groupBy {
-            Account("${it.student.userName} (${it.student.email})", it.student.isParent)
-        }
-            .map { (account, students) ->
-                listOf(
-                    AccountItem(account, AccountItem.ViewType.HEADER)
-                ) + students.map { student ->
-                    AccountItem(student, AccountItem.ViewType.ITEM)
-                }
-            }
-            .flatten()
+        Timber.i("Loading account data started")
+        disposable.add(studentRepository.getSavedStudents(false)
+            .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)
+            }))
     }
 }
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 d7deefafd..abb9e1d27 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
@@ -1,15 +1,20 @@
 package io.github.wulkanowy.ui.modules.account
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AccountView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<AccountItem<*>>)
+    fun updateData(data: List<Student>)
+
+    fun dismissView()
+
+    fun showConfirmDialog()
 
     fun openLoginView()
 
-    fun openAccountDetailsView(studentWithSemesters: StudentWithSemesters)
+    fun recreateMainView()
 }
+
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
deleted file mode 100644
index f1c7f7bd1..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountdetails
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.get
-import androidx.core.view.isVisible
-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.FragmentAccountDetailsBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.account.accountedit.AccountEditDialog
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoFragment
-import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
-import io.github.wulkanowy.utils.createNameInitialsDrawable
-import io.github.wulkanowy.utils.nickOrName
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AccountDetailsFragment :
-    BaseFragment<FragmentAccountDetailsBinding>(R.layout.fragment_account_details),
-    AccountDetailsView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: AccountDetailsPresenter
-
-    override val titleStringId = R.string.account_details_title
-
-    companion object {
-
-        private const val ARGUMENT_KEY = "Data"
-
-        fun newInstance(studentWithSemesters: StudentWithSemesters) =
-            AccountDetailsFragment().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, studentWithSemesters) }
-            }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAccountDetailsBinding.bind(view)
-        presenter.onAttachView(this, requireArguments()[ARGUMENT_KEY] as StudentWithSemesters)
-    }
-
-    override fun initView() {
-        binding.accountDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
-        binding.accountDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        binding.accountDetailsLogout.setOnClickListener { presenter.onRemoveSelected() }
-        binding.accountDetailsSelect.setOnClickListener { presenter.onStudentSelect() }
-
-        binding.accountDetailsPersonalData.setOnClickListener {
-            presenter.onStudentInfoSelected(StudentInfoView.Type.PERSONAL)
-        }
-        binding.accountDetailsAddressData.setOnClickListener {
-            presenter.onStudentInfoSelected(StudentInfoView.Type.ADDRESS)
-        }
-        binding.accountDetailsContactData.setOnClickListener {
-            presenter.onStudentInfoSelected(StudentInfoView.Type.CONTACT)
-        }
-        binding.accountDetailsFamilyData.setOnClickListener {
-            presenter.onStudentInfoSelected(StudentInfoView.Type.FAMILY)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        menu[0].isVisible = false
-        inflater.inflate(R.menu.action_menu_account_details, menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return if (item.itemId == R.id.accountDetailsMenuEdit) {
-            presenter.onAccountEditSelected()
-            true
-        } else false
-    }
-
-    override fun showAccountData(student: Student) {
-        with(binding) {
-            accountDetailsCheck.isVisible = student.isCurrent
-            accountDetailsName.text = student.nickOrName
-            accountDetailsSchool.text = student.schoolName
-            accountDetailsAvatar.setImageDrawable(
-                requireContext().createNameInitialsDrawable(
-                    student.nickOrName,
-                    student.avatarColor
-                )
-            )
-        }
-    }
-
-    override fun enableSelectStudentButton(enable: Boolean) {
-        binding.accountDetailsSelect.isEnabled = enable
-    }
-
-    override fun showAccountEditDetailsDialog(student: Student) {
-        (requireActivity() as MainActivity).showDialogFragment(
-            AccountEditDialog.newInstance(student)
-        )
-    }
-
-    override fun showLogoutConfirmDialog() {
-        context?.let {
-            AlertDialog.Builder(it)
-                .setTitle(R.string.account_logout_student)
-                .setMessage(R.string.account_confirm)
-                .setPositiveButton(R.string.account_logout) { _, _ -> presenter.onLogoutConfirm() }
-                .setNegativeButton(android.R.string.cancel) { _, _ -> }
-                .show()
-        }
-    }
-
-    override fun popView() {
-        (requireActivity() as MainActivity).popView(2)
-    }
-
-    override fun recreateMainView() {
-        requireActivity().recreate()
-    }
-
-    override fun openStudentInfoView(
-        infoType: StudentInfoView.Type,
-        studentWithSemesters: StudentWithSemesters
-    ) {
-        (requireActivity() as MainActivity).pushView(
-            StudentInfoFragment.newInstance(
-                infoType,
-                studentWithSemesters
-            )
-        )
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.accountDetailsError.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.accountDetailsErrorMessage.text = message
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.accountDetailsProgress.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.accountDetailsContent.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt
deleted file mode 100644
index cc53c9b63..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt
+++ /dev/null
@@ -1,180 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountdetails
-
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.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.ui.modules.studentinfo.StudentInfoView
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import javax.inject.Inject
-
-class AccountDetailsPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val syncManager: SyncManager
-) : BasePresenter<AccountDetailsView>(errorHandler, studentRepository) {
-
-    private var studentWithSemesters: StudentWithSemesters? = null
-
-    private lateinit var lastError: Throwable
-
-    private var studentId: Long? = null
-
-    fun onAttachView(view: AccountDetailsView, studentWithSemesters: StudentWithSemesters) {
-        super.onAttachView(view)
-        studentId = studentWithSemesters.student.id
-
-        view.initView()
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        Timber.i("Account details view was initialized")
-        loadData()
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents() }
-            .map { studentWithSemesters ->
-                Resource(
-                    data = studentWithSemesters.data?.single { it.student.id == studentId },
-                    status = studentWithSemesters.status,
-                    error = studentWithSemesters.error
-                )
-            }
-            .onEach {
-                when (it.status) {
-                    Status.LOADING -> {
-                        view?.run {
-                            showProgress(true)
-                            showContent(false)
-                        }
-                        Timber.i("Loading account details view started")
-                    }
-                    Status.SUCCESS -> {
-                        Timber.i("Loading account details view result: Success")
-                        studentWithSemesters = it.data
-                        view?.run {
-                            showAccountData(studentWithSemesters!!.student)
-                            enableSelectStudentButton(!studentWithSemesters!!.student.isCurrent)
-                            showContent(true)
-                            showErrorView(false)
-                        }
-                    }
-                    Status.ERROR -> {
-                        Timber.i("Loading account details view result: An exception occurred")
-                        errorHandler.dispatch(it.error!!)
-                    }
-                }
-            }
-            .afterLoading { view?.showProgress(false) }
-            .launch()
-    }
-
-    fun onAccountEditSelected() {
-        studentWithSemesters?.let {
-            view?.showAccountEditDetailsDialog(it.student)
-        }
-    }
-
-    fun onStudentInfoSelected(infoType: StudentInfoView.Type) {
-        studentWithSemesters?.let {
-            view?.openStudentInfoView(infoType, it)
-        }
-    }
-
-    fun onStudentSelect() {
-        if (studentWithSemesters == null) return
-
-        Timber.i("Select student ${studentWithSemesters!!.student.id}")
-
-        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?.popView()
-            }.launch("switch")
-    }
-
-    fun onRemoveSelected() {
-        Timber.i("Select remove account")
-        view?.showLogoutConfirmDialog()
-    }
-
-    fun onLogoutConfirm() {
-        if (studentWithSemesters == null) return
-
-        flowWithResource {
-            val studentToLogout = studentWithSemesters!!.student
-
-            studentRepository.logoutStudent(studentToLogout)
-            val students = studentRepository.getSavedStudents(false)
-
-            if (studentToLogout.isCurrent && students.isNotEmpty()) {
-                studentRepository.switchStudent(students[0])
-            }
-
-            return@flowWithResource students
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to logout user")
-                Status.SUCCESS -> view?.run {
-                    when {
-                        it.data!!.isEmpty() -> {
-                            Timber.i("Logout result: Open login view")
-                            syncManager.stopSyncWorker()
-                            openClearLoginView()
-                        }
-                        studentWithSemesters!!.student.isCurrent -> {
-                            Timber.i("Logout result: Logout student and switch to another")
-                            recreateMainView()
-                        }
-                        else -> Timber.i("Logout result: Logout student")
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Logout result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.popView()
-        }.launch("logout")
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            lastError = error
-            setErrorDetails(message)
-            showErrorView(true)
-            showContent(false)
-            showProgress(false)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt
deleted file mode 100644
index 652f0c1aa..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsView.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountdetails
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.ui.base.BaseView
-import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
-
-interface AccountDetailsView : BaseView {
-
-    fun initView()
-
-    fun showAccountData(student: Student)
-
-    fun showAccountEditDetailsDialog(student: Student)
-
-    fun showLogoutConfirmDialog()
-
-    fun popView()
-
-    fun recreateMainView()
-
-    fun enableSelectStudentButton(enable: Boolean)
-
-    fun openStudentInfoView(
-        infoType: StudentInfoView.Type,
-        studentWithSemesters: StudentWithSemesters
-    )
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun showProgress(show: Boolean)
-
-    fun showContent(show: Boolean)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditColorAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditColorAdapter.kt
deleted file mode 100644
index ab6eec417..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditColorAdapter.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountedit
-
-import android.annotation.SuppressLint
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
-import android.graphics.drawable.RippleDrawable
-import android.graphics.drawable.StateListDrawable
-import android.os.Build
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.databinding.ItemAccountEditColorBinding
-import javax.inject.Inject
-
-class AccountEditColorAdapter @Inject constructor() :
-    RecyclerView.Adapter<AccountEditColorAdapter.ViewHolder>() {
-
-    var items = listOf<Int>()
-
-    var selectedColor = 0
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
-        ItemAccountEditColorBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("RestrictedApi", "NewApi")
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            accountEditItemColor.setImageDrawable(GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(item)
-            })
-
-            accountEditItemColorContainer.foreground = item.createForegroundDrawable()
-            accountEditCheck.isVisible = selectedColor == item
-
-            root.setOnClickListener {
-                val oldSelectedPosition = items.indexOf(selectedColor)
-                selectedColor = item
-
-                notifyItemChanged(oldSelectedPosition)
-                notifyItemChanged(position)
-            }
-        }
-    }
-
-    private fun Int.createForegroundDrawable(): Drawable =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val mask = GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(Color.BLACK)
-            }
-            RippleDrawable(ColorStateList.valueOf(this.rippleColor), null, mask)
-        } else {
-            val foreground = StateListDrawable().apply {
-                alpha = 80
-                setEnterFadeDuration(250)
-                setExitFadeDuration(250)
-            }
-
-            val mask = GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(this@createForegroundDrawable.rippleColor)
-            }
-
-            foreground.apply {
-                addState(intArrayOf(android.R.attr.state_pressed), mask)
-                addState(intArrayOf(), ColorDrawable(Color.TRANSPARENT))
-            }
-        }
-
-    private inline val Int.rippleColor: Int
-        get() {
-            val hsv = FloatArray(3)
-            Color.colorToHSV(this, hsv)
-            hsv[2] = hsv[2] * 0.5f
-            return Color.HSVToColor(hsv)
-        }
-
-    class ViewHolder(val binding: ItemAccountEditColorBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
deleted file mode 100644
index 21a7a492d..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountedit
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.GridLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.databinding.DialogAccountEditBinding
-import io.github.wulkanowy.ui.base.BaseDialogFragment
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AccountEditDialog : BaseDialogFragment<DialogAccountEditBinding>(), AccountEditView {
-
-    @Inject
-    lateinit var presenter: AccountEditPresenter
-
-    @Inject
-    lateinit var accountEditColorAdapter: AccountEditColorAdapter
-
-    companion object {
-
-        private const val ARGUMENT_KEY = "student_with_semesters"
-
-        fun newInstance(student: Student) =
-            AccountEditDialog().apply {
-                arguments = Bundle().apply {
-                    putSerializable(ARGUMENT_KEY, student)
-                }
-            }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = DialogAccountEditBinding.inflate(inflater).apply { binding = this }.root
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        presenter.onAttachView(this, requireArguments()[ARGUMENT_KEY] as Student)
-    }
-
-    override fun initView() {
-        with(binding) {
-            accountEditDetailsCancel.setOnClickListener { dismiss() }
-            accountEditDetailsSave.setOnClickListener {
-                presenter.changeStudentNickAndAvatar(
-                    binding.accountEditDetailsNickText.text.toString(),
-                    accountEditColorAdapter.selectedColor
-                )
-            }
-
-            with(binding.accountEditColors) {
-                layoutManager = GridLayoutManager(context, 4)
-                adapter = accountEditColorAdapter
-            }
-        }
-    }
-
-    override fun updateSelectedColorData(color: Int) {
-        with(accountEditColorAdapter) {
-            selectedColor = color
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun updateColorsData(colors: List<Int>) {
-        with(accountEditColorAdapter) {
-            items = colors
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun showCurrentNick(nick: String) {
-        binding.accountEditDetailsNickText.setText(nick)
-    }
-
-    override fun popView() {
-        dismiss()
-    }
-
-    override fun recreateMainView() {
-        activity?.recreate()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        presenter.onDetachView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt
deleted file mode 100644
index 62dd70ab4..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountedit
-
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
-import io.github.wulkanowy.data.repositories.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.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import javax.inject.Inject
-
-class AccountEditPresenter @Inject constructor(
-    private val appInfo: AppInfo,
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository
-) : BasePresenter<AccountEditView>(errorHandler, studentRepository) {
-
-    lateinit var student: Student
-
-    private val colors = appInfo.defaultColorsForAvatar.map { it.toInt() }
-
-    fun onAttachView(view: AccountEditView, student: Student) {
-        super.onAttachView(view)
-        this.student = student
-
-        with(view) {
-            initView()
-            showCurrentNick(student.nick.trim())
-        }
-        Timber.i("Account edit dialog view was initialized")
-        loadData()
-
-        view.updateColorsData(colors)
-    }
-
-    private fun loadData() {
-        flowWithResource {
-            studentRepository.getStudentById(student.id, false).avatarColor
-        }.onEach { resource ->
-            when (resource.status) {
-                Status.LOADING -> Timber.i("Attempt to load student")
-                Status.SUCCESS -> {
-                    view?.updateSelectedColorData(resource.data?.toInt()!!)
-                    Timber.i("Attempt to load student: Success")
-                }
-                Status.ERROR -> {
-                    Timber.i("Attempt to load student: An exception occurred")
-                    errorHandler.dispatch(resource.error!!)
-                }
-            }
-        }.launch("load_data")
-    }
-
-    fun changeStudentNickAndAvatar(nick: String, avatarColor: Int) {
-        flowWithResource {
-            val studentNick =
-                StudentNickAndAvatar(nick = nick.trim(), avatarColor = avatarColor.toLong())
-                    .apply { id = student.id }
-            studentRepository.updateStudentNickAndAvatar(studentNick)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to change a student nick and avatar")
-                Status.SUCCESS -> {
-                    Timber.i("Change a student nick and avatar result: Success")
-                    view?.recreateMainView()
-                }
-                Status.ERROR -> {
-                    Timber.i("Change a student nick and avatar result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }
-            .afterLoading { view?.popView() }
-            .launch("update_student")
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditView.kt
deleted file mode 100644
index 517492de1..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditView.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountedit
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface AccountEditView : BaseView {
-
-    fun initView()
-
-    fun popView()
-
-    fun recreateMainView()
-
-    fun showCurrentNick(nick: String)
-
-    fun updateSelectedColorData(color: Int)
-
-    fun updateColorsData(colors: List<Int>)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
deleted file mode 100644
index 4279102e1..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
+++ /dev/null
@@ -1,95 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountquick
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.DialogAccountQuickBinding
-import io.github.wulkanowy.ui.base.BaseDialogFragment
-import io.github.wulkanowy.ui.modules.account.AccountAdapter
-import io.github.wulkanowy.ui.modules.account.AccountFragment
-import io.github.wulkanowy.ui.modules.account.AccountItem
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AccountQuickDialog : BaseDialogFragment<DialogAccountQuickBinding>(), AccountQuickView {
-
-    @Inject
-    lateinit var accountAdapter: AccountAdapter
-
-    @Inject
-    lateinit var presenter: AccountQuickPresenter
-
-    companion object {
-
-        private const val STUDENTS_ARGUMENT_KEY = "students"
-
-        fun newInstance(studentsWithSemesters: List<StudentWithSemesters>) =
-            AccountQuickDialog().apply {
-                arguments = Bundle().apply {
-                    putSerializable(STUDENTS_ARGUMENT_KEY, studentsWithSemesters.toTypedArray())
-                }
-            }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogAccountQuickBinding.inflate(inflater).apply { binding = this }.root
-
-    @Suppress("UNCHECKED_CAST")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val studentsWithSemesters =
-            (requireArguments()[STUDENTS_ARGUMENT_KEY] as Array<StudentWithSemesters>).toList()
-
-        presenter.onAttachView(this, studentsWithSemesters)
-    }
-
-    override fun initView() {
-        binding.accountQuickDialogManger.setOnClickListener { presenter.onManagerSelected() }
-
-        with(accountAdapter) {
-            isAccountQuickDialogMode = true
-            onClickListener = presenter::onStudentSelect
-        }
-
-        with(binding.accountQuickDialogRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = accountAdapter
-        }
-    }
-
-    override fun updateData(data: List<AccountItem<*>>) {
-        with(accountAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun popView() {
-        dismiss()
-    }
-
-    override fun recreateMainView() {
-        activity?.recreate()
-    }
-
-    override fun openAccountView() {
-        (requireActivity() as MainActivity).pushView(AccountFragment.newInstance())
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickPresenter.kt
deleted file mode 100644
index 39d8fce24..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickPresenter.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountquick
-
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.ui.modules.account.AccountItem
-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 AccountQuickPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository
-) : BasePresenter<AccountQuickView>(errorHandler, studentRepository) {
-
-    private lateinit var studentsWithSemesters: List<StudentWithSemesters>
-
-    fun onAttachView(view: AccountQuickView, studentsWithSemesters: List<StudentWithSemesters>) {
-        super.onAttachView(view)
-        this.studentsWithSemesters = studentsWithSemesters
-
-        view.initView()
-        Timber.i("Account quick dialog view was initialized")
-        view.updateData(createAccountItems(studentsWithSemesters))
-    }
-
-    fun onManagerSelected() {
-        view?.run {
-            openAccountView()
-            popView()
-        }
-    }
-
-    fun onStudentSelect(studentWithSemesters: StudentWithSemesters) {
-        Timber.i("Select student ${studentWithSemesters.student.id}")
-
-        if (studentWithSemesters.student.isCurrent) {
-            view?.popView()
-            return
-        }
-
-        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?.popView() }
-            .launch("switch")
-    }
-
-    private fun createAccountItems(items: List<StudentWithSemesters>) = items.map {
-        AccountItem(it, AccountItem.ViewType.ITEM)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickView.kt
deleted file mode 100644
index 4a9420d99..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickView.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountquick
-
-import io.github.wulkanowy.ui.base.BaseView
-import io.github.wulkanowy.ui.modules.account.AccountItem
-
-interface AccountQuickView : BaseView {
-
-    fun initView()
-
-    fun updateData(data: List<AccountItem<*>>)
-
-    fun recreateMainView()
-
-    fun popView()
-
-    fun openAccountView()
-}
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
index 03ec1c842..a63d5045a 100644
--- 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
@@ -7,9 +7,8 @@ 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.enums.SentExcuseStatus
+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() :
@@ -35,7 +34,7 @@ class AttendanceAdapter @Inject constructor() :
         with(holder.binding) {
             attendanceItemNumber.text = item.number.toString()
             attendanceItemSubject.text = item.subject
-            attendanceItemDescription.setText(item.description)
+            attendanceItemDescription.text = item.name
             attendanceItemAlert.visibility = item.run { if (absence && !excused) View.VISIBLE else View.INVISIBLE }
             attendanceItemNumber.visibility = View.GONE
             attendanceItemExcuseInfo.visibility = View.GONE
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 8b6526cdc..97b76e812 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
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 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
 
@@ -18,11 +17,12 @@ class AttendanceDialog : DialogFragment() {
     private lateinit var attendance: Attendance
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Attendance) = AttendanceDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(exam: Attendance): AttendanceDialog {
+            return AttendanceDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
         }
     }
 
@@ -34,18 +34,16 @@ class AttendanceDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             attendanceDialogSubject.text = attendance.subject
-            attendanceDialogDescription.setText(attendance.description)
+            attendanceDialogDescription.text = attendance.name
             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 cb718c724..6599243dd 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
@@ -14,23 +14,20 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ActionMode
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-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.widgets.DividerItemDecoration
 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.getThemeAttrColor
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView,
     MainView.TitledView {
 
@@ -61,7 +58,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     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
@@ -113,8 +109,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
         with(binding) {
             attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            attendanceSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
             attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -192,11 +186,11 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showContent(show: Boolean) {
-        binding.attendanceRecycler.visibility = if (show) VISIBLE else GONE
+        binding. attendanceRecycler.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.attendanceSwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.attendanceSwipe.isRefreshing = false
     }
 
     override fun showPreButton(show: Boolean) {
@@ -226,7 +220,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
             setDateRangeLimiter(SchooldaysRangeLimiter())
             version = DatePickerDialog.Version.VERSION_2
             scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
             show(this@AttendanceFragment.parentFragmentManager, null)
         }
     }
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 b03db91af..437e06c92 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,41 +1,37 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.data.repositories.AttendanceRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
+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.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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 kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
-import java.time.LocalDate.ofEpochDay
+import java.util.concurrent.TimeUnit.MILLISECONDS
 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: AnalyticsHelper
-) : BasePresenter<AttendanceView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().previousOrSameSchoolDay
 
@@ -51,23 +47,23 @@ class AttendancePresenter @Inject constructor(
         view.initView()
         Timber.i("Attendance view was initialized")
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
-        loadData()
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
+        reloadView()
     }
 
     fun onPreviousDay() {
         view?.finishActionMode()
         attendanceToExcuseList.clear()
-        reloadView(currentDate.previousSchoolDay)
-        loadData()
+        loadData(currentDate.previousSchoolDay)
+        reloadView()
     }
 
     fun onNextDay() {
         view?.finishActionMode()
         attendanceToExcuseList.clear()
-        reloadView(currentDate.nextSchoolDay)
-        loadData()
+        loadData(currentDate.nextSchoolDay)
+        reloadView()
     }
 
     fun onPickDate() {
@@ -75,13 +71,13 @@ class AttendancePresenter @Inject constructor(
     }
 
     fun onDateSet(year: Int, month: Int, day: Int) {
-        reloadView(LocalDate.of(year, month, day))
-        loadData()
+        loadData(LocalDate.of(year, month, day))
+        reloadView()
     }
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the attendance")
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onRetry() {
@@ -89,7 +85,7 @@ class AttendancePresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onDetailsClick() {
@@ -102,8 +98,8 @@ class AttendancePresenter @Inject constructor(
             if (view.currentStackSize == 1) {
                 baseDate.also {
                     if (currentDate != it) {
-                        reloadView(it)
-                        loadData()
+                        loadData(it)
+                        reloadView()
                     } else if (!view.isViewEmpty) view.resetView()
                 }
             } else view.popView()
@@ -172,119 +168,100 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        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")
+        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")
+            })
     }
 
-    private fun loadData(forceRefresh: Boolean = false) {
+    private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceRepository.getAttendance(
-                student,
-                semester,
-                currentDate,
-                currentDate,
-                forceRefresh
-            )
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    view?.showExcuseButton(false)
-                    if (!it.data.isNullOrEmpty()) {
-                        val filteredAttendance = if (prefRepository.isShowPresent) {
-                            it.data
-                        } else {
-                            it.data.filter { item -> !item.presence }
-                        }
-
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showEmpty(filteredAttendance.isEmpty())
-                            showContent(filteredAttendance.isNotEmpty())
-                            updateData(filteredAttendance.sortedBy { item -> item.number })
-                        }
+        currentDate = date
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
                     }
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Loading attendance result: Success")
-                    val filteredAttendance = if (prefRepository.isShowPresent) {
-                        it.data.orEmpty()
-                    } else {
-                        it.data?.filter { item -> !item.presence }.orEmpty()
+                .map { list ->
+                    if (prefRepository.isShowPresent) list
+                    else list.filter { !it.presence }
+                }
+                .map { items -> items.sortedBy { it.number } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
                     }
-
+                }
+                .subscribe({
+                    Timber.i("Loading attendance result: Success")
                     view?.apply {
-                        updateData(filteredAttendance.sortedBy { item -> item.number })
-                        showEmpty(filteredAttendance.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(filteredAttendance.isNotEmpty())
-                        showExcuseButton(filteredAttendance.any { item -> item.excusable })
+                        showContent(it.isNotEmpty())
+                        showExcuseButton(it.any { item -> item.excusable })
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "attendance",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading attendance result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                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)
+        Timber.i("Excusing absence started")
+        disposable.apply {
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
+                    }
                 }
-                Status.SUCCESS -> {
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.apply {
+                        showProgress(true)
+                        showContent(false)
+                        showExcuseButton(false)
+                    }
+                }
+                .subscribe({
                     Timber.i("Excusing for absence result: Success")
                     analytics.logEvent("excuse_absence", "items" to attendanceToExcuseList.size)
                     attendanceToExcuseList.clear()
-                    view?.run {
+                    view?.apply {
                         showExcuseButton(false)
                         showMessage(excuseSuccessString)
-                        showContent(true)
-                        showProgress(false)
                     }
-                    loadData(forceRefresh = true)
-                }
-                Status.ERROR -> {
+                    loadData(currentDate, true)
+                }) {
                     Timber.i("Excusing for absence result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                    loadData()
-                }
-            }
-        }.launch("excuse")
+                    view?.showProgress(false)
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -298,14 +275,11 @@ class AttendancePresenter @Inject constructor(
         }
     }
 
-    private fun reloadView(date: LocalDate) {
-        currentDate = date
-
+    private fun reloadView() {
         Timber.i("Reload attendance view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
             enableSwipe(false)
-            showRefresh(false)
             showContent(false)
             showEmpty(false)
             showErrorView(false)
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 0459dfcf6..484070a2e 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 java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface AttendanceView : BaseView {
 
@@ -24,7 +24,7 @@ interface AttendanceView : BaseView {
 
     fun clearData()
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun resetView()
 
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
index 4250a9109..236c3da16 100644
--- 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
@@ -9,7 +9,7 @@ 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 org.threeten.bp.Month
 import java.util.Locale
 import javax.inject.Inject
 
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 118971e62..1b9fe08ef 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
@@ -8,18 +8,15 @@ import android.view.View.VISIBLE
 import android.widget.ArrayAdapter
 import android.widget.TextView
 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.getThemeAttrColor
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class AttendanceSummaryFragment :
     BaseFragment<FragmentAttendanceSummaryBinding>(R.layout.fragment_attendance_summary),
     AttendanceSummaryView, MainView.TitledView {
@@ -57,8 +54,6 @@ class AttendanceSummaryFragment :
 
         with(binding) {
             attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceSummarySwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            attendanceSummarySwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
             attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -124,8 +119,8 @@ class AttendanceSummaryFragment :
         binding.attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.attendanceSummarySwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.attendanceSummarySwipe.isRefreshing = false
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
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 e53cda749..33e18c2e7 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,30 +1,27 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.SubjectRepository
+import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import org.threeten.bp.Month
 import timber.log.Timber
-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: AnalyticsHelper
-) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository, schedulers) {
 
     private var subjects = emptyList<Subject>()
 
@@ -76,56 +73,45 @@ class AttendanceSummaryPresenter @Inject constructor(
 
     private fun loadData(subjectId: Int, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance summary data started")
-
         currentSubjectId = subjectId
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            attendanceSummaryRepository.getAttendanceSummary(student, semester, subjectId, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateDataSet(sortItems(it.data))
-                        }
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap {
+                        attendanceSummaryRepository.getAttendanceSummary(student, it, subjectId, forceRefresh)
                     }
                 }
-                Status.SUCCESS -> {
+                .map { items -> items.sortedByDescending { if (it.month.value <= Month.JUNE.value) it.month.value + 12 else it.month.value } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading attendance summary result: Success")
                     view?.apply {
-                        showEmpty(it.data!!.isEmpty())
-                        showContent(it.data.isNotEmpty())
-                        updateDataSet(sortItems(it.data))
+                        showEmpty(it.isEmpty())
+                        showContent(it.isNotEmpty())
+                        updateDataSet(it)
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "attendance_summary",
-                        "items" to it.data!!.size,
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh,
                         "item_id" to subjectId
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading attendance summary result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+                    errorHandler.dispatch(it)
                 }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
-    }
-
-    private fun sortItems(items: List<AttendanceSummary>) = items.sortedByDescending { item ->
-        if (item.month.value <= Month.JUNE.value) item.month.value + 12 else item.month.value
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -140,27 +126,27 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        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)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading attendance summary subjects result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading attendance summary subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
                 }
             }
-        }.launch("subjects")
+            .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)
+                }
+            }, {
+                Timber.i("Loading attendance summary subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 }
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 66f370c5c..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
@@ -9,7 +9,7 @@ interface AttendanceSummaryView : BaseView {
 
     fun initView()
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun showContent(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceAdapter.kt
deleted file mode 100644
index c87286149..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceAdapter.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.ui.modules.conference
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.databinding.ItemConferenceBinding
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class ConferenceAdapter @Inject constructor() :
-    RecyclerView.Adapter<ConferenceAdapter.ItemViewHolder>() {
-
-    var items = emptyList<Conference>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemConferenceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-        with(holder.binding) {
-            conferenceItemDate.text = item.date.toFormattedString("dd.MM.yyyy HH:mm")
-            conferenceItemName.text = item.presentOnConference
-            conferenceItemTitle.text = item.title
-            conferenceItemSubject.text = item.subject
-            conferenceItemContent.text = item.agenda
-            conferenceItemContent.visibility = if (item.agenda.isBlank()) View.GONE else View.VISIBLE
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemConferenceBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt
deleted file mode 100644
index dd10a65e0..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package io.github.wulkanowy.ui.modules.conference
-
-import android.os.Bundle
-import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.databinding.FragmentConferenceBinding
-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.getThemeAttrColor
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class ConferenceFragment : BaseFragment<FragmentConferenceBinding>(R.layout.fragment_conference),
-    ConferenceView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: ConferencePresenter
-
-    @Inject
-    lateinit var conferencesAdapter: ConferenceAdapter
-
-    companion object {
-        fun newInstance() = ConferenceFragment()
-    }
-
-    override val isViewEmpty: Boolean
-        get() = conferencesAdapter.items.isEmpty()
-
-    override val titleStringId: Int
-        get() = R.string.conferences_title
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentConferenceBinding.bind(view)
-        messageContainer = binding.conferenceRecycler
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        with(binding.conferenceRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = conferencesAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-
-        with(binding) {
-            conferenceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            conferenceSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            conferenceSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
-            conferenceErrorRetry.setOnClickListener { presenter.onRetry() }
-            conferenceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
-    }
-
-    override fun updateData(data: List<Conference>) {
-        with(conferencesAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun clearData() {
-        with(conferencesAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun showRefresh(show: Boolean) {
-        binding.conferenceSwipe.isRefreshing = show
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.conferenceProgress.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun showEmpty(show: Boolean) {
-        binding.conferenceEmpty.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.conferenceError.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.conferenceErrorMessage.text = message
-    }
-
-    override fun enableSwipe(enable: Boolean) {
-        binding.conferenceSwipe.isEnabled = enable
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.conferenceRecycler.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt
deleted file mode 100644
index cc7e50db5..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package io.github.wulkanowy.ui.modules.conference
-
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.ConferenceRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-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 ConferencePresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
-    private val conferenceRepository: ConferenceRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<ConferenceView>(errorHandler, studentRepository) {
-
-    private lateinit var lastError: Throwable
-
-    override fun onAttachView(view: ConferenceView) {
-        super.onAttachView(view)
-        view.initView()
-        Timber.i("Conferences view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    fun onSwipeRefresh() {
-        loadData(true)
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
-    private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading conference data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            conferenceRepository.getConferences(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateData(it.data.sortedByDescending { conference -> conference.date })
-                        }
-                    }
-                }
-                Status.SUCCESS -> {
-                    Timber.i("Loading conference result: Success")
-                    view?.run {
-                        updateData(it.data!!.sortedByDescending { conference -> conference.date })
-                        showContent(it.data.isNotEmpty())
-                        showEmpty(it.data.isEmpty())
-                        showErrorView(false)
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "conferences",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading conference result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceView.kt
deleted file mode 100644
index f3d1b3b3f..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceView.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.wulkanowy.ui.modules.conference
-
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.ui.base.BaseView
-
-interface ConferenceView : BaseView {
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun updateData(data: List<Conference>)
-
-    fun clearData()
-
-    fun showRefresh(show: Boolean)
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun showProgress(show: Boolean)
-
-    fun enableSwipe(enable: Boolean)
-
-    fun showContent(show: Boolean)
-}
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
index 535587399..85061997c 100644
--- 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
@@ -9,7 +9,7 @@ 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 org.threeten.bp.LocalDate
 import javax.inject.Inject
 
 class ExamAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
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 3f815a2cb..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
@@ -17,11 +17,12 @@ class ExamDialog : DialogFragment() {
     private lateinit var exam: Exam
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Exam) = ExamDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(exam: Exam): ExamDialog {
+            return ExamDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
         }
     }
 
@@ -33,14 +34,12 @@ class ExamDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogExamBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogExamBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             examDialogSubjectValue.text = exam.subject
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 0940b0bdf..eeab30c15 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
@@ -6,7 +6,6 @@ import android.view.View.GONE
 import android.view.View.INVISIBLE
 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.db.entities.Exam
 import io.github.wulkanowy.databinding.FragmentExamBinding
@@ -15,10 +14,8 @@ 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.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
     MainView.MainChildView, MainView.TitledView {
 
@@ -56,8 +53,6 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
 
         with(binding) {
             examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            examSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            examSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             examErrorRetry.setOnClickListener { presenter.onRetry() }
             examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -68,8 +63,8 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
         }
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.examSwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.examSwipe.isRefreshing = false
     }
 
     override fun updateData(data: List<ExamItem<*>>) {
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 b70a648f4..1140cb020 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,37 +1,33 @@
 package io.github.wulkanowy.ui.modules.exam
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.repositories.ExamRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.exam.ExamRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.sunday
 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 kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-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: AnalyticsHelper
-) : BasePresenter<ExamView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -45,24 +41,24 @@ class ExamPresenter @Inject constructor(
         view.initView()
         Timber.i("Exam view was initialized")
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
-        loadData()
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
+        reloadView()
     }
 
     fun onPreviousWeek() {
-        reloadView(currentDate.minusDays(7))
-        loadData()
+        loadData(currentDate.minusDays(7))
+        reloadView()
     }
 
     fun onNextWeek() {
-        reloadView(currentDate.plusDays(7))
-        loadData()
+        loadData(currentDate.plusDays(7))
+        reloadView()
     }
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the exam")
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onRetry() {
@@ -70,7 +66,7 @@ class ExamPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onDetailsClick() {
@@ -86,71 +82,66 @@ class ExamPresenter @Inject constructor(
         Timber.i("Exam view is reselected")
         baseDate.also {
             if (currentDate != it) {
-                reloadView(it)
-                loadData()
+                loadData(it)
+                reloadView()
             } else if (view?.isViewEmpty == false) view?.resetView()
         }
     }
 
     private fun setBaseDateOnHolidays() {
-        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")
+        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")
+            })
     }
 
-    private fun loadData(forceRefresh: Boolean = false) {
+    private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading exam data started")
-
-        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 -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateData(createExamItems(it.data))
-                        }
+        currentDate = date
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        examRepository.getExams(student, semester, currentDate.monday, currentDate.sunday, forceRefresh)
                     }
                 }
-                Status.SUCCESS -> {
+                .map { createExamItems(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading exam result: Success")
                     view?.apply {
-                        updateData(createExamItems(it.data!!))
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "exam",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading exam result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -172,9 +163,7 @@ class ExamPresenter @Inject constructor(
         }.flatten()
     }
 
-    private fun reloadView(date: LocalDate) {
-        currentDate = date
-
+    private fun reloadView() {
         Timber.i("Reload exam view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
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 ac1a87fe9..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
@@ -15,7 +15,7 @@ interface ExamView : BaseView {
 
     fun clearData()
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun resetView()
 
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 d83b1490c..bda098f47 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,29 +1,21 @@
 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.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+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.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
+import io.reactivex.Single
 import javax.inject.Inject
 
-@OptIn(FlowPreview::class)
 class GradeAverageProvider @Inject constructor(
     private val semesterRepository: SemesterRepository,
     private val gradeRepository: GradeRepository,
@@ -34,170 +26,79 @@ class GradeAverageProvider @Inject constructor(
 
     private val minusModifier get() = preferencesRepository.gradeMinusModifier
 
-    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean) =
-        flowWithResourceIn {
-            val semesters = semesterRepository.getSemesters(student)
-
+    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean = false): Single<List<GradeDetailsWithAverage>> {
+        return semesterRepository.getSemesters(student).flatMap { semesters ->
             when (preferencesRepository.gradeAverageMode) {
-                ONE_SEMESTER -> getGradeSubjects(
-                    student = student,
-                    semester = semesters.single { it.semesterId == semesterId },
-                    forceRefresh = forceRefresh
-                )
-                BOTH_SEMESTERS -> calculateCombinedAverage(
-                    student = student,
-                    semesters = semesters,
-                    semesterId = semesterId,
-                    forceRefresh = forceRefresh,
-                    averageMode = BOTH_SEMESTERS
-                )
-                ALL_YEAR -> calculateCombinedAverage(
-                    student = student,
-                    semesters = semesters,
-                    semesterId = semesterId,
-                    forceRefresh = forceRefresh,
-                    averageMode = ALL_YEAR
-                )
+                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 calculateCombinedAverage(
-        student: Student,
-        semesters: List<Semester>,
-        semesterId: Int,
-        forceRefresh: Boolean,
-        averageMode: GradeAverageMode
-    ): Flow<Resource<List<GradeSubject>>> {
-        val isGradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
+    private fun calculateBothSemestersAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
-        val firstSemester =
-            semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
+        val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
-        val selectedSemesterGradeSubjects =
-            getGradeSubjects(student, selectedSemester, forceRefresh)
+        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMap { selectedDetails ->
+            val isAnyAverage = selectedDetails.any { it.average != .0 }
 
-        if (selectedSemester == firstSemester) return selectedSemesterGradeSubjects
-
-        val firstSemesterGradeSubjects = getGradeSubjects(student, firstSemester, forceRefresh)
-
-        return selectedSemesterGradeSubjects.combine(firstSemesterGradeSubjects) { secondSemesterGradeSubject, firstSemesterGradeSubject ->
-            if (firstSemesterGradeSubject.status == Status.ERROR) {
-                return@combine firstSemesterGradeSubject
-            }
-
-            val isAnyVulcanAverageInFirstSemester =
-                firstSemesterGradeSubject.data.orEmpty().any { it.isVulcanAverage }
-            val isAnyVulcanAverageInSecondSemester =
-                secondSemesterGradeSubject.data.orEmpty().any { it.isVulcanAverage }
-
-            val updatedData = secondSemesterGradeSubject.data?.map { secondSemesterSubject ->
-                val firstSemesterSubject = firstSemesterGradeSubject.data.orEmpty()
-                    .singleOrNull { it.subject == secondSemesterSubject.subject }
-
-                val updatedAverage = if (averageMode == ALL_YEAR) {
-                    calculateAllYearAverage(
-                        student = student,
-                        isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
-                        isGradeAverageForceCalc = isGradeAverageForceCalc,
-                        secondSemesterSubject = secondSemesterSubject,
-                        firstSemesterSubject = firstSemesterSubject
-                    )
-                } else {
-                    calculateBothSemestersAverage(
-                        student = student,
-                        isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
-                        isGradeAverageForceCalc = isGradeAverageForceCalc,
-                        secondSemesterSubject = secondSemesterSubject,
-                        firstSemesterSubject = firstSemesterSubject
-                    )
+            if (selectedSemester != firstSemester) {
+                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
+                    selectedDetails.map { selected ->
+                        val second = secondDetails.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)
+                    }
                 }
-                secondSemesterSubject.copy(average = updatedAverage)
-            }
-            secondSemesterGradeSubject.copy(data = updatedData)
+            } else Single.just(selectedDetails)
         }
     }
 
-    private fun calculateAllYearAverage(
-        student: Student,
-        isAnyVulcanAverage: Boolean,
-        isGradeAverageForceCalc: Boolean,
-        secondSemesterSubject: GradeSubject,
-        firstSemesterSubject: GradeSubject?
-    ) = if (!isAnyVulcanAverage || isGradeAverageForceCalc) {
-        val updatedSecondSemesterGrades =
-            secondSemesterSubject.grades.updateModifiers(student)
-        val updatedFirstSemesterGrades =
-            firstSemesterSubject?.grades?.updateModifiers(student).orEmpty()
+    private fun calculateAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
+        val selectedSemester = semesters.single { it.semesterId == semesterId }
+        val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
-        (updatedSecondSemesterGrades + updatedFirstSemesterGrades).calcAverage()
-    } else {
-        secondSemesterSubject.average
-    }
+        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMap { selectedDetails ->
+            val isAnyAverage = selectedDetails.any { it.average != .0 }
 
-    private fun calculateBothSemestersAverage(
-        student: Student,
-        isAnyVulcanAverage: Boolean,
-        isGradeAverageForceCalc: Boolean,
-        secondSemesterSubject: GradeSubject,
-        firstSemesterSubject: GradeSubject?
-    ): Double {
-        val divider = if (secondSemesterSubject.grades.any { it.weightValue > .0 }) 2 else 1
-
-        return if (!isAnyVulcanAverage || isGradeAverageForceCalc) {
-            val secondSemesterAverage =
-                secondSemesterSubject.grades.updateModifiers(student).calcAverage()
-            val firstSemesterAverage = firstSemesterSubject?.grades?.updateModifiers(student)
-                ?.calcAverage() ?: secondSemesterAverage
-
-            (secondSemesterAverage + firstSemesterAverage) / divider
-        } else {
-            (secondSemesterSubject.average + (firstSemesterSubject?.average ?: secondSemesterSubject.average)) / divider
+            if (selectedSemester != firstSemester) {
+                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
+                    selectedDetails.map { selected ->
+                        val second = secondDetails.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)
+                    }
+                }
+            } else Single.just(selectedDetails)
         }
     }
 
-    private fun getGradeSubjects(
-        student: Student,
-        semester: Semester,
-        forceRefresh: Boolean
-    ): Flow<Resource<List<GradeSubject>>> {
-        val isGradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
+    private fun getSemesterDetailsWithAverage(student: Student, semester: Semester, forceRefresh: Boolean): Single<List<GradeDetailsWithAverage>> {
+        return gradeRepository.getGrades(student, semester, forceRefresh).map { (details, summaries) ->
+            val isAnyAverage = summaries.any { it.average != .0 }
+            val allGrades = details.groupBy { it.subject }
 
-        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 }
-
-                val items = summaries?.emulateEmptySummaries(
-                    student = student,
-                    semester = semester,
-                    grades = allGrades.toList(),
-                    calcAverage = isAnyAverage
-                )?.map { summary ->
-                    val grades = allGrades[summary.subject].orEmpty()
-                    GradeSubject(
-                        subject = summary.subject,
-                        average = if (!isAnyAverage || isGradeAverageForceCalc) {
-                            grades.updateModifiers(student).calcAverage()
-                        } else summary.average,
-                        points = summary.pointsSum,
-                        summary = summary,
-                        grades = grades,
-                        isVulcanAverage = isAnyAverage
-                    )
-                }
-
-                Resource(res.status, items, res.error)
+            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
+                )
             }
+        }
     }
 
-    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
+    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 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSubject.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
similarity index 75%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSubject.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
index 57be55ee3..3f5d706b3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSubject.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
@@ -3,11 +3,10 @@ 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 GradeSubject(
+data class GradeDetailsWithAverage(
     val subject: String,
     val average: Double,
     val points: String,
     val summary: GradeSummary,
-    val grades: List<Grade>,
-    val isVulcanAverage: Boolean
+    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 b3ef3037a..59b83c4b0 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
@@ -8,9 +8,7 @@ import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.appcompat.app.AlertDialog
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.databinding.FragmentGradeBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
@@ -22,18 +20,18 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView,
-    MainView.MainChildView, MainView.TitledView {
+class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: GradePresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     private var semesterSwitchMenu: MenuItem? = null
 
     companion object {
+        private const val SAVED_SEMESTER_KEY = "CURRENT_SEMESTER"
 
         fun newInstance() = GradeFragment()
     }
@@ -52,7 +50,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentGradeBinding.bind(view)
-        presenter.onAttachView(this)
+        presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -64,13 +62,11 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     override fun initView() {
         with(pagerAdapter) {
             containerId = binding.gradeViewPager.id
-            addFragmentsWithTitle(
-                mapOf(
-                    GradeDetailsFragment.newInstance() to getString(R.string.all_details),
-                    GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
-                    GradeStatisticsFragment.newInstance() to getString(R.string.grade_menu_statistics)
-                )
-            )
+            addFragmentsWithTitle(mapOf(
+                GradeDetailsFragment.newInstance() to getString(R.string.all_details),
+                GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
+                GradeStatisticsFragment.newInstance() to getString(R.string.grade_menu_statistics)
+            ))
         }
 
         with(binding.gradeViewPager) {
@@ -122,9 +118,11 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
         semesterSwitchMenu?.isVisible = show
     }
 
-    override fun showSemesterDialog(selectedIndex: Int, semesters: List<Semester>) {
-        val choices = semesters.map { getString(R.string.grade_semester, it.semesterName) }
-            .toTypedArray()
+    override fun showSemesterDialog(selectedIndex: Int) {
+        val choices = arrayOf(
+            getString(R.string.grade_semester, 1),
+            getString(R.string.grade_semester, 2)
+        )
 
         AlertDialog.Builder(requireContext())
             .setSingleChoiceItems(choices, selectedIndex) { dialog, which ->
@@ -138,10 +136,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override fun setCurrentSemesterName(semester: Int, schoolYear: Int) {
         subtitleString = getString(R.string.grade_subtitle, semester, schoolYear, schoolYear + 1)
-
-        if (isVisible) {
-            (activity as MainView?)?.setViewSubTitle(subtitleString)
-        }
+        (activity as MainView).setViewSubTitle(subtitleString)
     }
 
     fun onChildRefresh() {
@@ -153,8 +148,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) {
-        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)
-            ?.onParentLoadData(semesterId, forceRefresh)
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentLoadData(semesterId, forceRefresh)
     }
 
     override fun notifyChildParentReselected(index: Int) {
@@ -165,6 +159,11 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
         (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentChangeSemester()
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt(SAVED_SEMESTER_KEY, presenter.selectedIndex)
+    }
+
     override fun 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
new file mode 100644
index 000000000..342f356cb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
@@ -0,0 +1,35 @@
+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
+abstract class GradeModule {
+
+    companion object {
+
+        @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 504c730de..ec66e2bd9 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,27 +1,27 @@
 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.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCurrentOrLast
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<GradeView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<GradeView>(errorHandler, studentRepository, schedulers) {
 
-    private var selectedIndex = 0
+    var selectedIndex = 0
+        private set
 
     private var schoolYear = 0
 
@@ -31,8 +31,9 @@ class GradePresenter @Inject constructor(
 
     private lateinit var lastError: Throwable
 
-    override fun onAttachView(view: GradeView) {
+    fun onAttachView(view: GradeView, savedIndex: Int?) {
         super.onAttachView(view)
+        selectedIndex = savedIndex ?: 0
         view.initView()
         Timber.i("Grade view was initialized with $selectedIndex index")
         errorHandler.showErrorMessage = ::showErrorViewOnError
@@ -49,9 +50,7 @@ class GradePresenter @Inject constructor(
     }
 
     fun onSemesterSwitch(): Boolean {
-        if (semesters.isNotEmpty()) {
-            view?.showSemesterDialog(selectedIndex - 1, semesters.take(2))
-        }
+        if (semesters.isNotEmpty()) view?.showSemesterDialog(selectedIndex - 1)
         return true
     }
 
@@ -99,33 +98,29 @@ class GradePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        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
-                    schoolYear = current.schoolYear
-                    semesters = it.data.filter { semester -> semester.diaryId == current.diaryId }
-                    view?.setCurrentSemesterName(current.semesterName, schoolYear)
+        Timber.i("Loading grade data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getSemesters(it, refreshOnNoCurrent = true) }
+            .delay(200, MILLISECONDS)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                val current = it.getCurrentOrLast()
+                selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
+                schoolYear = current.schoolYear
+                semesters = it.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)
-                    }
+                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!!)
-                }
-            }
-        }.launch()
+            }) {
+                Timber.i("Loading grade result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -139,17 +134,11 @@ class GradePresenter @Inject constructor(
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
         Timber.d("Load grade tab child. Selected semester: $selectedIndex, semesters: ${semesters.joinToString { it.semesterName.toString() }}")
-
-        val newSelectedSemesterId = try {
-            semesters.first { it.semesterName == selectedIndex }.semesterId
-        } catch (e: NoSuchElementException) {
-            Timber.e(e, "Selected semester no exists")
-            return
-        }
-
-        if (forceRefresh || loadedSemesterId[index] != newSelectedSemesterId) {
-            Timber.i("Load grade child view index: $index")
-            view?.notifyChildLoadData(index, newSelectedSemesterId, forceRefresh)
+        semesters.first { it.semesterName == selectedIndex }.semesterId.also {
+            if (forceRefresh || loadedSemesterId[index] != it) {
+                Timber.i("Load grade child view index: $index")
+                view?.notifyChildLoadData(index, it, forceRefresh)
+            }
         }
     }
 
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
deleted file mode 100644
index 1e6b26e8c..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSortingMode.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-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 104f8505a..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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeView : BaseView {
@@ -19,7 +18,7 @@ interface GradeView : BaseView {
 
     fun showSemesterSwitch(show: Boolean)
 
-    fun showSemesterDialog(selectedIndex: Int, semesters: List<Semester>)
+    fun showSemesterDialog(selectedIndex: Int)
 
     fun setCurrentSemesterName(semester: Int, schoolYear: 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
index 6f9321692..c129d9485 100644
--- 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
@@ -40,6 +40,10 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
     }
 
     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)
     }
@@ -58,6 +62,10 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
         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)
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 286194464..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
@@ -24,18 +24,17 @@ class GradeDetailsDialog : DialogFragment() {
     private lateinit var colorScheme: String
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
-
         private const val COLOR_SCHEME_KEY = "Scheme"
 
-        fun newInstance(grade: Grade, colorScheme: String) =
-            GradeDetailsDialog().apply {
+        fun newInstance(grade: Grade, colorScheme: String): GradeDetailsDialog {
+            return GradeDetailsDialog().apply {
                 arguments = Bundle().apply {
                     putSerializable(ARGUMENT_KEY, grade)
                     putString(COLOR_SCHEME_KEY, colorScheme)
                 }
             }
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,14 +46,12 @@ class GradeDetailsDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogGradeBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogGradeBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             gradeDialogSubject.text = grade.subject
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 9d4da767d..ac50b9f53 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
@@ -9,7 +9,6 @@ import android.view.View.GONE
 import android.view.View.INVISIBLE
 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.db.entities.Grade
 import io.github.wulkanowy.databinding.FragmentGradeDetailsBinding
@@ -17,10 +16,8 @@ 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.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class GradeDetailsFragment :
     BaseFragment<FragmentGradeDetailsBinding>(R.layout.fragment_grade_details), GradeDetailsView,
     GradeView.GradeChildView {
@@ -66,9 +63,7 @@ class GradeDetailsFragment :
                 layoutManager = LinearLayoutManager(context)
                 adapter = gradeDetailsAdapter
             }
-            gradeDetailsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            gradeDetailsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            gradeDetailsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
             gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
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 479aff801..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
@@ -14,7 +14,6 @@ data class GradeDetailsHeader(
     val subject: String,
     val average: Double?,
     val pointsSum: String?,
+    var newGrades: Int,
     val grades: List<GradeDetailsItem>
-) {
-    var newGrades = 0
-}
+)
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 6d86c7bb2..37f2c935a 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,36 +1,29 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+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.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.GradeSortingMode.ALPHABETIC
-import io.github.wulkanowy.ui.modules.grade.GradeSortingMode.DATE
-import io.github.wulkanowy.ui.modules.grade.GradeSubject
-import io.github.wulkanowy.utils.AnalyticsHelper
-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 io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeRepository: GradeRepository,
     private val semesterRepository: SemesterRepository,
     private val preferencesRepository: PreferencesRepository,
     private val averageProvider: GradeAverageProvider,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository, schedulers) {
 
     private var newGradesAmount: Int = 0
 
@@ -46,9 +39,7 @@ class GradeDetailsPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
-
         loadData(semesterId, forceRefresh)
-        if (!forceRefresh) view?.showErrorView(false)
     }
 
     fun onGradeItemSelected(grade: Grade, position: Int) {
@@ -70,27 +61,24 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     fun onMarkAsReadSelected(): Boolean {
-        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!!)
-                }
+        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)
             }
-        }.launch("mark")
+            .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)
+            }))
         return true
     }
 
@@ -129,7 +117,7 @@ class GradeDetailsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
     fun updateMarkAsDoneButton() {
@@ -138,72 +126,42 @@ class GradeDetailsPresenter @Inject constructor(
 
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade details data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
-        }.onEach {
-            Timber.d("Loading grade details status: ${it.status}, data: ${it.data != null}")
-            when (it.status) {
-                Status.LOADING -> {
-                    val items = createGradeItems(it.data.orEmpty())
-                    if (items.isNotEmpty()) {
-                        Timber.i("Loading grade details result: load cached data")
-                        view?.run {
-                            updateNewGradesAmount(it.data.orEmpty())
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showEmpty(false)
-                            showContent(true)
-                            updateData(
-                                data = items,
-                                isGradeExpandable = preferencesRepository.isGradeExpandable,
-                                gradeColorTheme = preferencesRepository.gradeColorTheme
-                            )
-                            notifyParentDataLoaded(semesterId)
-                        }
-                    }
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade details result: Success")
-                    updateNewGradesAmount(it.data!!)
-                    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
-                        )
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_details",
-                        "items" to it.data.size
+            }
+            .subscribe({ grades ->
+                Timber.i("Loading grade details result: Success")
+                newGradesAmount = grades.sumBy { it.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
+                updateMarkAsDoneButton()
+                view?.run {
+                    showEmpty(grades.isEmpty())
+                    showErrorView(false)
+                    showContent(grades.isNotEmpty())
+                    updateData(
+                        data = createGradeItems(grades),
+                        isGradeExpandable = preferencesRepository.isGradeExpandable,
+                        gradeColorTheme = preferencesRepository.gradeColorTheme
                     )
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading grade details result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
-            }
-        }.launch()
-    }
-
-    private fun updateNewGradesAmount(grades: List<GradeSubject>) {
-        newGradesAmount =
-            grades.sumBy { item -> item.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "grade_details",
+                    "items" to grades.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading grade details result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -217,20 +175,10 @@ class GradeDetailsPresenter @Inject constructor(
         }
     }
 
-    @SuppressLint("DefaultLocale")
-    private fun createGradeItems(items: List<GradeSubject>): List<GradeDetailsItem> {
+    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() }
-                }
-            }
+            .filter { it.grades.isNotEmpty() }
+            .sortedBy { it.subject }
             .map { (subject, average, points, _, grades) ->
                 val subItems = grades
                     .sortedByDescending { it.date }
@@ -240,23 +188,22 @@ class GradeDetailsPresenter @Inject constructor(
                     subject = subject,
                     average = average,
                     pointsSum = points,
+                    newGrades = grades.filter { grade -> !grade.isRead }.size,
                     grades = subItems
-                ).apply {
-                    newGrades = grades.filter { grade -> !grade.isRead }.size
-                }, ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
+                ), ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
             }.flatten()
     }
 
     private fun updateGrade(grade: Grade) {
-        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")
+        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)
+            })
     }
 }
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
index bf0b20142..dbb60910a 100644
--- 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
@@ -17,12 +17,10 @@ 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.GradePartialStatistics
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
+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.ItemGradeStatisticsHeaderBinding
 import io.github.wulkanowy.databinding.ItemGradeStatisticsPieBinding
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
@@ -30,16 +28,12 @@ import javax.inject.Inject
 class GradeStatisticsAdapter @Inject constructor() :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    var currentDataType = GradeStatisticsItem.DataType.PARTIAL
-
     var items = emptyList<GradeStatisticsItem>()
 
     var theme: String = "vulcan"
 
     var showAllSubjectsOnList: Boolean = false
 
-    var onDataTypeChangeListener: () -> Unit = {}
-
     private val vulcanGradeColors = listOf(
         6 to R.color.grade_vulcan_six,
         5 to R.color.grade_vulcan_five,
@@ -67,92 +61,29 @@ class GradeStatisticsAdapter @Inject constructor() :
         "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)) + 1
+    override fun getItemCount() = if (showAllSubjectsOnList) items.size else (if (items.isEmpty()) 0 else 1)
 
-    override fun getItemViewType(position: Int) =
-        if (position == 0) {
-            ViewType.HEADER.id
-        } else {
-            when (items[position - 1].type) {
-                GradeStatisticsItem.DataType.PARTIAL -> ViewType.PARTIAL.id
-                GradeStatisticsItem.DataType.POINTS -> ViewType.POINTS.id
-                GradeStatisticsItem.DataType.SEMESTER -> ViewType.SEMESTER.id
-            }
-        }
+    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 -> PartialViewHolder(
-                ItemGradeStatisticsPieBinding.inflate(inflater, parent, false)
-            )
-            ViewType.SEMESTER.id -> SemesterViewHolder(
-                ItemGradeStatisticsPieBinding.inflate(inflater, parent, false)
-            )
-            ViewType.POINTS.id -> PointsViewHolder(
-                ItemGradeStatisticsBarBinding.inflate(inflater, parent, false)
-            )
-            ViewType.HEADER.id -> HeaderViewHolder(
-                ItemGradeStatisticsHeaderBinding.inflate(inflater, parent, false)
-            )
+            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) {
-        val index = position - 1
-
         when (holder) {
-            is PartialViewHolder -> bindPartialChart(holder.binding, items[index].partial!!)
-            is SemesterViewHolder -> bindSemesterChart(holder.binding, items[index].semester!!)
-            is PointsViewHolder -> bindBarChart(holder.binding, items[index].points!!)
-            is HeaderViewHolder -> bindHeader(holder.binding)
+            is PieViewHolder -> bindPieChart(holder, items[position].partial)
+            is BarViewHolder -> bindBarChart(holder, items[position].points!!)
         }
     }
 
-    private fun bindHeader(binding: ItemGradeStatisticsHeaderBinding) {
-        binding.gradeStatisticsTypeSwitch.check(
-            when (currentDataType) {
-                GradeStatisticsItem.DataType.PARTIAL -> R.id.gradeStatisticsTypePartial
-                GradeStatisticsItem.DataType.SEMESTER -> R.id.gradeStatisticsTypeSemester
-                GradeStatisticsItem.DataType.POINTS -> R.id.gradeStatisticsTypePoints
-            }
-        )
-
-        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-            currentDataType = when (checkedId) {
-                R.id.gradeStatisticsTypePartial -> GradeStatisticsItem.DataType.PARTIAL
-                R.id.gradeStatisticsTypeSemester -> GradeStatisticsItem.DataType.SEMESTER
-                R.id.gradeStatisticsTypePoints -> GradeStatisticsItem.DataType.POINTS
-                else -> GradeStatisticsItem.DataType.PARTIAL
-            }
-            onDataTypeChangeListener()
-        }
-    }
-
-    private fun bindPartialChart(
-        binding: ItemGradeStatisticsPieBinding,
-        partials: GradePartialStatistics
-    ) {
-        bindPieChart(binding, partials.subject, partials.classAverage, partials.classAmounts)
-    }
-
-    private fun bindSemesterChart(
-        binding: ItemGradeStatisticsPieBinding,
-        semester: GradeSemesterStatistics
-    ) {
-        bindPieChart(binding, semester.subject, semester.average, semester.amounts)
-    }
-
-    private fun bindPieChart(
-        binding: ItemGradeStatisticsPieBinding,
-        subject: String,
-        average: String,
-        amounts: List<Int>
-    ) {
-        with(binding.gradeStatisticsPieTitle) {
-            text = subject
+    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
         }
 
@@ -161,35 +92,26 @@ class GradeStatisticsAdapter @Inject constructor() :
             else -> materialGradeColors
         }
 
-        val dataset = PieDataSet(
-            amounts.mapIndexed { grade, amount ->
-                PieEntry(amount.toFloat(), (grade + 1).toString())
-            }.reversed().filterNot { it.value == 0f },
-            binding.root.context.getString(R.string.grade_statistics_legend)
-        )
+        val dataset = PieDataSet(partials.map {
+            PieEntry(it.amount.toFloat(), it.grade.toString())
+        }, "Legenda")
 
         with(dataset) {
             valueTextSize = 12f
             sliceSpace = 1f
             valueTextColor = Color.WHITE
-            val grades = amounts.mapIndexed { grade, amount -> (grade + 1) to amount }
-                .filterNot { it.second == 0 }
-            setColors(grades.reversed().map { (grade, _) ->
-                gradeColors.single { color -> color.first == grade }.second
-            }.toIntArray(), binding.root.context)
+            setColors(partials.map {
+                gradeColors.single { color -> color.first == it.grade }.second
+            }.toIntArray(), holder.binding.root.context)
         }
 
-        with(binding.gradeStatisticsPie) {
+        with(holder.binding.gradeStatisticsPie) {
             setTouchEnabled(false)
-            if (amounts.size == 1) animateXY(1000, 1000)
+            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()
-                        )
+                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
                     }
                 })
             }
@@ -204,16 +126,10 @@ class GradeStatisticsAdapter @Inject constructor() :
                 })
             }
 
-            val numberOfGradesString = amounts.fold(0) { acc, it -> acc + it }
-                .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
-            val averageString =
-                binding.root.context.getString(R.string.grade_statistics_average, average)
-
             minAngleForSlices = 25f
             description.isEnabled = false
-            centerText =
-                numberOfGradesString + ("\n\n" + averageString).takeIf { average.isNotBlank() }
-                    .orEmpty()
+            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))
@@ -221,32 +137,27 @@ class GradeStatisticsAdapter @Inject constructor() :
         }
     }
 
-    private fun bindBarChart(
-        binding: ItemGradeStatisticsBarBinding,
-        points: GradePointsStatistics
-    ) {
-        with(binding.gradeStatisticsBarTitle) {
+    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())
-            ), binding.root.context.getString(R.string.grade_statistics_legend)
-        )
+        val dataset = BarDataSet(listOf(
+            BarEntry(1f, points.others.toFloat()),
+            BarEntry(2f, points.student.toFloat())
+        ), "Legenda")
 
         with(dataset) {
             valueTextSize = 12f
-            valueTextColor = binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
+            valueTextColor = holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
             valueFormatter = object : ValueFormatter() {
                 override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
             }
             colors = gradePointsColors
         }
 
-        with(binding.gradeStatisticsBar) {
+        with(holder.binding.gradeStatisticsBar) {
             setTouchEnabled(false)
             if (items.size == 1) animateXY(1000, 1000)
             data = BarData(dataset).apply {
@@ -255,13 +166,12 @@ class GradeStatisticsAdapter @Inject constructor() :
             }
             legend.setCustom(listOf(
                 LegendEntry().apply {
-                    label = binding.root.context.getString(R.string.grade_statistics_average_class)
+                    label = "Średnia klasy"
                     formColor = gradePointsColors[0]
                     form = Legend.LegendForm.SQUARE
                 },
                 LegendEntry().apply {
-                    label =
-                        binding.root.context.getString(R.string.grade_statistics_average_student)
+                    label = "Uczeń"
                     formColor = gradePointsColors[1]
                     form = Legend.LegendForm.SQUARE
                 }
@@ -270,7 +180,7 @@ class GradeStatisticsAdapter @Inject constructor() :
 
             description.isEnabled = false
 
-            binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary).let {
+            holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary).let {
                 axisLeft.textColor = it
                 axisRight.textColor = it
             }
@@ -290,15 +200,9 @@ class GradeStatisticsAdapter @Inject constructor() :
         }
     }
 
-    private class PartialViewHolder(val binding: ItemGradeStatisticsPieBinding) :
+    private class PieViewHolder(val binding: ItemGradeStatisticsPieBinding) :
         RecyclerView.ViewHolder(binding.root)
 
-    private class SemesterViewHolder(val binding: ItemGradeStatisticsPieBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class PointsViewHolder(val binding: ItemGradeStatisticsBarBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
-    private class HeaderViewHolder(val binding: ItemGradeStatisticsHeaderBinding) :
+    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 0adac300a..3a8f40073 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
@@ -5,7 +5,6 @@ import android.view.View
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.databinding.FragmentGradeStatisticsBinding
@@ -13,11 +12,9 @@ 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 javax.inject.Inject
 
-@AndroidEntryPoint
 class GradeStatisticsFragment :
     BaseFragment<FragmentGradeStatisticsBinding>(R.layout.fragment_grade_statistics),
     GradeStatisticsView, GradeView.GradeChildView {
@@ -38,28 +35,27 @@ class GradeStatisticsFragment :
 
     override val isViewEmpty get() = statisticsAdapter.items.isEmpty()
 
-    override val currentType get() = statisticsAdapter.currentDataType
+    override val currentType
+        get() = when (binding.gradeStatisticsTypeSwitch.checkedRadioButtonId) {
+            R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
+            R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
+            else -> ViewType.POINTS
+        }
 
     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? GradeStatisticsItem.DataType
-        )
+        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
     }
 
     override fun initView() {
-        statisticsAdapter.onDataTypeChangeListener = presenter::onTypeChange
-
         with(binding.gradeStatisticsRecycler) {
             layoutManager = LinearLayoutManager(requireContext())
             adapter = statisticsAdapter
         }
 
-        subjectsAdapter =
-            ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
         with(binding.gradeStatisticsSubjects) {
@@ -71,10 +67,6 @@ class GradeStatisticsFragment :
             gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
 
             gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            gradeStatisticsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            gradeStatisticsSwipe.setProgressBackgroundColorSchemeColor(
-                requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh)
-            )
             gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
             gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -88,15 +80,11 @@ class GradeStatisticsFragment :
         }
     }
 
-    override fun updateData(
-        newItems: List<GradeStatisticsItem>,
-        newTheme: String,
-        showAllSubjectsOnStatisticsList: Boolean
-    ) {
+    override fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean) {
         with(statisticsAdapter) {
-            showAllSubjectsOnList = showAllSubjectsOnStatisticsList
-            theme = newTheme
-            items = newItems
+            this.showAllSubjectsOnList = showAllSubjectsOnStatisticsList
+            this.theme = theme
+            this.items = items
             notifyDataSetChanged()
         }
     }
@@ -110,7 +98,11 @@ class GradeStatisticsFragment :
     }
 
     override fun resetView() {
-        binding.gradeStatisticsRecycler.scrollToPosition(0)
+        binding.gradeStatisticsScroll.scrollTo(0, 0)
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.gradeStatisticsRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showEmpty(show: Boolean) {
@@ -157,6 +149,11 @@ class GradeStatisticsFragment :
         (parentFragment as? GradeFragment)?.onChildRefresh()
     }
 
+    override fun onResume() {
+        super.onResume()
+        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putSerializable(SAVED_CHART_TYPE, presenter.currentType)
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 53eccad65..590e9ce12 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,31 +1,28 @@
 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.pojos.GradeStatisticsItem
-import io.github.wulkanowy.data.repositories.GradeStatisticsRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.SubjectRepository
+import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
+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.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeStatisticsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeStatisticsRepository: GradeStatisticsRepository,
     private val subjectRepository: SubjectRepository,
     private val semesterRepository: SemesterRepository,
     private val preferencesRepository: PreferencesRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository, schedulers) {
 
     private var subjects = emptyList<Subject>()
 
@@ -35,12 +32,12 @@ class GradeStatisticsPresenter @Inject constructor(
 
     private lateinit var lastError: Throwable
 
-    var currentType: GradeStatisticsItem.DataType = GradeStatisticsItem.DataType.PARTIAL
+    var currentType: ViewType = ViewType.PARTIAL
         private set
 
-    fun onAttachView(view: GradeStatisticsView, type: GradeStatisticsItem.DataType?) {
+    fun onAttachView(view: GradeStatisticsView, type: ViewType?) {
         super.onAttachView(view)
-        currentType = type ?: GradeStatisticsItem.DataType.PARTIAL
+        currentType = type ?: ViewType.PARTIAL
         view.initView()
         errorHandler.showErrorMessage = ::showErrorViewOnError
     }
@@ -48,7 +45,6 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
         loadSubjects()
-        if (!forceRefresh) view?.showErrorView(false)
         loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
     }
 
@@ -59,16 +55,16 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     fun onParentViewChangeSemester() {
-        clearDataInView()
         view?.run {
             showProgress(true)
             enableSwipe(false)
             showRefresh(false)
+            showContent(false)
             showErrorView(false)
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
     fun onSwipeRefresh() {
@@ -90,8 +86,8 @@ class GradeStatisticsPresenter @Inject constructor(
 
     fun onSubjectSelected(name: String?) {
         Timber.i("Select grade stats subject $name")
-        clearDataInView()
         view?.run {
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -104,11 +100,11 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     fun onTypeChange() {
-        val type = view?.currentType ?: GradeStatisticsItem.DataType.POINTS
+        val type = view?.currentType ?: ViewType.POINTS
         Timber.i("Select grade stats semester: $type")
-        cancelJobs("load")
-        clearDataInView()
+        disposable.clear()
         view?.run {
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -119,152 +115,75 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        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)
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade stats subjects result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading grade stats subjects started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    subjectRepository.getSubjects(student, semester)
                 }
             }
-        }.launch("subjects")
+            .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?.updateSubjects(it)
+            }, {
+                Timber.i("Loading grade stats subjects result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
-    private fun loadDataByType(
-        semesterId: Int,
-        subjectName: String,
-        type: GradeStatisticsItem.DataType,
-        forceRefresh: Boolean = false
-    ) {
-        Timber.i("Loading grade stats data started")
-
-        currentSubjectName =
-            if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
+    private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
+        currentSubjectName = if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
         currentType = type
 
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semesters = semesterRepository.getSemesters(student)
-            val semester = semesters.first { item -> item.semesterId == semesterId }
+        Timber.i("Loading grade stats data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getSemesters(student).flatMap { semesters ->
+                    val semester = semesters.first { item -> item.semesterId == semesterId }
 
-            with(gradeStatisticsRepository) {
-                when (type) {
-                    GradeStatisticsItem.DataType.PARTIAL -> {
-                        getGradesPartialStatistics(
-                            student = student,
-                            semester = semester,
-                            subjectName = currentSubjectName,
-                            forceRefresh = forceRefresh
-                        )
-                    }
-                    GradeStatisticsItem.DataType.SEMESTER -> {
-                        getGradesSemesterStatistics(
-                            student = student,
-                            semester = semester,
-                            subjectName = currentSubjectName,
-                            forceRefresh = forceRefresh
-                        )
-                    }
-                    GradeStatisticsItem.DataType.POINTS -> {
-                        getGradesPointsStatistics(
-                            student = student,
-                            semester = semester,
-                            subjectName = currentSubjectName,
-                            forceRefresh = forceRefresh
-                        )
-                    }
-                }
-            }
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    val isNoContent = it.data == null || checkIsNoContent(it.data, type)
-                    if (!isNoContent) {
-                        view?.run {
-                            showEmpty(isNoContent)
-                            showErrorView(false)
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            updateData(
-                                if (isNoContent) emptyList() else it.data!!,
-                                preferencesRepository.gradeColorTheme,
-                                preferencesRepository.showAllSubjectsOnStatisticsList
-                            )
-                            showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                    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)
                         }
                     }
                 }
-                Status.SUCCESS -> {
-                    Timber.i("Loading grade stats result: Success")
-                    view?.run {
-                        val isNoContent = checkIsNoContent(it.data!!, type)
-                        showEmpty(isNoContent)
-                        showErrorView(false)
-                        updateData(
-                            if (isNoContent) emptyList() else it.data,
-                            preferencesRepository.gradeColorTheme,
-                            preferencesRepository.showAllSubjectsOnStatisticsList
-                        )
-                        showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "grade_statistics",
-                        "items" to it.data!!.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading grade stats 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)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
-            }
-        }.launch("load")
-    }
-
-    private fun checkIsNoContent(
-        items: List<GradeStatisticsItem>,
-        type: GradeStatisticsItem.DataType
-    ): Boolean {
-        return items.isEmpty() || when (type) {
-            GradeStatisticsItem.DataType.SEMESTER -> {
-                items.firstOrNull()?.semester?.amounts.orEmpty().sum() == 0
-            }
-            GradeStatisticsItem.DataType.PARTIAL -> {
-                items.firstOrNull()?.partial?.classAmounts.orEmpty().sum() == 0
-            }
-            GradeStatisticsItem.DataType.POINTS -> {
-                items.firstOrNull()?.points?.let { points -> points.student == .0 && points.others == .0 } ?: false
-            }
-        }
-    }
-
-    private fun clearDataInView() {
-        view?.updateData(
-            emptyList(),
-            preferencesRepository.gradeColorTheme,
-            preferencesRepository.showAllSubjectsOnStatisticsList
-        )
+            .subscribe({
+                Timber.i("Loading grade stats result: Success")
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    showErrorView(false)
+                    updateData(it, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
+                    showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                }
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "grade_statistics",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading grade stats result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
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 405118178..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
@@ -7,17 +7,13 @@ interface GradeStatisticsView : BaseView {
 
     val isViewEmpty: Boolean
 
-    val currentType: GradeStatisticsItem.DataType
+    val currentType: ViewType
 
     fun initView()
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updateData(
-        newItems: List<GradeStatisticsItem>,
-        newTheme: String,
-        showAllSubjectsOnStatisticsList: Boolean
-    )
+    fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean)
 
     fun showSubjects(show: Boolean)
 
@@ -29,6 +25,8 @@ interface GradeStatisticsView : BaseView {
 
     fun resetView()
 
+    fun showContent(show: Boolean)
+
     fun showEmpty(show: Boolean)
 
     fun showErrorView(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 f695eaf9d..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
@@ -3,6 +3,5 @@ package io.github.wulkanowy.ui.modules.grade.statistics
 enum class ViewType(val id: Int) {
     SEMESTER(1),
     PARTIAL(2),
-    POINTS(3),
-    HEADER(4)
+    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
index edc2a9e19..30c4ccc23 100644
--- 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
@@ -5,21 +5,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.changeModifier
 import java.util.Locale
 import javax.inject.Inject
 
-class GradeSummaryAdapter @Inject constructor(
-    private val preferencesRepository: PreferencesRepository
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class GradeSummaryAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private enum class ViewType(val id: Int) {
         HEADER(1),
@@ -28,7 +21,7 @@ class GradeSummaryAdapter @Inject constructor(
 
     var items = emptyList<GradeSummary>()
 
-    override fun getItemCount() = items.size + if (items.isNotEmpty()) 1 else 0
+    override fun getItemCount() = items.size + 1
 
     override fun getItemViewType(position: Int) = when (position) {
         0 -> ViewType.HEADER.id
@@ -56,7 +49,7 @@ class GradeSummaryAdapter @Inject constructor(
         if (items.isEmpty()) return
 
         with(binding) {
-            gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier))
+            gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage())
             gradeSummaryScrollableHeaderCalculated.text = formatAverage(items
                 .filter { value -> value.average != 0.0 }
                 .map { values -> values.average }
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 0ac16fb36..d169f7c62 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
@@ -6,17 +6,14 @@ import android.view.View.GONE
 import android.view.View.INVISIBLE
 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.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 io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class GradeSummaryFragment :
     BaseFragment<FragmentGradeSummaryBinding>(R.layout.fragment_grade_summary), GradeSummaryView,
     GradeView.GradeChildView {
@@ -53,9 +50,7 @@ class GradeSummaryFragment :
             adapter = gradeSummaryAdapter
         }
         with(binding) {
-            gradeSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            gradeSummarySwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            gradeSummarySwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
             gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
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 7adfd7e58..229a0107d 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,25 +1,23 @@
 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.StudentRepository
+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.GradeSubject
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeSummaryPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val averageProvider: GradeAverageProvider,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -31,62 +29,36 @@ class GradeSummaryPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade summary data started")
-
-        loadData(semesterId, forceRefresh)
-        if (!forceRefresh) view?.showErrorView(false)
-    }
-
-    private fun loadData(semesterId: Int, forceRefresh: Boolean) {
-        Timber.i("Loading grade summary started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
-        }.onEach {
-            Timber.d("Loading grade summary status: ${it.status}, data: ${it.data != null}")
-            when (it.status) {
-                Status.LOADING -> {
-                    val items = createGradeSummaryItems(it.data.orEmpty())
-                    if (items.isNotEmpty()) {
-                        Timber.i("Loading grade summary result: load cached data")
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showEmpty(false)
-                            showContent(true)
-                            updateData(items)
-                        }
-                    }
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { averageProvider.getGradesDetailsWithAverage(it, semesterId, forceRefresh) }
+            .map { createGradeSummaryItems(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showRefresh(false)
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded(semesterId)
                 }
-                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
-                    )
+            }.subscribe({
+                Timber.i("Loading grade summary result: Success")
+                view?.run {
+                    showEmpty(it.isEmpty())
+                    showContent(it.isNotEmpty())
+                    showErrorView(false)
+                    updateData(it)
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading grade summary result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded(semesterId)
-            }
-        }.launch()
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "grade_summary",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading grade summary result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -132,17 +104,17 @@ class GradeSummaryPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        cancelJobs("load")
+        disposable.clear()
     }
 
-    private fun createGradeSummaryItems(items: List<GradeSubject>): List<GradeSummary> {
+    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: GradeSubject): Boolean {
+    private fun checkEmpty(gradeSummary: GradeDetailsWithAverage): Boolean {
         return gradeSummary.run {
             summary.finalGrade.isBlank()
                 && summary.predictedGrade.isBlank()
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
index 8ae06aeb5..a87ad18e8 100644
--- 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
@@ -10,7 +10,7 @@ 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 org.threeten.bp.LocalDate
 import javax.inject.Inject
 
 class HomeworkAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
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 1d9434dc7..f30529575 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
@@ -5,7 +5,6 @@ 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.db.entities.Homework
 import io.github.wulkanowy.databinding.FragmentHomeworkBinding
@@ -15,10 +14,8 @@ 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.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment_homework),
     HomeworkView, MainView.TitledView {
 
@@ -56,8 +53,6 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
 
         with(binding) {
             homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            homeworkSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            homeworkSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
             homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -75,6 +70,10 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
         }
     }
 
+    fun onReloadList() {
+        presenter.reloadData()
+    }
+
     override fun clearData() {
         with(homeworkAdapter) {
             items = emptyList()
@@ -86,8 +85,8 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
         binding.homeworkNavDate.text = date
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.homeworkSwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.homeworkSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
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 11c54dc24..41735a23f 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,36 +1,32 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.sunday
 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 kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-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: AnalyticsHelper
-) : BasePresenter<HomeworkView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<HomeworkView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
 
@@ -44,24 +40,24 @@ class HomeworkPresenter @Inject constructor(
         view.initView()
         Timber.i("Homework view was initialized")
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
-        loadData()
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
+        reloadView()
     }
 
     fun onPreviousDay() {
-        reloadView(currentDate.minusDays(7))
-        loadData()
+        loadData(currentDate.minusDays(7))
+        reloadView()
     }
 
     fun onNextDay() {
-        reloadView(currentDate.plusDays(7))
-        loadData()
+        loadData(currentDate.plusDays(7))
+        reloadView()
     }
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the homework")
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onRetry() {
@@ -69,7 +65,7 @@ class HomeworkPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onDetailsClick() {
@@ -82,64 +78,64 @@ class HomeworkPresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        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")
+        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")
+            })
     }
 
-    private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading homework data started")
+    fun reloadData() {
+        loadData(currentDate, false)
+    }
 
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            homeworkRepository.getHomework(student, semester, currentDate, currentDate, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateData(createHomeworkItem(it.data))
-                        }
+    private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
+        Timber.i("Loading homework data started")
+        currentDate = date
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        homeworkRepository.getHomework(student, semester, currentDate, currentDate, forceRefresh)
                     }
                 }
-                Status.SUCCESS -> {
+                .map { createHomeworkItem(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading homework result: Success")
                     view?.apply {
-                        updateData(createHomeworkItem(it.data!!))
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "homework",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading homework result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -161,9 +157,7 @@ class HomeworkPresenter @Inject constructor(
         }.flatten()
     }
 
-    private fun reloadView(date: LocalDate) {
-        currentDate = date
-
+    private fun reloadView() {
         Timber.i("Reload homework view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
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 a1d6a04a9..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
@@ -15,7 +15,7 @@ interface HomeworkView : BaseView {
 
     fun updateNavigationWeek(date: String)
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun showEmpty(show: Boolean)
 
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
index cd9a7e851..5d6ee162a 100644
--- 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
@@ -29,8 +29,6 @@ class HomeworkDetailsAdapter @Inject constructor() :
             attachments = value?.attachments.orEmpty()
         }
 
-    var isHomeworkFullscreen = false
-
     var onAttachmentClickListener: (url: String) -> Unit = {}
 
     var onFullScreenClickListener = {}
@@ -69,8 +67,6 @@ class HomeworkDetailsAdapter @Inject constructor() :
             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
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
index 93045a481..7b3b9821a 100644
--- 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
@@ -8,15 +8,14 @@ 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.ui.modules.homework.HomeworkFragment
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), HomeworkDetailsView {
 
     @Inject
@@ -28,11 +27,12 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
     private lateinit var homework: Homework
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(homework: Homework) = HomeworkDetailsDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+        fun newInstance(homework: Homework): HomeworkDetailsDialog {
+            return HomeworkDetailsDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+            }
         }
     }
 
@@ -44,53 +44,37 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    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.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
+                onFullScreenClickListener = { dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT) }
+                onFullScreenExitClickListener = { dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT) }
                 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)
+        (parentFragment as? HomeworkFragment)?.onReloadList()
+        binding.homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
     }
 
     override fun 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
index ca6fc71ee..04a97b8cd 100644
--- 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
@@ -1,31 +1,22 @@
 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.HomeworkRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class HomeworkDetailsPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val homeworkRepository: HomeworkRepository,
-    private val analytics: AnalyticsHelper,
-    private val preferencesRepository: PreferencesRepository
-) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository) {
-
-    var isHomeworkFullscreen
-        get() = preferencesRepository.isHomeworkFullscreen
-        set(value) {
-            preferencesRepository.isHomeworkFullscreen = value
-        }
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: HomeworkDetailsView) {
         super.onAttachView(view)
@@ -34,19 +25,20 @@ class HomeworkDetailsPresenter @Inject constructor(
     }
 
     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!!)
+        Timber.i("Homework details update start")
+        disposable.add(homeworkRepository.toggleDone(homework)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                Timber.i("Homework details update: Success")
+                view?.run {
+                    updateMarkAsDoneLabel(homework.isDone)
                 }
+                analytics.logEvent("homework_mark_as_done")
+            }) {
+                Timber.i("Homework details update result: An exception occurred")
+                errorHandler.dispatch(it)
             }
-        }.launch("toggle")
+        )
     }
 }
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 8d96a498f..ffb36fe6e 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,8 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.ActivityLoginBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
@@ -14,20 +13,16 @@ 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 javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), LoginView {
 
     @Inject
     override lateinit var presenter: LoginPresenter
 
-    private val loginAdapter = BaseFragmentPagerAdapter(supportFragmentManager)
-
     @Inject
-    lateinit var updateHelper: UpdateHelper
+    lateinit var loginAdapter: BaseFragmentPagerAdapter
 
     companion object {
 
@@ -41,22 +36,8 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         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)
-    }
-
-    //https://developer.android.com/guide/playcore/in-app-updates#status_callback
-    @Suppress("DEPRECATION")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        updateHelper.onActivityResult(requestCode, resultCode)
     }
 
     override fun initView() {
@@ -67,15 +48,13 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
 
         with(loginAdapter) {
             containerId = binding.loginViewpager.id
-            addFragments(
-                listOf(
-                    LoginFormFragment.newInstance(),
-                    LoginSymbolFragment.newInstance(),
-                    LoginStudentSelectFragment.newInstance(),
-                    LoginAdvancedFragment.newInstance(),
-                    LoginRecoverFragment.newInstance()
-                )
-            )
+            addFragments(listOf(
+                LoginFormFragment.newInstance(),
+                LoginSymbolFragment.newInstance(),
+                LoginStudentSelectFragment.newInstance(),
+                LoginAdvancedFragment.newInstance(),
+                LoginRecoverFragment.newInstance()
+            ))
         }
 
         with(binding.loginViewpager) {
@@ -103,25 +82,19 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     }
 
     override fun notifyInitSymbolFragment(loginData: Triple<String, String, String>) {
-        (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(
-            loginData
-        )
+        (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(loginData)
     }
 
-    override fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
-        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)
-            ?.onParentInitStudentSelectFragment(studentsWithSemesters)
+    override fun notifyInitStudentSelectFragment(students: List<Student>) {
+        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(students)
     }
 
-    fun onFormFragmentAccountLogged(
-        studentsWithSemesters: List<StudentWithSemesters>,
-        loginData: Triple<String, String, String>
-    ) {
-        presenter.onFormViewAccountLogged(studentsWithSemesters, loginData)
+    fun onFormFragmentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        presenter.onFormViewAccountLogged(students, loginData)
     }
 
-    fun onSymbolFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        presenter.onSymbolViewAccountLogged(studentsWithSemesters)
+    fun onSymbolFragmentAccountLogged(students: List<Student>) {
+        presenter.onSymbolViewAccountLogged(students)
     }
 
     fun onAdvancedLoginClick() {
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 ed4563246..5ed181bf1 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,16 +2,20 @@ package io.github.wulkanowy.ui.modules.login
 
 import android.content.res.Resources
 import android.database.sqlite.SQLiteConstraintException
+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) : ErrorHandler(resources) {
+class LoginErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
 
     var onBadCredentials: () -> Unit = {}
 
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
new file mode 100644
index 000000000..26a243dcd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
@@ -0,0 +1,45 @@
+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.recover.LoginRecoverFragment
+import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
+import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
+
+@Suppress("unused")
+@Module
+internal abstract class LoginModule {
+
+    companion object {
+
+        @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
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLoginRecoverFragment(): LoginRecoverFragment
+}
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 aa1e7eced..16342de4f 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,16 +1,18 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.db.entities.Student
+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) {
+) : BasePresenter<LoginView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LoginView) {
         super.onAttachView(view)
@@ -21,24 +23,24 @@ class LoginPresenter @Inject constructor(
         Timber.i("Login view was initialized")
     }
 
-    fun onFormViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
+    fun onFormViewAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
         view?.apply {
-            if (studentsWithSemesters.isEmpty()) {
+            if (students.isEmpty()) {
                 Timber.i("Switch to symbol form")
                 notifyInitSymbolFragment(loginData)
                 switchView(1)
             } else {
                 Timber.i("Switch to student select")
-                notifyInitStudentSelectFragment(studentsWithSemesters)
+                notifyInitStudentSelectFragment(students)
                 switchView(2)
             }
         }
     }
 
-    fun onSymbolViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
+    fun onSymbolViewAccountLogged(students: List<Student>) {
         view?.apply {
             Timber.i("Switch to student select")
-            notifyInitStudentSelectFragment(studentsWithSemesters)
+            notifyInitStudentSelectFragment(students)
             switchView(2)
         }
     }
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 2a5cf316a..9c98a1d8d 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.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 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(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyInitStudentSelectFragment(students: List<Student>)
 }
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 9231914c8..3b6a985be 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
@@ -6,9 +6,8 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 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.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginAdvancedBinding
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -19,7 +18,6 @@ import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginAdvancedFragment :
     BaseFragment<FragmentLoginAdvancedBinding>(R.layout.fragment_login_advanced),
     LoginAdvancedView {
@@ -295,8 +293,8 @@ class LoginAdvancedFragment :
         binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, Triple(
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
             binding.loginFormUsername.text.toString(),
             binding.loginFormPass.text.toString(),
             resources.getStringArray(R.array.hosts_values)[1]
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 891a6b0bb..3a0d4a0d8 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,24 +1,23 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.db.entities.Student
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Single
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginAdvancedPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: LoginAdvancedView) {
         super.onAttachView(view)
@@ -126,42 +125,35 @@ class LoginAdvancedPresenter @Inject constructor(
     fun onSignInClick() {
         if (!validateCredentials()) return
 
-        flowWithResource { getStudentsAppropriatesToLoginType() }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Login started")
+        disposable.add(getStudentsAppropriatesToLoginType()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                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)
+                Timber.i("Login started")
+            }
+            .doFinally {
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
                 }
             }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+            .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)
+            }))
     }
 
-    private suspend fun getStudentsAppropriatesToLoginType(): List<StudentWithSemesters> {
+    private fun getStudentsAppropriatesToLoginType(): Single<List<Student>> {
         val email = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
         val endpoint = view?.formHostValue.orEmpty()
@@ -170,7 +162,7 @@ class LoginAdvancedPresenter @Inject constructor(
         val symbol = view?.formSymbolValue.orEmpty()
         val token = view?.formTokenValue.orEmpty()
 
-        return when (Sdk.Mode.valueOf(view?.formLoginType.orEmpty())) {
+        return when (Sdk.Mode.valueOf(view?.formLoginType ?: "")) {
             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)
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 029a6b4d4..36c9a93f8 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,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginAdvancedView : BaseView {
@@ -69,7 +69,7 @@ interface LoginAdvancedView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyParentAccountLogged(students: List<Student>)
 
     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 4e09bd4d6..a2a083c00 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
@@ -6,9 +6,8 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.core.widget.doOnTextChanged
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -20,7 +19,6 @@ import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragment_login_form),
     LoginFormView {
 
@@ -89,8 +87,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         }
     }
 
-    override fun getHostsValues(): List<String> = hostValues.toList()
-
     override fun setCredentials(username: String, pass: String) {
         with(binding) {
             loginFormUsername.setText(username)
@@ -98,12 +94,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         }
     }
 
-    override fun setHost(host: String) {
-        binding.loginFormHost.setText(
-            hostKeys.getOrNull(hostValues.indexOf(host)).orEmpty()
-        )
-    }
-
     override fun setUsernameLabel(label: String) {
         binding.loginFormUsernameLayout.hint = label
     }
@@ -150,13 +140,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         }
     }
 
-    override fun setErrorEmailInvalid(domain: String) {
-        with(binding.loginFormUsernameLayout) {
-            requestFocus()
-            error = getString(R.string.login_invalid_custom_email,domain)
-        }
-    }
-
     override fun clearUsernameError() {
         binding.loginFormUsernameLayout.error = null
     }
@@ -186,8 +169,8 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         binding.loginFormVersion.text = "v${appInfo.versionName}"
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, loginData)
+    override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, loginData)
     }
 
     override fun openPrivacyPolicyPage() {
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 99dcf1bb3..997e1e85f 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,24 +1,20 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import androidx.core.net.toUri
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.net.URL
 import javax.inject.Inject
 
 class LoginFormPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
@@ -58,7 +54,7 @@ class LoginFormPresenter @Inject constructor(
 
     fun updateUsernameLabel() {
         view?.run {
-            setUsernameLabel(if ("email" !in formHostValue) nicknameLabel else emailLabel)
+            setUsernameLabel(if ("standard" in formHostValue) emailLabel else nicknameLabel)
         }
     }
 
@@ -68,16 +64,6 @@ class LoginFormPresenter @Inject constructor(
 
     fun onUsernameTextChanged() {
         view?.clearUsernameError()
-
-        val username = view?.formUsernameValue.orEmpty().trim()
-        if ("@" in username && "@vulcan" !in username) {
-            val hosts = view?.getHostsValues().orEmpty().map { it.toUri().host to it }.toMap()
-            val usernameHost = username.substringAfter("@")
-
-            hosts[usernameHost]?.let {
-                view?.setHost(it)
-            }
-        }
     }
 
     fun onSignInClick() {
@@ -88,51 +74,34 @@ class LoginFormPresenter @Inject constructor(
 
         if (!validateCredentials(email, password, host)) return
 
-        flowWithResource {
-            studentRepository.getStudentsScrapper(
-                email,
-                password,
-                host,
-                symbol
-            )
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Login started")
+        disposable.add(studentRepository.getStudentsScrapper(email, password, host, symbol)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.apply {
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                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)
+                Timber.i("Login started")
+            }
+            .doFinally {
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
                 }
             }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+            .subscribe({
+                Timber.i("Login result: Success")
+                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "scrapperBaseUrl" to host, "error" to "No error")
+                view?.notifyParentAccountLogged(it, Triple(email, password, host))
+            }, {
+                Timber.i("Login result: An exception occurred")
+                analytics.logEvent("registration_form", "success" to false, "students" to -1, "scrapperBaseUrl" to host, "error" to it.message.ifNullOrBlank { "No message" })
+                loginErrorHandler.dispatch(it)
+                lastError = it
+                view?.showContact(true)
+            }))
     }
 
     fun onFaqClick() {
@@ -154,22 +123,15 @@ class LoginFormPresenter @Inject constructor(
             view?.setErrorUsernameRequired()
             isCorrect = false
         } else {
-            if ("@" in login && "login" in host) {
+            if ("@" in login && "standard" !in host) {
                 view?.setErrorLoginRequired()
                 isCorrect = false
             }
-            if ("@" !in login && "email" in host) {
+
+            if ("@" !in login && "standard" in host) {
                 view?.setErrorEmailRequired()
                 isCorrect = false
             }
-            if ("@" in login && "||" !in login && "login" !in host && "email" !in host) {
-                val emailHost = login.substringAfter("@")
-                val emailDomain = URL(host).host
-                if (emailHost != emailDomain) {
-                    view?.setErrorEmailInvalid(domain = emailDomain)
-                    isCorrect = false
-                }
-            }
         }
 
         if (password.isEmpty()) {
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 079629ef6..6506fa88f 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,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginFormView : BaseView {
@@ -19,12 +19,8 @@ interface LoginFormView : BaseView {
 
     val emailLabel: String
 
-    fun getHostsValues(): List<String>
-
     fun setCredentials(username: String, pass: String)
 
-    fun setHost(host: String)
-
     fun setUsernameLabel(label: String)
 
     fun setErrorUsernameRequired()
@@ -39,8 +35,6 @@ interface LoginFormView : BaseView {
 
     fun setErrorPassIncorrect()
 
-    fun setErrorEmailInvalid(domain: String)
-
     fun clearUsernameError()
 
     fun clearPassError()
@@ -55,7 +49,7 @@ interface LoginFormView : BaseView {
 
     fun showVersion()
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>)
+    fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>)
 
     fun openPrivacyPolicyPage()
 
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
index 2e2f9f5ce..e27c845a6 100644
--- 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
@@ -9,9 +9,7 @@ import android.view.View.VISIBLE
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import androidx.core.view.isVisible
 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
@@ -21,7 +19,6 @@ 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 {
 
@@ -43,12 +40,10 @@ class LoginRecoverFragment :
     private lateinit var hostSymbols: Array<String>
 
     override val recoverHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString()))
-            .orEmpty()
+        get() = hostValues.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
 
     override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString()))
-            .orEmpty()
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
 
     override val recoverNameValue: String
         get() = bindingLocal.loginRecoverName.text.toString().trim()
@@ -85,9 +80,7 @@ class LoginRecoverFragment :
 
         with(bindingLocal.loginRecoverHost) {
             setText(hostKeys.getOrNull(0).orEmpty())
-            setAdapter(
-                LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys)
-            )
+            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
             setOnClickListener { if (bindingLocal.loginRecoverFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
@@ -132,7 +125,6 @@ class LoginRecoverFragment :
 
     override fun showErrorView(show: Boolean) {
         bindingLocal.loginRecoverError.visibility = if (show) VISIBLE else GONE
-        bindingLocal.loginRecoverErrorDetails.isVisible = true
     }
 
     override fun setErrorDetails(message: String) {
@@ -172,7 +164,7 @@ class LoginRecoverFragment :
         with(bindingLocal.loginRecoverWebView) {
             settings.javaScriptEnabled = true
             webViewClient = object : WebViewClient() {
-                private var recoverWebViewSuccess = true
+                private var recoverWebViewSuccess: Boolean = true
 
                 override fun onPageFinished(view: WebView?, url: String?) {
                     if (recoverWebViewSuccess) {
@@ -181,16 +173,10 @@ class LoginRecoverFragment :
                     } else {
                         showProgress(false)
                         showErrorView(true)
-                        bindingLocal.loginRecoverErrorDetails.isVisible = false
                     }
                 }
 
-                override fun onReceivedError(
-                    view: WebView,
-                    errorCode: Int,
-                    description: String,
-                    failingUrl: String
-                ) {
+                override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
                     recoverWebViewSuccess = false
                 }
             }
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
index 271e8a8a0..9a21fb910 100644
--- 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
@@ -1,23 +1,21 @@
 package io.github.wulkanowy.ui.modules.login.recover
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.RecoverRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginRecoverPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: RecoverErrorHandler,
-    private val analytics: AnalyticsHelper,
+    private val analytics: FirebaseAnalyticsHelper,
     private val recoverRepository: RecoverRepository
-) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository) {
+) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -57,27 +55,24 @@ class LoginRecoverPresenter @Inject constructor(
 
         if (!validateInput(username, host)) return
 
-        flowWithResource { recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" }) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
+        disposable.add(recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" })
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                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")
+            .subscribe({ (resetUrl, siteKey) ->
+                view?.loadReCaptcha(siteKey, resetUrl)
+            }) {
+                Timber.i("Obtain captcha site key result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun validateInput(username: String, host: String): Boolean {
@@ -101,28 +96,35 @@ class LoginRecoverPresenter @Inject constructor(
         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)
+        with(disposable) {
+            clear()
+            add(recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse)
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showProgress(true)
+                        showRecoverForm(false)
+                        showCaptcha(false)
+                    }
                 }
-                Status.SUCCESS -> view?.run {
-                    showSuccessView(true)
-                    setSuccessTitle(it.data!!.substringBefore(". "))
-                    setSuccessMessage(it.data.substringAfter(". "))
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
+                    view?.run {
+                        showSuccessView(true)
+                        setSuccessTitle(it.substringBefore(". "))
+                        setSuccessMessage(it.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!!)
+                    errorHandler.dispatch(it)
                     analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to false)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch("verified")
+                })
+        }
     }
 
     fun onDetailsClick() {
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
index 8619369dd..110dd82e5 100644
--- 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
@@ -1,13 +1,17 @@
 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) : ErrorHandler(resources) {
+class RecoverErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
 
     var onInvalidUsername: (String) -> Unit = {}
 
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
index c046c2ff5..3332f2be8 100644
--- 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
@@ -5,7 +5,7 @@ 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.data.db.entities.Student
 import io.github.wulkanowy.databinding.ItemLoginStudentSelectBinding
 import javax.inject.Inject
 
@@ -14,13 +14,13 @@ class LoginStudentSelectAdapter @Inject constructor() :
 
     private val checkedList = mutableMapOf<Int, Boolean>()
 
-    var items = emptyList<Pair<StudentWithSemesters, Boolean>>()
+    var items = emptyList<Pair<Student, Boolean>>()
         set(value) {
             field = value
             checkedList.clear()
         }
 
-    var onClickListener: (StudentWithSemesters, alreadySaved: Boolean) -> Unit = { _, _ -> }
+    var onClickListener: (Student, alreadySaved: Boolean) -> Unit = { _, _ -> }
 
     override fun getItemCount() = items.size
 
@@ -30,13 +30,10 @@ class LoginStudentSelectAdapter @Inject constructor() :
 
     @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 }
+        val (student, alreadySaved) = items[position]
 
         with(holder.binding) {
-            loginItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
+            loginItemName.text = "${student.studentName} ${student.className}"
             loginItemSchool.text = student.schoolName
             loginItemName.isEnabled = !alreadySaved
             loginItemSchool.isEnabled = !alreadySaved
@@ -49,7 +46,7 @@ class LoginStudentSelectAdapter @Inject constructor() :
             }
 
             root.setOnClickListener {
-                onClickListener(studentAndSemesters, alreadySaved)
+                onClickListener(student, alreadySaved)
 
                 with(loginItemCheck) {
                     if (isEnabled) {
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 e71fc0f6f..b0df51991 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
@@ -5,9 +5,8 @@ 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.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -17,7 +16,6 @@ import io.github.wulkanowy.utils.openInternetBrowser
 import java.io.Serializable
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginStudentSelectFragment :
     BaseFragment<FragmentLoginStudentSelectBinding>(R.layout.fragment_login_student_select),
     LoginStudentSelectView {
@@ -58,7 +56,7 @@ class LoginStudentSelectFragment :
         }
     }
 
-    override fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>) {
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
         with(loginAdapter) {
             items = data
             notifyDataSetChanged()
@@ -81,8 +79,8 @@ class LoginStudentSelectFragment :
         binding.loginStudentSelectSignIn.isEnabled = enable
     }
 
-    fun onParentInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
-        presenter.onParentInitStudentSelectView(studentsWithSemesters)
+    fun onParentInitStudentSelectFragment(students: List<Student>) {
+        presenter.onParentInitStudentSelectView(students)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
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 c344bf441..db25c0da3 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,34 +1,32 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-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.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper
-) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
-    var students = emptyList<StudentWithSemesters>()
+    var students = emptyList<Student>()
 
-    private val selectedStudents = mutableListOf<StudentWithSemesters>()
+    private val selectedStudents = mutableListOf<Student>()
 
     fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
         super.onAttachView(view)
-        with(view) {
+        view.run {
             initView()
             showContact(false)
             enableSignIn(false)
@@ -39,7 +37,7 @@ class LoginStudentSelectPresenter @Inject constructor(
         }
 
         if (students is List<*> && students.isNotEmpty()) {
-            loadData(students.filterIsInstance<StudentWithSemesters>())
+            loadData(students.filterIsInstance<Student>())
         }
     }
 
@@ -47,17 +45,17 @@ class LoginStudentSelectPresenter @Inject constructor(
         registerStudents(selectedStudents)
     }
 
-    fun onParentInitStudentSelectView(studentsWithSemesters: List<StudentWithSemesters>) {
-        loadData(studentsWithSemesters)
-        if (studentsWithSemesters.size == 1) registerStudents(studentsWithSemesters)
+    fun onParentInitStudentSelectView(students: List<Student>) {
+        loadData(students)
+        if (students.size == 1) registerStudents(students)
     }
 
-    fun onItemSelected(studentWithSemester: StudentWithSemesters, alreadySaved: Boolean) {
+    fun onItemSelected(student: Student, alreadySaved: Boolean) {
         if (alreadySaved) return
 
         selectedStudents
-            .removeAll { it == studentWithSemester }
-            .let { if (!it) selectedStudents.add(studentWithSemester) }
+            .removeAll { it == student }
+            .let { if (!it) selectedStudents.add(student) }
 
         view?.enableSignIn(selectedStudents.isNotEmpty())
     }
@@ -70,23 +68,25 @@ class LoginStudentSelectPresenter @Inject constructor(
             && a.classId == b.classId
     }
 
-    private fun loadData(studentsWithSemesters: List<StudentWithSemesters>) {
+    private fun loadData(students: List<Student>) {
         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 })
+        this.students = students
+        disposable.add(studentRepository.getSavedStudents()
+            .map { savedStudents ->
+                students.map { student ->
+                    student to savedStudents.any { compareStudents(student, it) }
                 }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view?.updateData(it)
+            }, {
+                errorHandler.dispatch(it)
+                lastError = it
+                view?.updateData(students.map { student -> student to false })
+            })
+        )
     }
 
     private fun resetSelectedState() {
@@ -94,36 +94,34 @@ class LoginStudentSelectPresenter @Inject constructor(
         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")
+    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 {
                     showProgress(true)
                     showContent(false)
                 }
-                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)
-                }
+                Timber.i("Registration started")
             }
-        }.launch("register")
+            .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)
+                lastError = error
+                view?.apply {
+                    showProgress(false)
+                    showContent(true)
+                    showContact(true)
+                }
+            }))
     }
 
     fun onDiscordClick() {
@@ -133,15 +131,4 @@ class LoginStudentSelectPresenter @Inject constructor(
     fun onEmailClick() {
         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 f2acd76c5..89431dfc6 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,13 +1,13 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginStudentSelectView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>)
+    fun updateData(data: List<Pair<Student, Boolean>>)
 
     fun openMainView()
 
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 e2c37db61..befbffd50 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
@@ -8,9 +8,8 @@ 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.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -21,7 +20,6 @@ import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LoginSymbolFragment :
     BaseFragment<FragmentLoginSymbolBinding>(R.layout.fragment_login_symbol), LoginSymbolView {
 
@@ -108,8 +106,8 @@ class LoginSymbolFragment :
         binding.loginSymbolContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(studentsWithSemesters)
+    override fun notifyParentAccountLogged(students: List<Student>) {
+        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(students)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
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 4593d880a..1f9e66b70 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,23 +1,22 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.ifNullOrBlank
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Single
 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: AnalyticsHelper
-) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository, schedulers) {
 
     private var lastError: Throwable? = null
 
@@ -47,55 +46,44 @@ class LoginSymbolPresenter @Inject constructor(
             return
         }
 
-        flowWithResource { studentRepository.getStudentsScrapper(loginData!!.first, loginData!!.second, loginData!!.third, symbol) }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
+        disposable.add(
+            Single.fromCallable { 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)
+                    }
                     Timber.i("Login with symbol started")
-                    hideSoftKeyboard()
-                    showProgress(true)
-                    showContent(false)
                 }
-                Status.SUCCESS -> {
-                    view?.run {
-                        if (it.data!!.isEmpty()) {
+                .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()) {
                             Timber.i("Login with symbol result: Empty student list")
                             setErrorSymbolIncorrect()
                             view?.showContact(true)
                         } else {
                             Timber.i("Login with symbol result: Success")
-                            notifyParentAccountLogged(it.data)
+                            notifyParentAccountLogged(it)
                         }
                     }
-                    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.error!!.message.ifNullOrBlank { "No message" }
-                    )
-                    loginErrorHandler.dispatch(it.error)
-                    lastError = it.error
+                    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)
+                    lastError = it
                     view?.showContact(true)
-                }
-            }
-        }.afterLoading {
-            view?.apply {
-                showProgress(false)
-                showContent(true)
-            }
-        }.launch("login")
+                }))
     }
 
     fun onParentInitSymbolView(loginData: Triple<String, String, String>) {
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 830c77d17..6938bf138 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.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginSymbolView : BaseView {
@@ -25,7 +25,7 @@ interface LoginSymbolView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
+    fun notifyParentAccountLogged(students: List<Student>)
 
     fun showContact(show: Boolean)
 
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 0a73fe15d..0775ce189 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
@@ -4,18 +4,13 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-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.luckynumber.history.LuckyNumberHistoryFragment
-import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LuckyNumberFragment :
     BaseFragment<FragmentLuckyNumberBinding>(R.layout.fragment_lucky_number), LuckyNumberView,
     MainView.TitledView {
@@ -41,10 +36,7 @@ class LuckyNumberFragment :
 
     override fun initView() {
         with(binding) {
-            luckyNumberSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            luckyNumberSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            luckyNumberSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
-            luckyNumberHistoryButton.setOnClickListener { openLuckyNumberHistory() }
+            luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
             luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -82,10 +74,6 @@ class LuckyNumberFragment :
         binding.luckyNumberContent.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun openLuckyNumberHistory() {
-        (activity as? MainActivity)?.pushView(LuckyNumberHistoryFragment.newInstance())
-    }
-
     override fun 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 fd0598d8f..e932fedc0 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,21 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LuckyNumberPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val luckyNumberRepository: LuckyNumberRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -34,47 +32,47 @@ class LuckyNumberPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        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)
-                        }
+        Timber.i("Loading lucky number started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
                     }
                 }
-                Status.ERROR -> {
+                .subscribe({
+                    Timber.i("Loading lucky number result: Success")
+                    view?.apply {
+                        updateData(it)
+                        showContent(true)
+                        showEmpty(false)
+                        showErrorView(false)
+                    }
+                    analytics.logEvent(
+                        "load_item",
+                        "type" to "lucky_number",
+                        "number" to it.luckyNumber,
+                        "force_refresh" to forceRefresh
+                    )
+                }, {
                     Timber.i("Loading lucky number result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                }, {
+                    Timber.i("Loading lucky number result: No lucky number found")
+                    view?.run {
+                        showContent(false)
+                        showEmpty(true)
+                        showErrorView(false)
+                    }
+                })
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
index 0c05a1566..a680c83eb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
@@ -24,6 +24,4 @@ interface LuckyNumberView : BaseView {
     fun enableSwipe(enable: Boolean)
 
     fun showContent(show: Boolean)
-
-    fun openLuckyNumberHistory()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
deleted file mode 100644
index 7c09c96fe..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.databinding.ItemLuckyNumberHistoryBinding
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import java.util.Locale
-import javax.inject.Inject
-
-class LuckyNumberHistoryAdapter @Inject constructor() :
-    RecyclerView.Adapter<LuckyNumberHistoryAdapter.ItemViewHolder>() {
-
-    var items = emptyList<LuckyNumber>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemLuckyNumberHistoryBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("DefaultLocale")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-        with(holder.binding) {
-            luckyNumberHistoryWeekName.text = item.date.weekDayName.capitalize()
-            luckyNumberHistoryDate.text = item.date.toFormattedString()
-            luckyNumberHistory.text = item.luckyNumber.toString()
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemLuckyNumberHistoryBinding) : RecyclerView.ViewHolder(binding.root)
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt
deleted file mode 100644
index 6e991ba13..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import android.os.Bundle
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.databinding.FragmentLuckyNumberHistoryBinding
-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.SchooldaysRangeLimiter
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.getThemeAttrColor
-import java.time.LocalDate
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class LuckyNumberHistoryFragment :
-    BaseFragment<FragmentLuckyNumberHistoryBinding>(R.layout.fragment_lucky_number_history), LuckyNumberHistoryView,
-    MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: LuckyNumberHistoryPresenter
-
-    @Inject
-    lateinit var luckyNumberHistoryAdapter: LuckyNumberHistoryAdapter
-
-    companion object {
-        fun newInstance() = LuckyNumberHistoryFragment()
-    }
-
-    override val titleStringId: Int
-        get() = R.string.lucky_number_history_title
-
-    override val isViewEmpty get() = luckyNumberHistoryAdapter.items.isEmpty()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLuckyNumberHistoryBinding.bind(view)
-        messageContainer = binding.luckyNumberHistoryRecycler
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        with(binding.luckyNumberHistoryRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = luckyNumberHistoryAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-
-        with(binding) {
-            luckyNumberHistoryNavDate.setOnClickListener { presenter.onPickDate() }
-            luckyNumberHistoryErrorRetry.setOnClickListener { presenter.onRetry() }
-            luckyNumberHistoryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
-            luckyNumberHistoryPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
-            luckyNumberHistoryNextButton.setOnClickListener { presenter.onNextWeek() }
-
-            luckyNumberHistoryNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
-    }
-
-    override fun updateData(data: List<LuckyNumber>) {
-        with(luckyNumberHistoryAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun clearData() {
-        with(luckyNumberHistoryAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun showEmpty(show: Boolean) {
-        binding.luckyNumberHistoryEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.luckyNumberHistoryError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.luckyNumberHistoryErrorMessage.text = message
-    }
-
-    override fun updateNavigationWeek(date: String) {
-        binding.luckyNumberHistoryNavDate.text = date
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.luckyNumberHistoryProgress.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showPreButton(show: Boolean) {
-        binding.luckyNumberHistoryPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
-    }
-
-    override fun showNextButton(show: Boolean) {
-        binding.luckyNumberHistoryNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
-    }
-
-    override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
-
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@LuckyNumberHistoryFragment.parentFragmentManager, null)
-        }
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.luckyNumberHistoryRecycler.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/luckynumber/history/LuckyNumberHistoryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt
deleted file mode 100644
index 556dda759..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.previousOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import java.time.LocalDate
-import javax.inject.Inject
-
-class LuckyNumberHistoryPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val luckyNumberRepository: LuckyNumberRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<LuckyNumberHistoryView>(errorHandler, studentRepository) {
-
-    private lateinit var lastError: Throwable
-
-    var currentDate: LocalDate = LocalDate.now().previousOrSameSchoolDay
-
-    override fun onAttachView(view: LuckyNumberHistoryView) {
-        super.onAttachView(view)
-        view.run {
-            initView()
-            reloadNavigation()
-            showContent(false)
-        }
-        Timber.i("Lucky number history view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    private fun loadData() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            luckyNumberRepository.getLuckyNumberHistory(student, currentDate.monday, currentDate.sunday)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading lucky number history started")
-                Status.SUCCESS -> {
-                    if (!it.data?.first().isNullOrEmpty()) {
-                        Timber.i("Loading lucky number result: Success")
-                        view?.apply {
-                            updateData(it.data!!.first())
-                            showContent(true)
-                            showEmpty(false)
-                            showErrorView(false)
-                            showProgress(false)
-                        }
-                        analytics.logEvent(
-                            "load_items",
-                            "type" to "lucky_number_history",
-                            "numbers" to it.data
-                        )
-                    } else {
-                        Timber.i("Loading lucky number history result: No lucky numbers found")
-                        view?.run {
-                            showContent(false)
-                            showEmpty(true)
-                            showErrorView(false)
-                        }
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading lucky number history result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showProgress(false)
-            }
-        }.launch()
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
-    private fun reloadView(date: LocalDate) {
-        currentDate = date
-        Timber.i("Reload lucky number history view with the date ${currentDate.toFormattedString()}")
-        view?.apply {
-            showProgress(true)
-            showContent(false)
-            showEmpty(false)
-            showErrorView(false)
-            clearData()
-            reloadNavigation()
-        }
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun reloadNavigation() {
-        view?.apply {
-            showPreButton(!currentDate.minusDays(7).isHolidays)
-            showNextButton(!currentDate.plusDays(7).isHolidays)
-            updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.sunday.toFormattedString("dd.MM"))
-        }
-    }
-
-    fun onDateSet(year: Int, month: Int, day: Int) {
-        reloadView(LocalDate.of(year, month, day))
-        loadData()
-    }
-
-    fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
-    }
-
-    fun onPreviousWeek() {
-        reloadView(currentDate.minusDays(7))
-        loadData()
-    }
-
-    fun onNextWeek() {
-        reloadView(currentDate.plusDays(7))
-        loadData()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryView.kt
deleted file mode 100644
index 331e4ff86..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryView.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
-
-interface LuckyNumberHistoryView : BaseView {
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun updateData(data: List<LuckyNumber>)
-
-    fun clearData()
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun updateNavigationWeek(date: String)
-
-    fun showProgress(show: Boolean)
-
-    fun showPreButton(show: Boolean)
-
-    fun showNextButton(show: Boolean)
-
-    fun showDatePickerDialog(currentDate: LocalDate)
-
-    fun showContent(show: Boolean)
-
-    fun onDestroyView()
-}
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 024beff85..961ac6338 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
@@ -9,9 +9,8 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+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
@@ -19,7 +18,6 @@ import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LuckyNumberWidgetConfigureActivity :
     BaseActivity<LuckyNumberWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     LuckyNumberWidgetConfigureView {
@@ -38,9 +36,7 @@ class LuckyNumberWidgetConfigureActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(
-            ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root
-        )
+        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
@@ -72,9 +68,8 @@ class LuckyNumberWidgetConfigureActivity :
             .show()
     }
 
-    override fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long) {
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
         with(configureAdapter) {
-            selectedId = selectedStudentId
             items = data
             notifyDataSetChanged()
         }
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 5b6af69ac..468f9b575 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,23 +1,21 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-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.StudentRepository
+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.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class LuckyNumberWidgetConfigurePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository) {
+) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
@@ -47,26 +45,23 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Lucky number widget configure students data load")
-                Status.SUCCESS -> {
-                    val selectedStudentId = appWidgetId?.let { id ->
-                        sharedPref.getLong(getStudentWidgetKey(id), 0)
-                    } ?: -1
-
-                    when {
-                        it.data!!.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
-                        else -> view?.updateData(it.data, selectedStudentId)
-                    }
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> student to (student.id == currentStudentId) }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 -> {
+                        selectedStudent = it.single().first
+                        view?.showThemeDialog()
+                    }
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 
     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 b4556f7ef..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,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LuckyNumberWidgetConfigureView : BaseView {
@@ -9,7 +9,7 @@ interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun showThemeDialog()
 
-    fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long)
+    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 49a199431..55a048b32 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
@@ -7,25 +7,26 @@ import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
 import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
 import android.appwidget.AppWidgetProvider
 import android.content.Context
+import android.content.Intent
 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.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 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.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
+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.toFirstResult
-import kotlinx.coroutines.runBlocking
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Maybe
 import timber.log.Timber
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class LuckyNumberWidgetProvider : AppWidgetProvider() {
 
     @Inject
@@ -34,6 +35,12 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
     @Inject
     lateinit var luckyNumberRepository: LuckyNumberRepository
 
+    @Inject
+    lateinit var schedulers: SchedulersProvider
+
+    @Inject
+    lateinit var appWidgetManager: AppWidgetManager
+
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
@@ -48,6 +55,11 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         fun getWidthWidgetKey(appWidgetId: Int) = "lucky_number_widget_width_$appWidgetId"
     }
 
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+        super.onReceive(context, intent)
+    }
+
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray?) {
         super.onUpdate(context, appWidgetManager, appWidgetIds)
         appWidgetIds?.forEach { appWidgetId ->
@@ -125,23 +137,27 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         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)
+    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()
                     }
                 }
-                else -> null
-            }
-
-            currentStudent?.let {
-                luckyNumberRepository.getLuckyNumber(it, false).toFirstResult().data
-            }
+                .flatMap { luckyNumberRepository.getLuckyNumber(it) }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
         } catch (e: Exception) {
             if (e.cause !is NoCurrentStudentException) {
                 Timber.e(e, "An error has occurred in lucky number provider")
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 37c6c6e75..f5b7c47c8 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,43 +1,27 @@
 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.Build.VERSION_CODES.P
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.ViewGroup
-import androidx.annotation.RequiresApi
-import androidx.core.content.getSystemService
 import androidx.core.view.ViewCompat
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updateMargins
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW
 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.hilt.android.AndroidEntryPoint
+import dagger.Lazy
 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.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
-import io.github.wulkanowy.ui.modules.account.accountquick.AccountQuickDialog
+import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
@@ -47,51 +31,37 @@ 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.AnalyticsHelper
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.UpdateHelper
-import io.github.wulkanowy.utils.createNameInitialsDrawable
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.nickOrName
 import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
 import timber.log.Timber
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView,
-    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView {
 
     @Inject
     override lateinit var presenter: MainPresenter
 
     @Inject
-    lateinit var analytics: AnalyticsHelper
+    lateinit var navController: FragNavController
 
     @Inject
-    lateinit var updateHelper: UpdateHelper
+    lateinit var analytics: FirebaseAnalyticsHelper
 
     @Inject
-    lateinit var appInfo: AppInfo
-
-    private var accountMenu: MenuItem? = null
-
-    private val overlayProvider by lazy { ElevationOverlayProvider(this) }
-
-    private val navController =
-        FragNavController(supportFragmentManager, R.id.mainFragmentContainer)
+    lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
 
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
 
-        fun getStartIntent(
-            context: Context,
-            startMenu: MainView.Section? = null,
-            clear: Boolean = false
-        ) = 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.id) }
+        fun getStartIntent(context: Context, startMenu: MainView.Section? = null, clear: Boolean = false): Intent {
+            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) }
+                }
         }
     }
 
@@ -99,10 +69,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
     override val currentStackSize get() = navController.currentStack?.size
 
-    override val currentViewTitle
-        get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let {
-            getString(it)
-        }
+    override val currentViewTitle get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
 
     override val currentViewSubtitle get() = (navController.currentFrag as? MainView.TitledView)?.subtitleString
 
@@ -117,130 +84,42 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance()
     )
 
-    @SuppressLint("NewApi")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(ActivityMainBinding.inflate(layoutInflater).apply { binding = this }.root)
         setSupportActionBar(binding.mainToolbar)
         messageContainer = binding.mainFragmentContainer
-        updateHelper.messageContainer = binding.mainFragmentContainer
 
-        val section = MainView.Section.values()
-            .singleOrNull { it.id == intent.getIntExtra(EXTRA_START_MENU, -1) }
-
-        presenter.onAttachView(this, section)
+        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.Section)
 
         with(navController) {
             initialize(startMenuIndex, savedInstanceState)
             pushFragment(moreMenuFragments[startMenuMoreIndex])
         }
-
-        if (appInfo.systemVersion >= Build.VERSION_CODES.N_MR1) {
-            initShortcuts()
-        }
-
-        updateHelper.checkAndInstallUpdates(this)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        updateHelper.onResume(this)
-    }
-
-    //https://developer.android.com/guide/playcore/in-app-updates#status_callback
-    @Suppress("DEPRECATION")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        updateHelper.onActivityResult(requestCode, resultCode)
-    }
-
-    @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
-            )
-        ).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 {
         menuInflater.inflate(R.menu.action_menu_main, menu)
-        accountMenu = menu?.findItem(R.id.mainMenuAccount)
-
-        presenter.onActionMenuCreated()
         return true
     }
 
-    @SuppressLint("NewApi")
     override fun initView() {
         with(binding.mainToolbar) {
             if (SDK_INT >= LOLLIPOP) stateListAnimator = null
-            setBackgroundColor(
-                overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f))
-            )
+            setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
         }
 
         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
-                    ),
-                    AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_main_exam, 0),
-                    AHBottomNavigationItem(
-                        R.string.timetable_title,
-                        R.drawable.ic_main_timetable,
-                        0
-                    ),
-                    AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
-                )
-            )
+            addItems(listOf(
+                AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0),
+                AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_main_attendance, 0),
+                AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_main_exam, 0),
+                AHBottomNavigationItem(R.string.timetable_title, R.drawable.ic_main_timetable, 0),
+                AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
+            ))
             accentColor = getThemeAttrColor(R.attr.colorPrimary)
             inactiveColor = getThemeAttrColor(R.attr.colorOnSurface, 153)
-            defaultBackgroundColor =
-                overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
+            defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
@@ -249,31 +128,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         }
 
         with(navController) {
-            setOnViewChangeListener { section, name ->
-                if (section == MainView.Section.ACCOUNT || section == MainView.Section.STUDENT_INFO) {
-                    binding.mainBottomNav.isVisible = false
-                    binding.mainFragmentContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                        updateMargins(bottom = 0)
-                    }
-
-                    if (appInfo.systemVersion >= P) {
-                        window.navigationBarColor = getThemeAttrColor(R.attr.colorSurface)
-                    }
-                } else {
-                    binding.mainBottomNav.isVisible = true
-                    binding.mainFragmentContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                        updateMargins(bottom = dpToPx(56f).toInt())
-                    }
-
-                    if (appInfo.systemVersion >= P) {
-                        window.navigationBarColor =
-                            getThemeAttrColor(android.R.attr.navigationBarColor)
-                    }
-                }
-
-                analytics.setCurrentScreen(this@MainActivity, name)
-                presenter.onViewChange(section)
-            }
+            setOnViewChangeListener(presenter::onViewChange)
             fragmentHideStrategy = HIDE
             rootFragments = listOf(
                 GradeFragment.newInstance(),
@@ -285,18 +140,12 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         }
     }
 
-    override fun onPreferenceStartFragment(
-        caller: PreferenceFragmentCompat,
-        pref: Preference
-    ): Boolean {
-        val fragment =
-            supportFragmentManager.fragmentFactory.instantiate(classLoader, pref.fragment)
-        pushView(fragment)
-        return true
+    override fun setCurrentScreen(name: String?) {
+        analytics.setCurrentScreen(this, name)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return if (item.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        return if (item?.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
         else false
     }
 
@@ -305,9 +154,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     }
 
     override fun switchMenuView(position: Int) {
-        if (supportFragmentManager.isStateSaved) return
-
-        analytics.popCurrentScreen(navController.currentFrag!!::class.simpleName)
         navController.switchTab(position)
     }
 
@@ -323,8 +169,8 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         supportActionBar?.setDisplayHomeAsUpEnabled(show)
     }
 
-    override fun showAccountPicker(studentWithSemesters: List<StudentWithSemesters>) {
-        showDialogFragment(AccountQuickDialog.newInstance(studentWithSemesters))
+    override fun showAccountPicker() {
+        navController.showDialogFragment(AccountDialog.newInstance())
     }
 
     override fun showActionBarElevation(show: Boolean) {
@@ -340,32 +186,15 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentChanged()
     }
 
-    @Suppress("DEPRECATION")
     fun showDialogFragment(dialog: DialogFragment) {
-        if (supportFragmentManager.isStateSaved) return
-
-        //Deprecated method is used here to avoid fragnav bug
-        if (navController.currentDialogFrag?.fragmentManager == null) {
-            FragNavController::class.java.getDeclaredField("mCurrentDialogFrag").apply {
-                isAccessible = true
-                set(navController, null)
-            }
-        }
-
         navController.showDialogFragment(dialog)
     }
 
     fun pushView(fragment: Fragment) {
-        if (supportFragmentManager.isStateSaved) return
-
-        analytics.popCurrentScreen(navController.currentFrag!!::class.simpleName)
         navController.pushFragment(fragment)
     }
 
     override fun popView(depth: Int) {
-        if (supportFragmentManager.isStateSaved) return
-
-        analytics.popCurrentScreen(navController.currentFrag!!::class.simpleName)
         navController.safelyPopFragments(depth)
     }
 
@@ -373,13 +202,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         presenter.onBackPressed { super.onBackPressed() }
     }
 
-    override fun showStudentAvatar(student: Student) {
-        accountMenu?.run {
-            icon = createNameInitialsDrawable(student.nickOrName, student.avatarColor, 0.44f)
-            title = getString(R.string.main_account_picker)
-        }
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         navController.onSaveInstanceState(outState)
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
new file mode 100644
index 000000000..03f6ac382
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
@@ -0,0 +1,139 @@
+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.contributor.ContributorFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.about.license.LicenseModule
+import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
+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.homework.details.HomeworkDetailsDialog
+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.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
+abstract class MainModule {
+
+    companion object {
+
+        @Provides
+        fun provideFragNavController(activity: MainActivity) =
+            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 bindHomeworkDetailsDialog(): HomeworkDetailsDialog
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindCompletedLessonsFragment(): CompletedLessonsFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindAccountDialog(): AccountDialog
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMobileDevices(): MobileDeviceFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindMobileDeviceDialog(): MobileDeviceTokenDialog
+
+    @PerFragment
+    @ContributesAndroidInjector(modules = [LicenseModule::class])
+    abstract fun bindLicenseFragment(): LicenseFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindLogViewerFragment(): LogViewerFragment
+
+    @PerFragment
+    @ContributesAndroidInjector
+    abstract fun bindContributorFragment(): ContributorFragment
+
+    @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 ffcfcb614..233d44917 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
@@ -1,30 +1,26 @@
 package io.github.wulkanowy.ui.modules.main
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 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.AnalyticsHelper
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+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: AnalyticsHelper,
-) : BasePresenter<MainView>(errorHandler, studentRepository) {
-
-    var studentsWitSemesters: List<StudentWithSemesters>? = null
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<MainView>(errorHandler, studentRepository, schedulers) {
 
     fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
@@ -41,30 +37,9 @@ class MainPresenter @Inject constructor(
         analytics.logEvent("app_open", "destination" to initMenu?.name)
     }
 
-    fun onActionMenuCreated() {
-        if (!studentsWitSemesters.isNullOrEmpty()) {
-            showCurrentStudentAvatar()
-            return
-        }
-
-        flowWithResource { studentRepository.getSavedStudents(false) }
-            .onEach { resource ->
-                when (resource.status) {
-                    Status.LOADING -> Timber.i("Loading student avatar data started")
-                    Status.SUCCESS -> {
-                        studentsWitSemesters = resource.data
-                        showCurrentStudentAvatar()
-                    }
-                    Status.ERROR -> {
-                        Timber.i("Loading student avatar result: An exception occurred")
-                        errorHandler.dispatch(resource.error!!)
-                    }
-                }
-            }.launch("avatar")
-    }
-
-    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 }) }
@@ -76,10 +51,8 @@ class MainPresenter @Inject constructor(
     }
 
     fun onAccountManagerSelected(): Boolean {
-        if (studentsWitSemesters.isNullOrEmpty()) return true
-
         Timber.i("Select account manager")
-        view?.showAccountPicker(studentsWitSemesters!!)
+        view?.showAccountPicker()
         return true
     }
 
@@ -111,13 +84,6 @@ class MainPresenter @Inject constructor(
         } == true
     }
 
-    private fun showCurrentStudentAvatar() {
-        val currentStudent =
-            studentsWitSemesters?.singleOrNull { it.student.isCurrent }?.student ?: return
-
-        view?.showStudentAvatar(currentStudent)
-    }
-
     private fun getProperViewIndexes(initMenu: MainView.Section?): Pair<Int, Int> {
         return when (initMenu?.id) {
             in 0..3 -> initMenu!!.id to -1
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 a4b7d094b..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
@@ -1,7 +1,5 @@
 package io.github.wulkanowy.ui.modules.main
 
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface MainView : BaseView {
@@ -24,7 +22,9 @@ interface MainView : BaseView {
 
     fun showHomeArrow(show: Boolean)
 
-    fun showAccountPicker(studentWithSemesters: List<StudentWithSemesters>)
+    fun showAccountPicker()
+
+    fun setCurrentScreen(name: String?)
 
     fun showActionBarElevation(show: Boolean)
 
@@ -38,8 +38,6 @@ interface MainView : BaseView {
 
     fun popView(depth: Int = 1)
 
-    fun showStudentAvatar(student: Student)
-
     interface MainChildView {
 
         fun onFragmentReselected()
@@ -68,8 +66,6 @@ interface MainView : BaseView {
         LUCKY_NUMBER(8),
         SETTINGS(9),
         ABOUT(10),
-        SCHOOL(11),
-        ACCOUNT(12),
-        STUDENT_INFO(13)
+        SCHOOL(11)
     }
 }
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 72fc627f8..4a9d217b0 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
@@ -4,11 +4,11 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.enums.MessageFolder.SENT
-import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
+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
@@ -19,14 +19,14 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_message),
     MessageView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = MessageFragment()
@@ -77,6 +77,10 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
         binding.messageProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
+    fun onDeleteMessage(message: Message) {
+        presenter.onDeleteMessage(message)
+    }
+
     fun onChildFragmentLoaded() {
         presenter.onChildViewLoaded()
     }
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
new file mode 100644
index 000000000..bf7950209
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
@@ -0,0 +1,25 @@
+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
+abstract class MessageModule {
+
+    companion object {
+
+        @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 7b8c3d0f5..0f5598b23 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,26 +1,29 @@
 package io.github.wulkanowy.ui.modules.message
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+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 kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 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) {
+) : BasePresenter<MessageView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MessageView) {
         super.onAttachView(view)
-        launch {
-            delay(150)
-            view.initView()
-            Timber.i("Message view was initialized")
-            loadData()
-        }
+        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
+            .subscribe {
+                view.initView()
+                Timber.i("Message view was initialized")
+                loadData()
+            })
     }
 
     fun onPageSelected(index: Int) {
@@ -43,6 +46,15 @@ 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
index 206a74602..436dee53f 100644
--- 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
@@ -9,6 +9,7 @@ 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.data.repositories.message.MessageFolder
 import io.github.wulkanowy.databinding.ItemMessageAttachmentBinding
 import io.github.wulkanowy.databinding.ItemMessageDividerBinding
 import io.github.wulkanowy.databinding.ItemMessagePreviewBinding
@@ -62,11 +63,11 @@ class MessagePreviewAdapter @Inject constructor() :
     @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) }
+            messagePreviewSubject.text = if (message.subject.isNotBlank()) message.subject else 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
+            messagePreviewAuthor.text = if (message.folderId == MessageFolder.SENT.id) "${root.context.getString(R.string.message_to)} ${message.recipient}"
+            else "${root.context.getString(R.string.message_from)} ${message.sender}"
         }
     }
 
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 74f8f57ec..99eede15a 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,22 +1,13 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.os.Build
 import android.os.Bundle
-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.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
@@ -24,12 +15,10 @@ 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 io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.shareText
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MessagePreviewFragment :
     BaseFragment<FragmentMessagePreviewBinding>(R.layout.fragment_message_preview),
     MessagePreviewView, MainView.TitledView {
@@ -40,34 +29,18 @@ class MessagePreviewFragment :
     @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 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() }
-
-    override val messageNotExists: String
-        get() = getString(R.string.message_not_exists)
-
     companion object {
         const val MESSAGE_ID_KEY = "message_id"
 
@@ -104,8 +77,6 @@ class MessagePreviewFragment :
         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()
     }
 
@@ -114,8 +85,6 @@ class MessagePreviewFragment :
             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
         }
     }
@@ -139,8 +108,6 @@ class MessagePreviewFragment :
         menuReplyButton?.isVisible = show
         menuForwardButton?.isVisible = show
         menuDeleteButton?.isVisible = show
-        menuShareButton?.isVisible = show
-        menuPrintButton?.isVisible = show && appInfo.systemVersion >= Build.VERSION_CODES.LOLLIPOP
     }
 
     override fun setDeletedOptionsLabels() {
@@ -171,42 +138,14 @@ class MessagePreviewFragment :
         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)
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 702e54676..24678c70e 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,37 +1,25 @@
 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.enums.MessageFolder
-import io.github.wulkanowy.data.repositories.MessageRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.AppInfo
-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 io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper,
-    private var appInfo: AppInfo
-) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository, schedulers) {
 
     var message: Message? = null
 
-    var attachments: List<MessageAttachment>? = null
-
     private lateinit var lastError: Throwable
 
     private var retryCallback: () -> Unit = {}
@@ -57,43 +45,32 @@ class MessagePreviewPresenter @Inject constructor(
     }
 
     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 ")
-                    if (it.data != null) {
-                        this@MessagePreviewPresenter.message = it.data.message
-                        this@MessagePreviewPresenter.attachments = it.data.attachments
-                        view?.apply {
-                            setMessageWithAttachment(it.data)
-                            showContent(true)
-                            initOptions()
-                        }
-                        analytics.logEvent(
-                            "load_item",
-                            "type" to "message_preview",
-                            "length" to it.data.message.content.length
-                        )
-                    } else {
-                        view?.run {
-                            showMessage(messageNotExists)
-                            popView()
-                        }
+        Timber.i("Loading message ${message.messageId} preview started")
+        disposable.apply {
+            clear()
+            add(studentRepository.getStudentById(message.studentId)
+                .flatMap { messageRepository.getMessage(it, message, true) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally { view?.showProgress(false) }
+                .subscribe({ message ->
+                    Timber.i("Loading message ${message.message.messageId} preview result: Success ")
+                    this@MessagePreviewPresenter.message = message.message
+                    view?.apply {
+                        setMessageWithAttachment(message)
+                        initOptions()
                     }
-                }
-                Status.ERROR -> {
+                    analytics.logEvent(
+                        "load_item",
+                        "type" to "message_preview",
+                        "length" to message.message.content.length
+                    )
+                }) {
                     Timber.i("Loading message ${message.messageId} preview result: An exception occurred ")
                     retryCallback = { onMessageLoadRetry(message) }
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     fun onReply(): Boolean {
@@ -110,99 +87,41 @@ class MessagePreviewPresenter @Inject constructor(
         } else 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}"
+    private fun deleteMessage() {
+        message?.let { message ->
+            disposable.add(studentRepository.getCurrentStudent()
+                .flatMap { messageRepository.deleteMessage(it, message) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doOnSubscribe {
+                    view?.run {
+                        showContent(false)
+                        showProgress(true)
+                        showOptions(false)
+                        showErrorView(false)
                     }
                 }
-            }
-
-            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")
+                .doFinally {
+                    view?.showProgress(false)
+                }
+                .subscribe({
                     view?.run {
+                        notifyParentMessageDeleted(message)
                         showMessage(deleteMessageSuccessString)
                         popView()
                     }
-                }
-                Status.ERROR -> {
-                    Timber.d("Message ${message?.id} delete failed")
+                }, { error ->
                     retryCallback = { onMessageDelete() }
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.showProgress(false)
-        }.launch("delete")
+                    errorHandler.dispatch(error)
+                })
+            )
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
         view?.run {
             lastError = error
             setErrorDetails(message)
-            showContent(false)
             showErrorView(true)
             setErrorRetryCallback { retryCallback() }
         }
@@ -217,7 +136,7 @@ class MessagePreviewPresenter @Inject constructor(
         view?.apply {
             showOptions(message != null)
             message?.let {
-                when (it.folderId == MessageFolder.TRASHED.id) {
+                when (it.removed) {
                     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 583ba6878..3d620459c 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,7 +1,5 @@
 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
@@ -10,12 +8,6 @@ interface MessagePreviewView : BaseView {
 
     val deleteMessageSuccessString: String
 
-    val messageNoSubjectString: String
-
-    val printHTML: String
-
-    val messageNotExists: String
-
     fun initView()
 
     fun setMessageWithAttachment(item: MessageWithAttachment)
@@ -24,6 +16,8 @@ interface MessagePreviewView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun notifyParentMessageDeleted(message: Message)
+
     fun showErrorView(show: Boolean)
 
     fun setErrorDetails(message: String)
@@ -40,10 +34,5 @@ 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 59944d41d..7b7503433 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,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.message.send
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.graphics.Rect
@@ -12,7 +11,6 @@ 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
@@ -23,7 +21,6 @@ import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(), SendMessageView {
 
     @Inject
@@ -65,7 +62,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     override val messageSuccess: String
         get() = getString(R.string.message_send_successful)
 
-    public override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
         setSupportActionBar(binding.sendMessageToolbar)
@@ -75,7 +72,6 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     override fun initView() {
         setUpExtendedHitArea()
         with(binding) {
@@ -89,8 +85,8 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         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
     }
 
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 77bd0f5e6..aec79f9db 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,25 +1,25 @@
 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.repositories.MessageRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.RecipientRepository
-import io.github.wulkanowy.data.repositories.ReportingUnitRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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
+import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.onEach
+import io.reactivex.Completable
 import timber.log.Timber
 import javax.inject.Inject
 
 class SendMessagePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
@@ -27,15 +27,15 @@ class SendMessagePresenter @Inject constructor(
     private val reportingUnitRepository: ReportingUnitRepository,
     private val recipientRepository: RecipientRepository,
     private val preferencesRepository: PreferencesRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<SendMessageView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<SendMessageView>(errorHandler, studentRepository, schedulers) {
 
     fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
-        with(view) {
+        view.apply {
             message?.let {
                 setSubject(when (reply) {
                     true -> "RE: "
@@ -93,89 +93,90 @@ class SendMessagePresenter @Inject constructor(
     }
 
     private fun loadData(message: Message?, reply: Boolean?) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            val unit = reportingUnitRepository.getReportingUnit(student, semester.unitId)
+        var reportingUnit: ReportingUnit? = null
+        var recipientChips: List<RecipientChipItem> = emptyList()
+        var selectedRecipientChips: List<RecipientChipItem> = emptyList()
 
-            Timber.i("Loading recipients started")
-            val recipients = when {
-                unit != null -> recipientRepository.getRecipients(student, unit, 2)
-                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")
+        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 {
                     showProgress(true)
                     showContent(false)
                 }
-                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)
-                        }
+            }
+            .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.i("Loading recipients result: Can't find the reporting unit")
+                        view?.showEmpty(true)
                     }
                 }
-                Status.ERROR -> {
-                    Timber.i("Loading recipients result: An exception occurred")
-                    view?.showContent(true)
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run { showProgress(false) }
-        }.launch()
+            }, {
+                Timber.i("Loading recipients result: An exception occurred")
+                view?.showContent(true)
+                errorHandler.dispatch(it)
+            }))
     }
 
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            messageRepository.sendMessage(student, subject, content, recipients)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> view?.run {
-                    Timber.i("Sending message started")
+        Timber.i("Sending message started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { messageRepository.sendMessage(it, subject, content, recipients) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doOnSubscribe {
+                view?.run {
                     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!!)
-                }
             }
-        }.launch("send")
+            .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)
+            })
+        )
     }
 
     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
index f0f65e087..ece6773fd 100644
--- 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
@@ -4,12 +4,13 @@ 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 androidx.recyclerview.widget.SortedList
+import androidx.recyclerview.widget.SortedListAdapterCallback
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.enums.MessageFolder
+import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.databinding.ItemMessageBinding
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
@@ -19,18 +20,39 @@ class MessageTabAdapter @Inject constructor() :
 
     var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
 
-    var onChangesDetectedListener = {}
+    private val items = SortedList(Message::class.java, object :
+        SortedListAdapterCallback<Message>(this) {
 
-    private var items = mutableListOf<Message>()
+        override fun compare(item1: Message, item2: Message): Int {
+            return item2.date.compareTo(item1.date)
+        }
 
-    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 areContentsTheSame(oldItem: Message?, newItem: Message?): Boolean {
+            return oldItem == newItem
+        }
+
+        override fun areItemsTheSame(item1: Message, item2: Message): Boolean {
+            return item1 == item2
+        }
+    })
+
+    fun replaceAll(models: List<Message>) {
+        items.beginBatchedUpdates()
+        for (i in items.size() - 1 downTo 0) {
+            val model = items.get(i)
+            if (model !in models) {
+                items.remove(model)
+            }
+        }
+        items.addAll(models)
+        items.endBatchedUpdates()
     }
 
-    override fun getItemCount() = items.size
+    fun updateItem(position: Int, item: Message) {
+        items.updateItemAt(position, item)
+    }
+
+    override fun getItemCount() = items.size()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
         ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -63,19 +85,4 @@ class MessageTabAdapter @Inject constructor() :
     }
 
     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 f08059f2c..909bb6873 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
@@ -9,21 +9,17 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 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.enums.MessageFolder
+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.preview.MessagePreviewFragment
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.getThemeAttrColor
-import kotlinx.coroutines.FlowPreview
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.fragment_message_tab),
     MessageTabView {
 
@@ -53,7 +49,6 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         setHasOptionsMenu(true)
     }
 
-    @FlowPreview
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMessageTabBinding.bind(view)
@@ -64,10 +59,7 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
     }
 
     override fun initView() {
-        with(tabAdapter) {
-            onClickListener = presenter::onMessageItemSelected
-            onChangesDetectedListener = ::resetListPosition
-        }
+        tabAdapter.onClickListener = presenter::onMessageItemSelected
 
         with(binding.messageTabRecycler) {
             layoutManager = LinearLayoutManager(context)
@@ -75,9 +67,7 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
             addItemDecoration(DividerItemDecoration(context))
         }
         with(binding) {
-            messageTabSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            messageTabSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            messageTabSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
             messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -100,7 +90,11 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
     }
 
     override fun updateData(data: List<Message>) {
-        tabAdapter.setDataItems(data)
+        tabAdapter.replaceAll(data)
+    }
+
+    override fun updateItem(item: Message, position: Int) {
+        tabAdapter.updateItem(position, item)
     }
 
     override fun showProgress(show: Boolean) {
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 c560a77de..221762d16 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,39 +1,27 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import io.github.wulkanowy.data.Status
+import android.annotation.SuppressLint
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.enums.MessageFolder
-import io.github.wulkanowy.data.repositories.MessageRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.data.repositories.message.MessageRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper
-) : BasePresenter<MessageTabView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<MessageTabView>(errorHandler, studentRepository, schedulers) {
 
     lateinit var folder: MessageFolder
 
@@ -43,13 +31,9 @@ class MessageTabPresenter @Inject constructor(
 
     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
     }
@@ -72,7 +56,7 @@ class MessageTabPresenter @Inject constructor(
     }
 
     fun onDeleteMessage() {
-        loadData(true)
+        loadData(false)
     }
 
     fun onParentViewLoadData(forceRefresh: Boolean) {
@@ -81,55 +65,49 @@ class MessageTabPresenter @Inject constructor(
 
     fun onMessageItemSelected(message: Message, position: Int) {
         Timber.i("Select message ${message.id} item (position: $position)")
-        view?.openMessage(message)
+        view?.run {
+            openMessage(message)
+            if (message.unread) {
+                message.unread = false
+                updateItem(message, position)
+            }
+        }
     }
 
     private fun loadData(forceRefresh: Boolean) {
         Timber.i("Loading $folder message data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            messageRepository.getMessages(student, semester, folder, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            messages = it.data
-                            updateData(getFilteredData(lastSearchQuery))
-                            notifyParentDataLoaded()
-                        }
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student)
+                        .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
+                }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        showRefresh(false)
+                        showProgress(false)
+                        enableSwipe(true)
+                        notifyParentDataLoaded()
                     }
                 }
-                Status.SUCCESS -> {
+                .subscribe({
                     Timber.i("Loading $folder message result: Success")
-                    messages = it.data!!
-                    updateData(getFilteredData(lastSearchQuery))
+                    messages = it
+                    onSearchQueryTextChange(lastSearchQuery)
                     analytics.logEvent(
                         "load_data",
                         "type" to "messages",
-                        "items" to it.data.size,
+                        "items" to it.size,
                         "folder" to folder.name
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading $folder message result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -143,40 +121,25 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
+    @SuppressLint("DefaultLocale")
     fun onSearchQueryTextChange(query: String) {
-        launch {
-            searchChannel.send(query)
-        }
-    }
+        lastSearchQuery = 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()
-                }
+        val lowerCaseQuery = query.toLowerCase()
+        val filteredList = mutableListOf<Message>()
+        messages.forEach {
+            if (lowerCaseQuery in it.subject.toLowerCase() ||
+                lowerCaseQuery in it.sender.toLowerCase() ||
+                lowerCaseQuery in it.recipient.toLowerCase() ||
+                lowerCaseQuery in it.date.toFormattedString()
+            ) {
+                filteredList.add(it)
+            }
         }
-    }
 
-    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 }
-        }
+        Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${filteredList.size}")
+
+        updateData(filteredList)
     }
 
     private fun updateData(data: List<Message>) {
@@ -185,44 +148,7 @@ class MessageTabPresenter @Inject constructor(
             showContent(data.isNotEmpty())
             showErrorView(false)
             updateData(data)
+            resetListPosition()
         }
     }
-
-    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 fe9b60077..f521191cf 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
@@ -13,6 +13,8 @@ interface MessageTabView : BaseView {
 
     fun updateData(data: List<Message>)
 
+    fun updateItem(item: Message, position: Int)
+
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
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 f8e367c57..6a3e5a441 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
@@ -7,7 +7,6 @@ import android.view.View.VISIBLE
 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
@@ -16,10 +15,8 @@ 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 io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MobileDeviceFragment :
     BaseFragment<FragmentMobileDeviceBinding>(R.layout.fragment_mobile_device), MobileDeviceView,
     MainView.TitledView {
@@ -57,9 +54,7 @@ class MobileDeviceFragment :
         }
 
         with(binding) {
-            mobileDevicesSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            mobileDevicesSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            mobileDevicesSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
             mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
             mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
@@ -103,8 +98,8 @@ class MobileDeviceFragment :
         }
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.mobileDevicesSwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.mobileDevicesSwipe.isRefreshing = false
     }
 
     override fun showProgress(show: Boolean) {
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 9591867df..459ca17e8 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,28 +1,24 @@
 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.MobileDeviceRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-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 io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper
-) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -52,50 +48,38 @@ class MobileDevicePresenter @Inject constructor(
 
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading mobile devices data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            mobileDeviceRepository.getDevices(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateData(it.data)
-                        }
-                    }
-                }
-                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
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading mobile devices result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getDevices(student, semester, forceRefresh)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                }
+            }.subscribe({
+                Timber.i("Loading mobile devices result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                }
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "devices",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading mobile devices result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -129,25 +113,33 @@ class MobileDevicePresenter @Inject constructor(
     }
 
     fun onUnregisterConfirmed(device: MobileDevice) {
-        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!!)
+        Timber.i("Unregister device started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.unregisterDevice(student, semester, device)
+                        .flatMap { mobileDeviceRepository.getDevices(student, semester, it) }
                 }
             }
-        }.launchIn(this)
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    showProgress(false)
+                    enableSwipe(true)
+                }
+            }
+            .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)
+            }
+        )
     }
 }
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 b94646a7b..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
@@ -17,7 +17,7 @@ interface MobileDeviceView : BaseView {
 
     fun showUndo(device: MobileDevice, position: Int)
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun showProgress(show: Boolean)
 
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 6357c495a..9ac6049e9 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,23 +12,19 @@ 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 javax.inject.Inject
 
-@AndroidEntryPoint
-class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
-    MobileDeviceTokenVIew {
+class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(), MobileDeviceTokenVIew {
 
     @Inject
     lateinit var presenter: MobileDeviceTokenPresenter
 
     companion object {
-
-        fun newInstance() = MobileDeviceTokenDialog()
+        fun newInstance(): MobileDeviceTokenDialog = MobileDeviceTokenDialog()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -36,14 +32,12 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
         setStyle(STYLE_NO_TITLE, 0)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogMobileDeviceBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogMobileDeviceBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
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 5e7110ee5..6a2a6b98b 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,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.mobiledevice.token
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.MobileDeviceRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper
-) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MobileDeviceTokenVIew) {
         super.onAttachView(view)
@@ -29,29 +27,28 @@ class MobileDeviceTokenPresenter @Inject constructor(
     }
 
     private fun loadData() {
-        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!!)
+        Timber.i("Mobile device registration data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    mobileDeviceRepository.getToken(student, semester)
                 }
             }
-        }.afterLoading {
-            view?.hideLoading()
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally { view?.hideLoading() }
+            .subscribe({
+                Timber.i("Mobile device registration result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent()
+                }
+                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)
+            }
+        )
     }
 }
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 c4a14a521..a79087de2 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
@@ -4,12 +4,10 @@ import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.View
 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.conference.ConferenceFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
 import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -22,7 +20,6 @@ import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.utils.getCompatDrawable
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more), MoreView,
     MainView.TitledView, MainView.MainChildView {
 
@@ -54,15 +51,15 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     override val mobileDevicesRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.mobile_devices_title) to getCompatDrawable(R.drawable.ic_more_mobile_devices) }
 
-    override val conferencesRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.conferences_title) to getCompatDrawable(R.drawable.ic_more_conferences) }
-
     override val schoolAndTeachersRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.schoolandteachers_title) to getCompatDrawable((R.drawable.ic_more_schoolandteachers)) }
 
     override val settingsRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) }
 
+    override val aboutRes: Pair<String, Drawable?>?
+        get() = context?.run { getString(R.string.about_title) to getCompatDrawable(R.drawable.ic_all_about) }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMoreBinding.bind(view)
@@ -109,10 +106,6 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         (activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
     }
 
-    override fun openConferencesView() {
-        (activity as? MainActivity)?.pushView(ConferenceFragment.newInstance())
-    }
-
     override fun openSchoolAndTeachersView() {
         (activity as? MainActivity)?.pushView(SchoolAndTeachersFragment.newInstance())
     }
@@ -121,6 +114,10 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         (activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
     }
 
+    override fun openAboutView() {
+        (activity as? MainActivity)?.pushView(AboutFragment.newInstance())
+    }
+
     override fun popView(depth: Int) {
         (activity as? MainActivity)?.popView(depth)
     }
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 6079141f4..593645c19 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,15 +1,17 @@
 package io.github.wulkanowy.ui.modules.more
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+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) {
+) : BasePresenter<MoreView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: MoreView) {
         super.onAttachView(view)
@@ -27,9 +29,9 @@ class MorePresenter @Inject constructor(
                 noteRes?.first -> openNoteView()
                 luckyNumberRes?.first -> openLuckyNumberView()
                 mobileDevicesRes?.first -> openMobileDevicesView()
-                conferencesRes?.first -> openConferencesView()
                 schoolAndTeachersRes?.first -> openSchoolAndTeachersView()
                 settingsRes?.first -> openSettingsView()
+                aboutRes?.first -> openAboutView()
             }
         }
     }
@@ -48,9 +50,9 @@ class MorePresenter @Inject constructor(
                 noteRes,
                 luckyNumberRes,
                 mobileDevicesRes,
-                conferencesRes,
                 schoolAndTeachersRes,
-                settingsRes
+                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 0543742e4..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
@@ -15,18 +15,20 @@ interface MoreView : BaseView {
 
     val mobileDevicesRes: Pair<String, Drawable?>?
 
-    val conferencesRes: Pair<String, Drawable?>?
-
     val schoolAndTeachersRes: Pair<String, Drawable?>?
 
     val settingsRes: Pair<String, Drawable?>?
 
+    val aboutRes: Pair<String, Drawable?>?
+
     fun initView()
 
     fun updateData(data: List<Pair<String, Drawable?>>)
 
     fun openSettingsView()
 
+    fun openAboutView()
+
     fun popView(depth: Int)
 
     fun openMessagesView()
@@ -39,7 +41,5 @@ interface MoreView : BaseView {
 
     fun openMobileDevicesView()
 
-    fun openConferencesView()
-
     fun openSchoolAndTeachersView()
 }
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
index 48482cb75..2ffcad949 100644
--- 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
@@ -6,11 +6,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
 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
@@ -43,9 +43,9 @@ class NoteAdapter @Inject constructor() : RecyclerView.Adapter<NoteAdapter.ItemV
             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)
+                setTextColor(when (CategoryType.getByValue(item.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
                     else -> context.getThemeAttrColor(android.R.attr.textColorPrimary)
                 })
             }
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 4cb1cda02..6d1b181ac 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
@@ -10,10 +10,10 @@ 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 io.github.wulkanowy.sdk.scrapper.notes.Note.CategoryType
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
 class NoteDialog : DialogFragment() {
 
@@ -22,11 +22,12 @@ class NoteDialog : DialogFragment() {
     private lateinit var note: Note
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Note) = NoteDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(exam: Note): NoteDialog {
+            return NoteDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
         }
     }
 
@@ -38,15 +39,13 @@ class NoteDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogNoteBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogNoteBinding.inflate(inflater).apply { binding = this }.root
+    }
 
     @SuppressLint("SetTextI18n")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             noteDialogDate.text = note.date.toFormattedString()
@@ -58,19 +57,11 @@ class NoteDialog : DialogFragment() {
         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)
-                    }
-                )
+                setTextColor(when (CategoryType.getByValue(note.categoryType)) {
+                    CategoryType.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
+                    CategoryType.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
+                    else -> requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
+                })
             }
         }
 
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 dd6223448..473381659 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
@@ -5,7 +5,6 @@ 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.db.entities.Note
 import io.github.wulkanowy.databinding.FragmentNoteBinding
@@ -13,10 +12,8 @@ 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.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note), NoteView,
     MainView.TitledView {
 
@@ -51,9 +48,7 @@ class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note),
             addItemDecoration(DividerItemDecoration(context))
         }
         with(binding) {
-            noteSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            noteSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            noteSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             noteErrorRetry.setOnClickListener { presenter.onRetry() }
             noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -108,8 +103,8 @@ class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note),
         binding.noteRecycler.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.noteSwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.noteSwipe.isRefreshing = false
     }
 
     override fun onDestroyView() {
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 e80f54946..7d301c66b 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,28 +1,24 @@
 package io.github.wulkanowy.ui.modules.note
 
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.data.repositories.NoteRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.note.NoteRepository
+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.AnalyticsHelper
-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 io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper
-) : BasePresenter<NoteView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<NoteView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -53,50 +49,37 @@ class NotePresenter @Inject constructor(
 
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading note data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            noteRepository.getNotes(student, semester, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateData(it.data)
-                        }
-                    }
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
+            .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
+            .map { items -> items.sortedByDescending { it.date } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
                 }
-                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!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "note",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }, {
+                Timber.i("Loading note result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
+        )
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -123,15 +106,14 @@ class NotePresenter @Inject constructor(
     }
 
     private fun updateNote(note: Note) {
-        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)
+        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)
+            })
     }
 }
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 9fc0be94c..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
@@ -27,7 +27,7 @@ interface NoteView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun showNoteDialog(note: Note)
 }
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 c1c569611..0245aa076 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
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentSchoolandteachersBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -16,7 +15,6 @@ import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SchoolAndTeachersFragment :
     BaseFragment<FragmentSchoolandteachersBinding>(R.layout.fragment_schoolandteachers),
     SchoolAndTeachersView, MainView.TitledView {
@@ -24,7 +22,8 @@ class SchoolAndTeachersFragment :
     @Inject
     lateinit var presenter: SchoolAndTeachersPresenter
 
-    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
+    @Inject
+    lateinit var pagerAdapter: BaseFragmentPagerAdapter
 
     companion object {
         fun newInstance() = SchoolAndTeachersFragment()
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
new file mode 100644
index 000000000..2087b0b42
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
@@ -0,0 +1,30 @@
+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
+abstract class SchoolAndTeachersModule {
+
+    companion object {
+
+        @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 915cc4213..1856803c6 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
@@ -1,26 +1,28 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers
 
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.reactivex.Completable
 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) {
+) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository, schedulers) {
 
     override fun onAttachView(view: SchoolAndTeachersView) {
         super.onAttachView(view)
-        launch {
-            delay(150)
-            view.initView()
-            Timber.i("Message view was initialized")
-            loadData()
-        }
+        disposable.add(Completable.timer(150, TimeUnit.MILLISECONDS, schedulers.mainThread)
+            .subscribe {
+                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 fba2f0407..722999f86 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
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.databinding.FragmentSchoolBinding
@@ -12,12 +11,10 @@ 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.getThemeAttrColor
 import io.github.wulkanowy.utils.openDialer
 import io.github.wulkanowy.utils.openNavigation
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_school), SchoolView,
     MainView.TitledView, SchoolAndTeachersChildView {
 
@@ -40,9 +37,7 @@ class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_sch
 
     override fun initView() {
         with(binding) {
-            schoolSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            schoolSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            schoolSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             schoolErrorRetry.setOnClickListener { presenter.onRetry() }
             schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -53,14 +48,13 @@ class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_sch
 
     override fun updateData(data: School) {
         with(binding) {
-            val noDataString = getString(R.string.all_no_data)
-            schoolName.text = data.name.ifBlank { noDataString }
-            schoolAddress.text = data.address.ifBlank { noDataString }
+            schoolName.text = data.name
+            schoolAddress.text = data.address.ifBlank { "-" }
             schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
-            schoolTelephone.text = data.contact.ifBlank { noDataString }
+            schoolTelephone.text = data.contact.ifBlank { "-" }
             schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
-            schoolHeadmaster.text = data.headmaster.ifBlank { noDataString }
-            schoolPedagogue.text = data.pedagogue.ifBlank { noDataString }
+            schoolHeadmaster.text = data.headmaster
+            schoolPedagogue.text = data.pedagogue
         }
     }
 
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 202d4e5d7..7beff922d 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,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.school
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.SchoolRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper
-) : BasePresenter<SchoolView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<SchoolView>(errorHandler, studentRepository, schedulers) {
 
     private var address: String? = null
 
@@ -64,43 +62,48 @@ class SchoolPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        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")
+        Timber.i("Loading school info started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMapMaybe { student ->
+                semesterRepository.getCurrentSemester(student).flatMapMaybe {
+                    schoolRepository.getSchoolInfo(student, 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_item",
+                    "type" to "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 {
                     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/TeacherFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
index b052a3833..aa50339c1 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
@@ -5,7 +5,6 @@ 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.db.entities.Teacher
 import io.github.wulkanowy.databinding.FragmentTeacherBinding
@@ -14,10 +13,8 @@ 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.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_teacher),
     TeacherView, MainView.TitledView, SchoolAndTeachersChildView {
 
@@ -52,9 +49,7 @@ class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_t
             addItemDecoration(DividerItemDecoration(context))
         }
         with(binding) {
-            teacherSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            teacherSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            teacherSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
             teacherErrorRetry.setOnClickListener { presenter.onRetry() }
             teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
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 c83cfe766..0d8eec6d4 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,25 +1,23 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TeacherRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import kotlinx.coroutines.flow.onEach
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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: AnalyticsHelper
-) : BasePresenter<TeacherView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<TeacherView>(errorHandler, studentRepository, schedulers) {
 
     private lateinit var lastError: Throwable
 
@@ -40,7 +38,7 @@ class TeacherPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData()
+        loadData(true)
     }
 
     fun onDetailsClick() {
@@ -52,40 +50,41 @@ class TeacherPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        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
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading teachers result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
+        Timber.i("Loading teachers data started")
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { student ->
+                semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                    teacherRepository.getTeachers(student, semester, forceRefresh)
                 }
             }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-                notifyParentDataLoaded()
-            }
-        }.launch()
+            .map { it.filter { teacher -> teacher.name.isNotBlank() } }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .doFinally {
+                view?.run {
+                    hideRefresh()
+                    showProgress(false)
+                    enableSwipe(true)
+                    notifyParentDataLoaded()
+                }
+            }.subscribe({
+                Timber.i("Loading teachers result: Success")
+                view?.run {
+                    updateData(it)
+                    showContent(it.isNotEmpty())
+                    showEmpty(it.isEmpty())
+                    showErrorView(false)
+                }
+                analytics.logEvent(
+                    "load_data",
+                    "type" to "teachers",
+                    "items" to it.size,
+                    "force_refresh" to forceRefresh
+                )
+            }) {
+                Timber.i("Loading teachers result: An exception occurred")
+                errorHandler.dispatch(it)
+            })
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
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 2612fab3a..248417fd1 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
@@ -1,22 +1,158 @@
 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 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 timber.log.Timber
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.openInternetBrowser
+import javax.inject.Inject
 
-class SettingsFragment : PreferenceFragmentCompat(), MainView.TitledView {
+class SettingsFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener,
+    MainView.TitledView, SettingsView {
+
+    @Inject
+    lateinit var presenter: SettingsPresenter
+
+    @Inject
+    lateinit var appInfo: AppInfo
+
+    @Inject
+    lateinit var lingver: Lingver
 
     companion object {
-
         fun newInstance() = SettingsFragment()
     }
 
     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)
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.scheme_preferences, rootKey)
-        Timber.i("Settings view was initialized")
+        findPreference<Preference>(getString(R.string.pref_key_notification_debug))?.isVisible = appInfo.isDebug
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        presenter.onSharedPreferenceChanged(key)
+    }
+
+    override fun recreateView() {
+        activity?.recreate()
+    }
+
+    override fun updateLanguage(langCode: String) {
+        lingver.setLocale(requireContext(), langCode)
+    }
+
+    override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
+        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)
+    }
+
+    override fun showMessage(text: String) {
+        (activity as? BaseActivity<*, *>)?.showMessage(text)
+    }
+
+    override fun showExpiredDialog() {
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
+    }
+
+    override fun openClearLoginView() {
+        (activity as? BaseActivity<*, *>)?.openClearLoginView()
+    }
+
+    override fun showErrorDetailsDialog(error: Throwable) {
+        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
+    }
+
+    override fun showForceSyncDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.pref_services_dialog_force_sync_title)
+            .setMessage(R.string.pref_services_dialog_force_sync_summary)
+            .setPositiveButton(android.R.string.ok) { _, _ -> presenter.onForceSyncDialogSubmit() }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
+    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)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(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
new file mode 100644
index 000000000..bccb6f0bb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -0,0 +1,94 @@
+package io.github.wulkanowy.ui.modules.settings
+
+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 timber.log.Timber
+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 chuckerCollector: ChuckerCollector,
+    private val appInfo: AppInfo
+) : BasePresenter<SettingsView>(errorHandler, studentRepository, schedulers) {
+
+    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")
+
+        preferencesRepository.apply {
+            when (key) {
+                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()
+                }
+            }
+        }
+        analytics.logEvent("setting_changed", "name" to key)
+    }
+
+    fun onSyncNowClicked() {
+        view?.showForceSyncDialog()
+    }
+
+    fun onFixSyncIssuesClicked() {
+        view?.showFixSyncDialog()
+    }
+
+    fun onForceSyncDialogSubmit() {
+        view?.run {
+            val successString = syncSuccessString
+            val failedString = syncFailedString
+            disposable.add(syncManager.startOneTimeSyncWorker()
+                .doOnSubscribe {
+                    setSyncInProgress(true)
+                    Timber.i("Setting sync now started")
+                    analytics.logEvent("sync_now", "status" to "started")
+                }
+                .doFinally { setSyncInProgress(false) }
+                .subscribe({ workInfo ->
+                    when (workInfo.state) {
+                        WorkInfo.State.SUCCEEDED -> {
+                            showMessage(successString)
+                            analytics.logEvent("sync_now", "status" to "success")
+                        }
+                        WorkInfo.State.FAILED -> {
+                            showError(failedString, Throwable(workInfo.outputData.getString("error")))
+                            analytics.logEvent("sync_now", "status" to "failed")
+                        }
+                        else -> Timber.d("Sync now state: ${workInfo.state}")
+                    }
+                }, {
+                    Timber.e(it, "Sync now failed")
+                })
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
similarity index 55%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
index 9da473ba7..3786ba4b2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
@@ -1,8 +1,8 @@
-package io.github.wulkanowy.ui.modules.settings.sync
+package io.github.wulkanowy.ui.modules.settings
 
 import io.github.wulkanowy.ui.base.BaseView
 
-interface SyncView : BaseView {
+interface SettingsView : BaseView {
 
     val syncSuccessString: String
 
@@ -10,7 +10,14 @@ interface SyncView : BaseView {
 
     fun initView()
 
+    fun recreateView()
+
+    fun updateLanguage(langCode: String)
+
     fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
 
     fun setSyncInProgress(inProgress: Boolean)
+
+    fun showForceSyncDialog()
+    fun showFixSyncDialog()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
deleted file mode 100644
index 524d7ba6d..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.advanced
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import androidx.preference.PreferenceFragmentCompat
-import com.yariksoffice.lingver.Lingver
-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 javax.inject.Inject
-
-@AndroidEntryPoint
-class AdvancedFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener,
-    MainView.TitledView, AdvancedView {
-
-    @Inject
-    lateinit var presenter: AdvancedPresenter
-
-    @Inject
-    lateinit var appInfo: AppInfo
-
-    @Inject
-    lateinit var lingver: Lingver
-
-    companion object {
-        fun newInstance() = AdvancedFragment()
-    }
-
-    override val titleStringId get() = R.string.pref_settings_advanced_title
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.scheme_preferences_advanced, rootKey)
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
-        presenter.onSharedPreferenceChanged(key)
-    }
-
-    override fun showError(text: String, error: Throwable) {
-        (activity as? BaseActivity<*, *>)?.showError(text, error)
-    }
-
-    override fun showMessage(text: String) {
-        (activity as? BaseActivity<*, *>)?.showMessage(text)
-    }
-
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
-    }
-
-    override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
-    }
-
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-
-    override fun onResume() {
-        super.onResume()
-        preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt
deleted file mode 100644
index d38f841fe..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.advanced
-
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import timber.log.Timber
-import javax.inject.Inject
-
-class AdvancedPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val analytics: AnalyticsHelper,
-) : BasePresenter<AdvancedView>(errorHandler, studentRepository) {
-
-    override fun onAttachView(view: AdvancedView) {
-        super.onAttachView(view)
-        Timber.i("Settings advanced view was initialized")
-    }
-
-    fun onSharedPreferenceChanged(key: String) {
-        Timber.i("Change settings $key")
-        analytics.logEvent("setting_changed", "name" to key)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedView.kt
deleted file mode 100644
index c2e8e52dc..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedView.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.advanced
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface AdvancedView : BaseView {}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
deleted file mode 100644
index 5ac801dc6..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.appearance
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import androidx.preference.PreferenceFragmentCompat
-import com.yariksoffice.lingver.Lingver
-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 javax.inject.Inject
-
-@AndroidEntryPoint
-class AppearanceFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener,
-    MainView.TitledView, AppearanceView {
-
-    @Inject
-    lateinit var presenter: AppearancePresenter
-
-    @Inject
-    lateinit var appInfo: AppInfo
-
-    @Inject
-    lateinit var lingver: Lingver
-
-    companion object {
-        fun newInstance() = AppearanceFragment()
-    }
-
-    override val titleStringId get() = R.string.pref_settings_appearance_title
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.scheme_preferences_appearance, rootKey)
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
-        presenter.onSharedPreferenceChanged(key)
-    }
-
-    override fun recreateView() {
-        activity?.recreate()
-    }
-
-    override fun updateLanguage(langCode: String) {
-        lingver.setLocale(requireContext(), langCode)
-    }
-
-    override fun updateLanguageToFollowSystem() {
-        lingver.setFollowSystemLocale(requireContext())
-    }
-
-    override fun showError(text: String, error: Throwable) {
-        (activity as? BaseActivity<*, *>)?.showError(text, error)
-    }
-
-    override fun showMessage(text: String) {
-        (activity as? BaseActivity<*, *>)?.showMessage(text)
-    }
-
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
-    }
-
-    override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
-    }
-
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-
-    override fun onResume() {
-        super.onResume()
-        preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt
deleted file mode 100644
index 14592a6cc..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.appearance
-
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.AppInfo
-import timber.log.Timber
-import javax.inject.Inject
-
-class AppearancePresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val preferencesRepository: PreferencesRepository,
-    private val analytics: AnalyticsHelper,
-    private val appInfo: AppInfo
-) : BasePresenter<AppearanceView>(errorHandler, studentRepository) {
-
-    override fun onAttachView(view: AppearanceView) {
-        super.onAttachView(view)
-        Timber.i("Settings appearance view was initialized")
-    }
-
-    fun onSharedPreferenceChanged(key: String) {
-        Timber.i("Change settings $key")
-
-        preferencesRepository.apply {
-            when (key) {
-                appThemeKey -> view?.recreateView()
-                appLanguageKey -> view?.run {
-                    if (appLanguage == "system") {
-                        updateLanguageToFollowSystem()
-                        analytics.logEvent("language", "setting_changed" to appInfo.systemLanguage)
-                    } else {
-                        updateLanguage(appLanguage)
-                        analytics.logEvent("language", "setting_changed" to appLanguage)
-                    }
-                    recreateView()
-                }
-            }
-        }
-        analytics.logEvent("setting_changed", "name" to key)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceView.kt
deleted file mode 100644
index ecee4f423..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceView.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.appearance
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface AppearanceView : BaseView {
-
-    fun recreateView()
-
-    fun updateLanguage(langCode: String)
-
-    fun updateLanguageToFollowSystem()
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
deleted file mode 100644
index a9641d887..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
+++ /dev/null
@@ -1,130 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.notifications
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.thelittlefireman.appkillermanager.AppKillerManager
-import com.thelittlefireman.appkillermanager.exceptions.NoActionFoundException
-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.openInternetBrowser
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class NotificationsFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener,
-    MainView.TitledView, NotificationsView {
-
-    @Inject
-    lateinit var presenter: NotificationsPresenter
-
-    companion object {
-        fun newInstance() = NotificationsFragment()
-    }
-
-    override val titleStringId get() = R.string.pref_settings_notifications_title
-
-    override fun initView(showDebugNotificationSwitch: Boolean) {
-        findPreference<Preference>(getString(R.string.pref_key_notification_debug))?.isVisible =
-            showDebugNotificationSwitch
-
-        findPreference<Preference>(getString(R.string.pref_key_notifications_fix_issues))?.run {
-            isVisible = AppKillerManager.isDeviceSupported()
-                && AppKillerManager.isAnyActionAvailable(requireContext())
-
-            setOnPreferenceClickListener {
-                presenter.onFixSyncIssuesClicked()
-                true
-            }
-        }
-    }
-
-    override fun onCreateRecyclerView(
-        inflater: LayoutInflater?,
-        parent: ViewGroup?,
-        state: Bundle?
-    ): RecyclerView? = super.onCreateRecyclerView(inflater, parent, state)
-        .also {
-            it.itemAnimator = null
-            it.layoutAnimation = null
-        }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.scheme_preferences_notifications, rootKey)
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
-        presenter.onSharedPreferenceChanged(key)
-    }
-
-    override fun enableNotification(notificationKey: String, enable: Boolean) {
-        findPreference<Preference>(notificationKey)?.run {
-            isEnabled = enable
-            summary = if (enable) null else getString(R.string.pref_notify_disabled_summary)
-        }
-    }
-
-    override fun showError(text: String, error: Throwable) {
-        (activity as? BaseActivity<*, *>)?.showError(text, error)
-    }
-
-    override fun showMessage(text: String) {
-        (activity as? BaseActivity<*, *>)?.showMessage(text)
-    }
-
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
-    }
-
-    override fun 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)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
deleted file mode 100644
index 981af17de..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.notifications
-
-import com.chuckerteam.chucker.api.ChuckerCollector
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.AppInfo
-import timber.log.Timber
-import javax.inject.Inject
-
-class NotificationsPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val preferencesRepository: PreferencesRepository,
-    private val timetableNotificationHelper: TimetableNotificationSchedulerHelper,
-    private val appInfo: AppInfo,
-    private val analytics: AnalyticsHelper,
-    private val chuckerCollector: ChuckerCollector
-) : BasePresenter<NotificationsView>(errorHandler, studentRepository) {
-
-    override fun onAttachView(view: NotificationsView) {
-        super.onAttachView(view)
-
-        with(view) {
-            enableNotification(
-                preferencesRepository.notificationsEnableKey,
-                preferencesRepository.isServiceEnabled
-            )
-            initView(appInfo.isDebug)
-        }
-        Timber.i("Settings notifications view was initialized")
-    }
-
-    fun onSharedPreferenceChanged(key: String) {
-        Timber.i("Change settings $key")
-
-        preferencesRepository.apply {
-            when (key) {
-                isUpcomingLessonsNotificationsEnableKey -> {
-                    if (!isUpcomingLessonsNotificationsEnable) {
-                        timetableNotificationHelper.cancelNotification()
-                    }
-                }
-                isDebugNotificationEnableKey -> {
-                    chuckerCollector.showNotification = isDebugNotificationEnable
-                }
-            }
-        }
-        analytics.logEvent("setting_changed", "name" to key)
-    }
-
-    fun onFixSyncIssuesClicked() {
-        view?.showFixSyncDialog()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsView.kt
deleted file mode 100644
index 2618cde1e..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsView.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.notifications
-
-import io.github.wulkanowy.ui.base.BaseView
-
-interface NotificationsView : BaseView {
-
-    fun initView(showDebugNotificationSwitch: Boolean)
-
-    fun showFixSyncDialog()
-
-    fun enableNotification(notificationKey: String, enable: Boolean)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
deleted file mode 100644
index 207fe2ff6..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.sync
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-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 javax.inject.Inject
-
-@AndroidEntryPoint
-class SyncFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener,
-    MainView.TitledView, SyncView {
-
-    @Inject
-    lateinit var presenter: SyncPresenter
-
-    companion object {
-        fun newInstance() = SyncFragment()
-    }
-
-    override val titleStringId get() = R.string.pref_settings_sync_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 initView() {
-        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
-            onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                presenter.onSyncNowClicked()
-                true
-            }
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        presenter.onAttachView(this)
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.scheme_preferences_sync, rootKey)
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
-        presenter.onSharedPreferenceChanged(key)
-    }
-
-    override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
-        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)
-    }
-
-    override fun showMessage(text: String) {
-        (activity as? BaseActivity<*, *>)?.showMessage(text)
-    }
-
-    override fun showExpiredDialog() {
-        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
-    }
-
-    override fun openClearLoginView() {
-        (activity as? BaseActivity<*, *>)?.openClearLoginView()
-    }
-
-    override fun showErrorDetailsDialog(error: Throwable) {
-        ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
-    }
-
-    override fun onResume() {
-        super.onResume()
-        preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
deleted file mode 100644
index 36b8d792c..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package io.github.wulkanowy.ui.modules.settings.sync
-
-import androidx.work.WorkInfo
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.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.AnalyticsHelper
-import io.github.wulkanowy.utils.isHolidays
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import java.time.LocalDate.now
-import javax.inject.Inject
-
-class SyncPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val preferencesRepository: PreferencesRepository,
-    private val analytics: AnalyticsHelper,
-    private val syncManager: SyncManager,
-) : BasePresenter<SyncView>(errorHandler, studentRepository) {
-
-    override fun onAttachView(view: SyncView) {
-        super.onAttachView(view)
-        Timber.i("Settings sync view was initialized")
-        view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
-        view.initView()
-    }
-
-    fun onSharedPreferenceChanged(key: String) {
-        Timber.i("Change settings $key")
-
-        preferencesRepository.apply {
-            when (key) {
-                serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startPeriodicSyncWorker() else stopSyncWorker() }
-                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startPeriodicSyncWorker(true)
-            }
-        }
-        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")
-        }
-    }
-}
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 2b96a9a0c..23a437506 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,29 +3,20 @@ package io.github.wulkanowy.ui.modules.splash
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.appcompat.app.AlertDialog
 import androidx.viewbinding.ViewBinding
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView {
 
-    @Inject
-    lateinit var appInfo: AppInfo
-
     @Inject
     override lateinit var presenter: SplashPresenter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        presenter.onAttachView(this, intent?.getStringExtra("external_url"))
+        presenter.onAttachView(this)
     }
 
     override fun openLoginView() {
@@ -38,22 +29,7 @@ class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView
         finish()
     }
 
-    override fun openExternalUrlAndFinish(url: String) {
-        openInternetBrowser(url, ::showMessage)
-        finish()
-    }
-
     override fun showError(text: String, error: Throwable) {
         Toast.makeText(this, text, LENGTH_LONG).show()
     }
-
-    override fun showKitkatView() {
-        AlertDialog.Builder(this)
-            .setTitle(R.string.drop_kitkat_title)
-            .setMessage(R.string.drop_kitkat_content)
-            .setPositiveButton(android.R.string.ok, null)
-            .setNeutralButton(R.string.drop_kitkat_again) { _, _ -> presenter.onNeutralButtonSelected() }
-            .setOnDismissListener { presenter.onKitkatViewDismissed() }
-            .show()
-    }
 }
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 4590d91a5..44b53c5f9 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,60 +1,27 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import android.os.Build
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val preferencesRepository: PreferencesRepository,
-    private val appInfo: AppInfo
-) : BasePresenter<SplashView>(errorHandler, studentRepository) {
+    studentRepository: StudentRepository
+) : BasePresenter<SplashView>(errorHandler, studentRepository, schedulers) {
 
-    private var externalUrl: String? = null
-
-    fun onAttachView(view: SplashView, externalUrl: String?) {
+    override fun onAttachView(view: SplashView) {
         super.onAttachView(view)
-        this.externalUrl = externalUrl
-
-        if (appInfo.systemVersion < Build.VERSION_CODES.LOLLIPOP && !preferencesRepository.isKitkatDialogDisabled) {
-            view.showKitkatView()
-        } else {
-            loadCorrectDataOrUser()
-        }
-    }
-
-    private fun loadCorrectDataOrUser() {
-        if (!externalUrl.isNullOrBlank()) {
-            view?.openExternalUrlAndFinish(externalUrl!!)
-            return
-        }
-
-        flowWithResource { studentRepository.isCurrentStudentSet() }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Is current user set check started")
-                Status.SUCCESS -> {
-                    if (it.data!!) view?.openMainView()
-                    else view?.openLoginView()
+        disposable.add(studentRepository.isCurrentStudentSet()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                view.apply {
+                    if (it) openMainView()
+                    else openLoginView()
                 }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
-            }
-        }.launch()
-    }
-
-    fun onKitkatViewDismissed() {
-        loadCorrectDataOrUser()
-    }
-
-    fun onNeutralButtonSelected() {
-        preferencesRepository.isKitkatDialogDisabled = true
+            }, { errorHandler.dispatch(it) }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
index c9c5fe9a4..9efd8123b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
@@ -7,8 +7,4 @@ interface SplashView : BaseView {
     fun openLoginView()
 
     fun openMainView()
-
-    fun openExternalUrlAndFinish(url: String)
-
-    fun showKitkatView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoAdapter.kt
deleted file mode 100644
index 602ec07ad..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoAdapter.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.github.wulkanowy.ui.modules.studentinfo
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.databinding.ItemStudentInfoBinding
-import javax.inject.Inject
-
-class StudentInfoAdapter @Inject constructor() :
-    RecyclerView.Adapter<StudentInfoAdapter.ViewHolder>() {
-
-    var items = listOf<Pair<String, String>>()
-
-    var onItemClickListener: (position: Int) -> Unit = {}
-
-    var onItemLongClickListener: (text: String) -> Unit = {}
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
-        ItemStudentInfoBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            studentInfoItemTitle.text = item.first
-            studentInfoItemSubtitle.text = item.second
-
-            with(root) {
-                setOnClickListener { onItemClickListener(position) }
-                setOnLongClickListener {
-                    onItemLongClickListener(studentInfoItemSubtitle.text.toString())
-                    true
-                }
-            }
-        }
-    }
-
-    class ViewHolder(val binding: ItemStudentInfoBinding) : RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
deleted file mode 100644
index 6a80b2b95..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
+++ /dev/null
@@ -1,240 +0,0 @@
-package io.github.wulkanowy.ui.modules.studentinfo
-
-import android.annotation.SuppressLint
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.View
-import android.widget.Toast
-import androidx.core.content.getSystemService
-import androidx.core.view.get
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentGuardian
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.enums.Gender
-import io.github.wulkanowy.databinding.FragmentStudentInfoBinding
-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.getThemeAttrColor
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class StudentInfoFragment :
-    BaseFragment<FragmentStudentInfoBinding>(R.layout.fragment_student_info), StudentInfoView,
-    MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: StudentInfoPresenter
-
-    @Inject
-    lateinit var studentInfoAdapter: StudentInfoAdapter
-
-    override val titleStringId: Int
-        get() = R.string.student_info_title
-
-    override val isViewEmpty get() = studentInfoAdapter.items.isEmpty()
-
-    companion object {
-
-        private const val INFO_TYPE_ARGUMENT_KEY = "info_type"
-
-        private const val STUDENT_ARGUMENT_KEY = "student_with_semesters"
-
-        fun newInstance(type: StudentInfoView.Type, studentWithSemesters: StudentWithSemesters) =
-            StudentInfoFragment().apply {
-                arguments = Bundle().apply {
-                    putSerializable(INFO_TYPE_ARGUMENT_KEY, type)
-                    putSerializable(STUDENT_ARGUMENT_KEY, studentWithSemesters)
-                }
-            }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentStudentInfoBinding.bind(view)
-        presenter.onAttachView(
-            this,
-            requireArguments().getSerializable(INFO_TYPE_ARGUMENT_KEY) as StudentInfoView.Type,
-            requireArguments().getSerializable(STUDENT_ARGUMENT_KEY) as StudentWithSemesters
-        )
-    }
-
-    override fun initView() {
-        with(binding) {
-            studentInfoSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            studentInfoSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            studentInfoSwipe.setProgressBackgroundColorSchemeColor(
-                requireContext().getThemeAttrColor(
-                    R.attr.colorSwipeRefresh
-                )
-            )
-            studentInfoErrorRetry.setOnClickListener { presenter.onRetry() }
-            studentInfoErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
-
-        with(studentInfoAdapter) {
-            onItemClickListener = presenter::onItemSelected
-            onItemLongClickListener = presenter::onItemLongClick
-        }
-
-        with(binding.studentInfoRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            addItemDecoration(DividerItemDecoration(context, RecyclerView.VERTICAL))
-            setHasFixedSize(true)
-            adapter = studentInfoAdapter
-        }
-    }
-
-    override fun updateData(data: List<Pair<String, String>>) {
-        with(studentInfoAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        menu[0].isVisible = false
-    }
-
-    override fun showPersonalTypeData(studentInfo: StudentInfo) {
-        updateData(
-            listOf(
-                getString(R.string.student_info_first_name) to studentInfo.firstName,
-                getString(R.string.student_info_second_name) to studentInfo.secondName,
-                getString(R.string.student_info_last_name) to studentInfo.surname,
-                getString(R.string.student_info_gender) to getString(if (studentInfo.gender == Gender.MALE) R.string.student_info_male else R.string.student_info_female),
-                getString(R.string.student_info_polish_citizenship) to getString(if (studentInfo.hasPolishCitizenship) R.string.all_yes else R.string.all_no),
-                getString(R.string.student_info_family_name) to studentInfo.familyName,
-                getString(R.string.student_info_parents_name) to studentInfo.parentsNames
-            ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
-            }
-        )
-    }
-
-    override fun showContactTypeData(studentInfo: StudentInfo) {
-        updateData(
-            listOf(
-                getString(R.string.student_info_phone) to studentInfo.phoneNumber,
-                getString(R.string.student_info_cellphone) to studentInfo.cellPhoneNumber,
-                getString(R.string.student_info_email) to studentInfo.email
-            ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
-            }
-        )
-    }
-
-    @SuppressLint("DefaultLocale")
-    override fun showFamilyTypeData(studentInfo: StudentInfo) {
-        updateData(
-            listOfNotNull(
-                studentInfo.firstGuardian?.let { it.kinship.capitalize() to it.fullName },
-                studentInfo.secondGuardian?.let { it.kinship.capitalize() to it.fullName },
-            ).map { (title, value) ->
-                val updatedValue = value.ifBlank { getString(R.string.all_no_data) }
-                val updatedTitle = title.ifBlank { getString(R.string.all_no_data) }
-
-                updatedTitle to updatedValue
-            }
-        )
-    }
-
-    override fun showAddressTypeData(studentInfo: StudentInfo) {
-        updateData(
-            listOf(
-                getString(R.string.student_info_address) to studentInfo.address,
-                getString(R.string.student_info_registered_address) to studentInfo.registeredAddress,
-                getString(R.string.student_info_correspondence_address) to studentInfo.correspondenceAddress
-            ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
-            }
-        )
-    }
-
-    override fun showFirstGuardianTypeData(studentGuardian: StudentGuardian) {
-        updateData(
-            listOf(
-                getString(R.string.student_info_full_name) to studentGuardian.fullName,
-                getString(R.string.student_info_kinship) to studentGuardian.kinship,
-                getString(R.string.student_info_guardian_address) to studentGuardian.address,
-                getString(R.string.student_info_phones) to studentGuardian.phones,
-                getString(R.string.student_info_email) to studentGuardian.email
-            ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
-            }
-        )
-    }
-
-    override fun showSecondGuardianTypeData(studentGuardian: StudentGuardian) {
-        updateData(
-            listOf(
-                getString(R.string.student_info_full_name) to studentGuardian.fullName,
-                getString(R.string.student_info_kinship) to studentGuardian.kinship,
-                getString(R.string.student_info_guardian_address) to studentGuardian.address,
-                getString(R.string.student_info_phones) to studentGuardian.phones,
-                getString(R.string.student_info_email) to studentGuardian.email
-            ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
-            }
-        )
-    }
-
-    override fun openStudentInfoView(
-        infoType: StudentInfoView.Type,
-        studentWithSemesters: StudentWithSemesters
-    ) {
-        (requireActivity() as MainActivity).pushView(newInstance(infoType, studentWithSemesters))
-    }
-
-    override fun showEmpty(show: Boolean) {
-        binding.studentInfoEmpty.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.studentInfoError.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.studentInfoErrorMessage.text = message
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.studentInfoProgress.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun enableSwipe(enable: Boolean) {
-        binding.studentInfoSwipe.isEnabled = enable
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.studentInfoRecycler.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun hideRefresh() {
-        binding.studentInfoSwipe.isRefreshing = false
-    }
-
-    override fun copyToClipboard(text: String) {
-        val clipData = ClipData.newPlainText("student_info_wulkanowy", text)
-        requireActivity().getSystemService<ClipboardManager>()?.setPrimaryClip(clipData)
-        Toast.makeText(context, R.string.all_copied, Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoPresenter.kt
deleted file mode 100644
index d5f84dc21..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoPresenter.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-package io.github.wulkanowy.ui.modules.studentinfo
-
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.StudentInfoRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
-import io.github.wulkanowy.utils.getCurrentOrLast
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import javax.inject.Inject
-
-class StudentInfoPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val studentInfoRepository: StudentInfoRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<StudentInfoView>(errorHandler, studentRepository) {
-
-    private lateinit var infoType: StudentInfoView.Type
-
-    private lateinit var studentWithSemesters: StudentWithSemesters
-
-    private lateinit var lastError: Throwable
-
-    fun onAttachView(
-        view: StudentInfoView,
-        type: StudentInfoView.Type,
-        studentWithSemesters: StudentWithSemesters
-    ) {
-        super.onAttachView(view)
-        infoType = type
-        this.studentWithSemesters = studentWithSemesters
-        view.initView()
-        Timber.i("Student info $infoType view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    fun onSwipeRefresh() {
-        loadData(true)
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    fun onItemSelected(position: Int) {
-        if (infoType != StudentInfoView.Type.FAMILY) return
-
-        if (position == 0) {
-            view?.openStudentInfoView(StudentInfoView.Type.FIRST_GUARDIAN, studentWithSemesters)
-        } else {
-            view?.openStudentInfoView(StudentInfoView.Type.SECOND_GUARDIAN, studentWithSemesters)
-        }
-    }
-
-    fun onItemLongClick(text: String) {
-        view?.copyToClipboard(text)
-    }
-
-    private fun loadData(forceRefresh: Boolean = false) {
-        flowWithResourceIn {
-            val semester = studentWithSemesters.semesters.getCurrentOrLast()
-            studentInfoRepository.getStudentInfo(
-                studentWithSemesters.student,
-                semester,
-                forceRefresh
-            )
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading student info $infoType started")
-                Status.SUCCESS -> {
-                    if (it.data != null && !(infoType == StudentInfoView.Type.FAMILY && it.data.firstGuardian == null && it.data.secondGuardian == null)) {
-                        Timber.i("Loading student info $infoType result: Success")
-                        showCorrectData(it.data)
-                        view?.run {
-                            showContent(true)
-                            showEmpty(false)
-                            showErrorView(false)
-                        }
-                        analytics.logEvent("load_item", "type" to "student_info")
-                    } else {
-                        Timber.i("Loading student info $infoType result: No student or family info found")
-                        view?.run {
-                            showContent(!isViewEmpty)
-                            showEmpty(isViewEmpty)
-                            showErrorView(false)
-                        }
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading student info $infoType result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
-    }
-
-    private fun showCorrectData(studentInfo: StudentInfo) {
-        when (infoType) {
-            StudentInfoView.Type.PERSONAL -> view?.showPersonalTypeData(studentInfo)
-            StudentInfoView.Type.CONTACT -> view?.showContactTypeData(studentInfo)
-            StudentInfoView.Type.ADDRESS -> view?.showAddressTypeData(studentInfo)
-            StudentInfoView.Type.FAMILY -> view?.showFamilyTypeData(studentInfo)
-            StudentInfoView.Type.SECOND_GUARDIAN -> view?.showSecondGuardianTypeData(studentInfo.secondGuardian!!)
-            StudentInfoView.Type.FIRST_GUARDIAN -> view?.showFirstGuardianTypeData(studentInfo.firstGuardian!!)
-        }
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-                showContent(false)
-                showProgress(false)
-            } else showError(message, error)
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoView.kt
deleted file mode 100644
index 2f0c6753a..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoView.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.github.wulkanowy.ui.modules.studentinfo
-
-import io.github.wulkanowy.data.db.entities.StudentGuardian
-import io.github.wulkanowy.data.db.entities.StudentInfo
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.ui.base.BaseView
-
-interface StudentInfoView : BaseView {
-
-    enum class Type {
-        PERSONAL, ADDRESS, CONTACT, FAMILY, FIRST_GUARDIAN, SECOND_GUARDIAN
-    }
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun updateData(data: List<Pair<String, String>>)
-
-    fun showPersonalTypeData(studentInfo: StudentInfo)
-
-    fun showContactTypeData(studentInfo: StudentInfo)
-
-    fun showAddressTypeData(studentInfo: StudentInfo)
-
-    fun showFamilyTypeData(studentInfo: StudentInfo)
-
-    fun showFirstGuardianTypeData(studentGuardian: StudentGuardian)
-
-    fun showSecondGuardianTypeData(studentGuardian: StudentGuardian)
-
-    fun openStudentInfoView(infoType: Type, studentWithSemesters: StudentWithSemesters)
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun showProgress(show: Boolean)
-
-    fun enableSwipe(enable: Boolean)
-
-    fun showContent(show: Boolean)
-
-    fun hideRefresh()
-
-    fun copyToClipboard(text: String)
-}
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
index f049f828e..85ded2025 100644
--- 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
@@ -6,7 +6,6 @@ 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
@@ -18,8 +17,8 @@ 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 org.threeten.bp.LocalDateTime
 import timber.log.Timber
-import java.time.LocalDateTime
 import java.util.Timer
 import javax.inject.Inject
 import kotlin.concurrent.timer
@@ -41,14 +40,12 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
 
     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")
+    private fun resetTimers() {
+        Timber.d("Timetable timers reset")
         with(timers) {
             forEach { (_, timer) -> timer.cancel() }
             clear()
@@ -72,6 +69,11 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         }
     }
 
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        resetTimers()
+    }
+
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val lesson = items[position]
 
@@ -101,7 +103,6 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         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")
@@ -111,12 +112,8 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             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) }
-                    }
-                }
+            if (lesson.isStudentPlan && showTimers) timers[position] = timer(period = 1000) {
+                root.post { updateTimeLeft(binding, lesson, position) }
             } else {
                 // reset item on set changed
                 timetableItemTimeUntil.visibility = GONE
@@ -221,7 +218,6 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                 timetableItemDescription.text = lesson.info
 
                 timetableItemRoom.visibility = GONE
-                timetableItemGroup.visibility = GONE
                 timetableItemTeacher.visibility = GONE
 
                 timetableItemDescription.setTextColor(root.context.getThemeAttrColor(
@@ -231,7 +227,6 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             } else {
                 timetableItemDescription.visibility = GONE
                 timetableItemRoom.visibility = VISIBLE
-                timetableItemGroup.visibility = if (showGroupsInPlan && lesson.group.isNotBlank()) VISIBLE else GONE
                 timetableItemTeacher.visibility = VISIBLE
             }
         }
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 7744515d9..8efecf07c 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
@@ -15,7 +15,7 @@ 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 java.time.LocalDateTime
+import org.threeten.bp.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
@@ -24,11 +24,12 @@ class TimetableDialog : DialogFragment() {
     private lateinit var lesson: Timetable
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Timetable) = TimetableDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(exam: Timetable): TimetableDialog {
+            return TimetableDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
         }
     }
 
@@ -40,14 +41,12 @@ class TimetableDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogTimetableBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogTimetableBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(lesson) {
             setInfo(info, teacher, canceled, changes)
@@ -77,24 +76,15 @@ class TimetableDialog : DialogFragment() {
         }
     }
 
-    @SuppressLint("DefaultLocale")
     private fun setInfo(info: String, teacher: String, canceled: Boolean, changes: Boolean) {
         with(binding) {
             when {
                 info.isNotBlank() -> {
                     if (canceled) {
-                        timetableDialogChangesTitle.setTextColor(
-                            requireContext().getThemeAttrColor(
-                                R.attr.colorPrimary
-                            )
-                        )
+                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
                         timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
                     } else {
-                        timetableDialogChangesTitle.setTextColor(
-                            requireContext().getThemeAttrColor(
-                                R.attr.colorTimetableChange
-                            )
-                        )
+                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
                         timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
                     }
 
@@ -177,7 +167,6 @@ class TimetableDialog : DialogFragment() {
 
     @SuppressLint("SetTextI18n")
     private fun setTime(start: LocalDateTime, end: LocalDateTime) {
-        binding.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 91f09ccc4..2f01511ad 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
@@ -9,23 +9,19 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-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.additional.AdditionalLessonsFragment
 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.getThemeAttrColor
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragment_timetable),
     TimetableView, MainView.MainChildView, MainView.TitledView {
 
@@ -70,8 +66,6 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
 
         with(binding) {
             timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            timetableSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            timetableSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             timetableErrorRetry.setOnClickListener { presenter.onRetry() }
             timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -88,19 +82,15 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.timetableMenuAdditionalLessons -> presenter.onAdditionalLessonsSwitchSelected()
-            R.id.timetableMenuCompletedLessons -> presenter.onCompletedLessonsSwitchSelected()
-            else -> false
-        }
+        return if (item.itemId == R.id.timetableMenuCompletedLessons) presenter.onCompletedLessonsSwitchSelected()
+        else false
     }
 
-    override fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showGroupsInPlanType: Boolean, showTimetableTimers: Boolean) {
+    override fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean) {
         with(timetableAdapter) {
             items = data.toMutableList()
             showTimers = showTimetableTimers
             showWholeClassPlan = showWholeClassPlanType
-            showGroupsInPlan = showGroupsInPlanType
             notifyDataSetChanged()
         }
     }
@@ -116,8 +106,8 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         binding.timetableNavDate.text = date
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.timetableSwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.timetableSwipe.isRefreshing = false
     }
 
     override fun resetView() {
@@ -179,15 +169,10 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
             setDateRangeLimiter(SchooldaysRangeLimiter())
             version = DatePickerDialog.Version.VERSION_2
             scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
             show(this@TimetableFragment.parentFragmentManager, null)
         }
     }
 
-    override fun openAdditionalLessonsView() {
-        (activity as? MainActivity)?.pushView(AdditionalLessonsFragment.newInstance())
-    }
-
     override fun openCompletedLessonsView() {
         (activity as? MainActivity)?.pushView(CompletedLessonsFragment.newInstance())
     }
@@ -198,7 +183,6 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
     }
 
     override fun onDestroyView() {
-        timetableAdapter.resetTimers()
         presenter.onDetachView()
         super.onDestroyView()
     }
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 3cd15bcfd..e1ce005e3 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,41 +1,37 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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 kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-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: AnalyticsHelper,
-) : BasePresenter<TimetableView>(errorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<TimetableView>(errorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -49,19 +45,19 @@ class TimetablePresenter @Inject constructor(
         view.initView()
         Timber.i("Timetable was initialized")
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
-        loadData()
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
+        reloadView()
     }
 
     fun onPreviousDay() {
-        reloadView(currentDate.previousSchoolDay)
-        loadData()
+        loadData(currentDate.previousSchoolDay)
+        reloadView()
     }
 
     fun onNextDay() {
-        reloadView(currentDate.nextSchoolDay)
-        loadData()
+        loadData(currentDate.nextSchoolDay)
+        reloadView()
     }
 
     fun onPickDate() {
@@ -69,13 +65,13 @@ class TimetablePresenter @Inject constructor(
     }
 
     fun onDateSet(year: Int, month: Int, day: Int) {
-        reloadView(of(year, month, day))
-        loadData()
+        loadData(of(year, month, day))
+        reloadView()
     }
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the timetable")
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onRetry() {
@@ -83,7 +79,7 @@ class TimetablePresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onDetailsClick() {
@@ -96,8 +92,8 @@ class TimetablePresenter @Inject constructor(
             if (view.currentStackSize == 1) {
                 baseDate.also {
                     if (currentDate != it) {
-                        reloadView(it)
-                        loadData()
+                        loadData(it)
+                        reloadView()
                     } else if (!view.isViewEmpty) view.resetView()
                 }
             } else view.popView()
@@ -109,90 +105,68 @@ class TimetablePresenter @Inject constructor(
         view?.showTimetableDialog(lesson)
     }
 
-    fun onAdditionalLessonsSwitchSelected(): Boolean {
-        view?.openAdditionalLessonsView()
-        return true
-    }
-
     fun onCompletedLessonsSwitchSelected(): Boolean {
         view?.openCompletedLessonsView()
         return true
     }
 
     private fun setBaseDateOnHolidays() {
-        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")
+        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")
+            })
     }
 
-    private fun loadData(forceRefresh: Boolean = false) {
+    private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading timetable data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, currentDate, currentDate, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data?.first.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateData(it.data!!.first)
-                        }
+        currentDate = date
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, currentDate, currentDate, forceRefresh)
                     }
                 }
-                Status.SUCCESS -> {
+                .map { items -> items.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading timetable result: Success")
                     view?.apply {
-                        updateData(it.data!!.first)
-                        showEmpty(it.data.first.isEmpty())
+                        updateData(it, prefRepository.showWholeClassPlan, prefRepository.showTimetableTimers)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.first.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "timetable",
-                        "items" to it.data!!.first.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading timetable result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    errorHandler.dispatch(it)
+                })
+        }
     }
 
-    private fun updateData(lessons: List<Timetable>) {
-        view?.updateData(
-            showWholeClassPlanType = prefRepository.showWholeClassPlan,
-            showGroupsInPlanType = prefRepository.showGroupsInPlan,
-            showTimetableTimers = prefRepository.showTimetableTimers,
-            data = createItems(lessons)
-        )
-    }
-
-    private fun createItems(items: List<Timetable>) = items.filter { item ->
-        if (prefRepository.showWholeClassPlan == "no") item.isStudentPlan else true
-    }.sortedWith(compareBy({ item -> item.number }, { item -> !item.isStudentPlan }))
-
     private fun showErrorViewOnError(message: String, error: Throwable) {
         view?.run {
             if (isViewEmpty) {
@@ -204,9 +178,7 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
-    private fun reloadView(date: LocalDate) {
-        currentDate = date
-
+    private fun reloadView() {
         Timber.i("Reload timetable view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
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 c6bceb9e8..1efa320fc 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 java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface TimetableView : BaseView {
 
@@ -12,13 +12,13 @@ interface TimetableView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showGroupsInPlanType: Boolean, showTimetableTimers: Boolean)
+    fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showTimetableTimers: Boolean)
 
     fun updateNavigationDay(date: String)
 
     fun clearData()
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun resetView()
 
@@ -44,7 +44,5 @@ interface TimetableView : BaseView {
 
     fun popView()
 
-    fun openAdditionalLessonsView()
-
     fun openCompletedLessonsView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsAdapter.kt
deleted file mode 100644
index fdc8b8874..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsAdapter.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.additional
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.databinding.ItemTimetableAdditionalBinding
-import io.github.wulkanowy.utils.toFormattedString
-import javax.inject.Inject
-
-class AdditionalLessonsAdapter @Inject constructor() :
-    RecyclerView.Adapter<AdditionalLessonsAdapter.ItemViewHolder>() {
-
-    var items = emptyList<TimetableAdditional>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemTimetableAdditionalBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            additionalLessonItemTime.text = "${item.start.toFormattedString("HH:mm")} - ${item.end.toFormattedString("HH:mm")}"
-            additionalLessonItemSubject.text = item.subject
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemTimetableAdditionalBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
deleted file mode 100644
index 7982387df..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.additional
-
-import android.os.Bundle
-import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.databinding.FragmentTimetableAdditionalBinding
-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.SchooldaysRangeLimiter
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.getThemeAttrColor
-import java.time.LocalDate
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AdditionalLessonsFragment :
-    BaseFragment<FragmentTimetableAdditionalBinding>(R.layout.fragment_timetable_additional),
-    AdditionalLessonsView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: AdditionalLessonsPresenter
-
-    @Inject
-    lateinit var additionalLessonsAdapter: AdditionalLessonsAdapter
-
-    companion object {
-        private const val SAVED_DATE_KEY = "CURRENT_DATE"
-
-        fun newInstance() = AdditionalLessonsFragment()
-    }
-
-    override val titleStringId get() = R.string.additional_lessons_title
-
-    override val isViewEmpty get() = additionalLessonsAdapter.items.isEmpty()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentTimetableAdditionalBinding.bind(view)
-        messageContainer = binding.additionalLessonsRecycler
-        presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
-    }
-
-    override fun initView() {
-        with(binding.additionalLessonsRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = additionalLessonsAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-
-        with(binding) {
-            additionalLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            additionalLessonsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            additionalLessonsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
-            additionalLessonsErrorRetry.setOnClickListener { presenter.onRetry() }
-            additionalLessonsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
-            additionalLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-            additionalLessonsNavDate.setOnClickListener { presenter.onPickDate() }
-            additionalLessonsNextButton.setOnClickListener { presenter.onNextDay() }
-
-            additionalLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
-    }
-
-    override fun updateData(data: List<TimetableAdditional>) {
-        with(additionalLessonsAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun clearData() {
-        with(additionalLessonsAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun updateNavigationDay(date: String) {
-        binding.additionalLessonsNavDate.text = date
-    }
-
-    override fun hideRefresh() {
-        binding.additionalLessonsSwipe.isRefreshing = false
-    }
-
-    override fun showEmpty(show: Boolean) {
-        binding.additionalLessonsEmpty.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.additionalLessonsError.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.additionalLessonsErrorMessage.text = message
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.additionalLessonsProgress.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun enableSwipe(enable: Boolean) {
-        binding.additionalLessonsSwipe.isEnabled = enable
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.additionalLessonsRecycler.visibility = if (show) View.VISIBLE else View.GONE
-    }
-
-    override fun showPreButton(show: Boolean) {
-        binding.additionalLessonsPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
-    }
-
-    override fun showNextButton(show: Boolean) {
-        binding.additionalLessonsNextButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
-    }
-
-    override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
-
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@AdditionalLessonsFragment.parentFragmentManager, null)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
deleted file mode 100644
index 21997b33f..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.additional
-
-import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-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 kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import java.time.LocalDate
-import javax.inject.Inject
-
-class AdditionalLessonsPresenter @Inject constructor(
-    studentRepository: StudentRepository,
-    errorHandler: ErrorHandler,
-    private val semesterRepository: SemesterRepository,
-    private val timetableRepository: TimetableRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<AdditionalLessonsView>(errorHandler, studentRepository) {
-
-    private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
-
-    lateinit var currentDate: LocalDate
-        private set
-
-    private lateinit var lastError: Throwable
-
-    fun onAttachView(view: AdditionalLessonsView, date: Long?) {
-        super.onAttachView(view)
-        view.initView()
-        Timber.i("Additional lessons was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData(LocalDate.ofEpochDay(date ?: baseDate.toEpochDay()))
-        if (currentDate.isHolidays) setBaseDateOnHolidays()
-        reloadView()
-    }
-
-    fun onPreviousDay() {
-        loadData(currentDate.previousSchoolDay)
-        reloadView()
-    }
-
-    fun onNextDay() {
-        loadData(currentDate.nextSchoolDay)
-        reloadView()
-    }
-
-    fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
-    }
-
-    fun onDateSet(year: Int, month: Int, day: Int) {
-        loadData(LocalDate.of(year, month, day))
-        reloadView()
-    }
-
-    fun onSwipeRefresh() {
-        Timber.i("Force refreshing the additional lessons")
-        loadData(currentDate, true)
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData(currentDate, true)
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun setBaseDateOnHolidays() {
-        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) {
-        currentDate = date
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, date, date, forceRefresh, true)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading additional lessons data started")
-                Status.SUCCESS -> {
-                    Timber.i("Loading additional lessons lessons result: Success")
-                    view?.apply {
-                        updateData(it.data!!.second.sortedBy { item -> item.date })
-                        showEmpty(it.data.second.isEmpty())
-                        showErrorView(false)
-                        showContent(it.data.second.isNotEmpty())
-                    }
-                    analytics.logEvent(
-                        "load_data",
-                        "type" to "additional_lessons",
-                        "items" to it.data!!.second.size
-                    )
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading additional lessons result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                hideRefresh()
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
-    private fun reloadView() {
-        Timber.i("Reload additional lessons view with the date ${currentDate.toFormattedString()}")
-        view?.apply {
-            showProgress(true)
-            enableSwipe(false)
-            showContent(false)
-            showEmpty(false)
-            showErrorView(false)
-            clearData()
-            reloadNavigation()
-        }
-    }
-
-    @SuppressLint("DefaultLocale")
-    private fun reloadNavigation() {
-        view?.apply {
-            showPreButton(!currentDate.minusDays(1).isHolidays)
-            showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
deleted file mode 100644
index 97eb2ae7b..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsView.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.additional
-
-import io.github.wulkanowy.data.db.entities.TimetableAdditional
-import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
-
-interface AdditionalLessonsView : BaseView {
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun updateData(data: List<TimetableAdditional>)
-
-    fun clearData()
-
-    fun updateNavigationDay(date: String)
-
-    fun hideRefresh()
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun showProgress(show: Boolean)
-
-    fun enableSwipe(enable: Boolean)
-
-    fun showContent(show: Boolean)
-
-    fun showPreButton(show: Boolean)
-
-    fun showNextButton(show: Boolean)
-
-    fun showDatePickerDialog(currentDate: LocalDate)
-}
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 258fc59df..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
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -16,11 +17,12 @@ class CompletedLessonDialog : DialogFragment() {
     private lateinit var completedLesson: CompletedLesson
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: CompletedLesson) = CompletedLessonDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(exam: CompletedLesson): CompletedLessonDialog {
+            return CompletedLessonDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
         }
     }
 
@@ -32,14 +34,13 @@ class CompletedLessonDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogLessonCompletedBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogLessonCompletedBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    @SuppressLint("SetTextI18n")
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             completedLessonDialogSubject.text = completedLesson.subject
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 00ba0bad8..c1389cedd 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,11 +1,15 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.content.res.Resources
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import com.chuckerteam.chucker.api.ChuckerCollector
+import io.github.wulkanowy.sdk.exception.FeatureDisabledException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
-class CompletedLessonsErrorHandler @Inject constructor(resources: Resources) : ErrorHandler(resources) {
+class CompletedLessonsErrorHandler @Inject constructor(
+    resources: Resources,
+    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 b6041b8ac..2efd30a34 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
@@ -7,7 +7,6 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.databinding.FragmentTimetableCompletedBinding
@@ -18,11 +17,9 @@ 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.getThemeAttrColor
-import java.time.LocalDate
+import org.threeten.bp.LocalDate
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class CompletedLessonsFragment :
     BaseFragment<FragmentTimetableCompletedBinding>(R.layout.fragment_timetable_completed),
     CompletedLessonsView, MainView.TitledView {
@@ -61,8 +58,6 @@ class CompletedLessonsFragment :
 
         with(binding) {
             completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            completedLessonsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            completedLessonsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
             completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -92,8 +87,8 @@ class CompletedLessonsFragment :
         binding.completedLessonsNavDate.text = date
     }
 
-    override fun showRefresh(show: Boolean) {
-        binding.completedLessonsSwipe.isRefreshing = show
+    override fun hideRefresh() {
+        binding.completedLessonsSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
@@ -150,7 +145,6 @@ class CompletedLessonsFragment :
             setDateRangeLimiter(SchooldaysRangeLimiter())
             version = DatePickerDialog.Version.VERSION_2
             scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
             show(this@CompletedLessonsFragment.parentFragmentManager, null)
         }
     }
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 04e2a5cd7..92aeb5814 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,37 +1,33 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.data.repositories.CompletedLessonsRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.SchedulersProvider
 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 kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
-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: AnalyticsHelper
-) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository) {
+    private val analytics: FirebaseAnalyticsHelper
+) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository, schedulers) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -47,22 +43,22 @@ class CompletedLessonsPresenter @Inject constructor(
         completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
-            this.view?.showEmpty(true)
+            this.view?.showEmpty(true);
             Timber.i("Completed lessons feature disabled by school")
         }
-        reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
-        loadData()
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
         if (currentDate.isHolidays) setBaseDateOnHolidays()
+        reloadView()
     }
 
     fun onPreviousDay() {
-        reloadView(currentDate.previousSchoolDay)
-        loadData()
+        loadData(currentDate.previousSchoolDay)
+        reloadView()
     }
 
     fun onNextDay() {
-        reloadView(currentDate.nextSchoolDay)
-        loadData()
+        loadData(currentDate.nextSchoolDay)
+        reloadView()
     }
 
     fun onPickDate() {
@@ -70,13 +66,13 @@ class CompletedLessonsPresenter @Inject constructor(
     }
 
     fun onDateSet(year: Int, month: Int, day: Int) {
-        reloadView(LocalDate.of(year, month, day))
-        loadData()
+        loadData(LocalDate.of(year, month, day))
+        reloadView()
     }
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the completed lessons")
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onRetry() {
@@ -84,7 +80,7 @@ class CompletedLessonsPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(true)
+        loadData(currentDate, true)
     }
 
     fun onDetailsClick() {
@@ -97,64 +93,59 @@ class CompletedLessonsPresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        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")
+        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")
+            })
     }
 
-    private fun loadData(forceRefresh: Boolean = false) {
+    private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading completed lessons data started")
-
-        flowWithResourceIn {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            completedLessonsRepository.getCompletedLessons(student, semester, currentDate, currentDate, forceRefresh)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> {
-                    if (!it.data.isNullOrEmpty()) {
-                        view?.run {
-                            enableSwipe(true)
-                            showRefresh(true)
-                            showProgress(false)
-                            showContent(true)
-                            updateData(it.data.sortedBy { item -> item.number })
-                        }
+        currentDate = date
+        disposable.apply {
+            clear()
+            add(studentRepository.getCurrentStudent()
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).flatMap { semester ->
+                        completedLessonsRepository.getCompletedLessons(student, semester, currentDate, currentDate, forceRefresh)
                     }
                 }
-                Status.SUCCESS -> {
+                .map { items -> items.sortedBy { it.number } }
+                .subscribeOn(schedulers.backgroundThread)
+                .observeOn(schedulers.mainThread)
+                .doFinally {
+                    view?.run {
+                        hideRefresh()
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                .subscribe({
                     Timber.i("Loading completed lessons lessons result: Success")
                     view?.apply {
-                        updateData(it.data!!.sortedBy { item -> item.number })
-                        showEmpty(it.data.isEmpty())
+                        updateData(it)
+                        showEmpty(it.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.isNotEmpty())
+                        showContent(it.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "completed_lessons",
-                        "items" to it.data!!.size
+                        "items" to it.size,
+                        "force_refresh" to forceRefresh
                     )
-                }
-                Status.ERROR -> {
+                }) {
                     Timber.i("Loading completed lessons result: An exception occurred")
-                    completedLessonsErrorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showRefresh(false)
-                showProgress(false)
-                enableSwipe(true)
-            }
-        }.launch()
+                    completedLessonsErrorHandler.dispatch(it)
+                })
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -168,9 +159,7 @@ class CompletedLessonsPresenter @Inject constructor(
         }
     }
 
-    private fun reloadView(date: LocalDate) {
-        currentDate = date
-
+    private fun reloadView() {
         Timber.i("Reload completed lessons view with the date ${currentDate.toFormattedString()}")
         view?.apply {
             showProgress(true)
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 7a98874e0..170e19694 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 java.time.LocalDate
+import org.threeten.bp.LocalDate
 
 interface CompletedLessonsView : BaseView {
 
@@ -16,7 +16,7 @@ interface CompletedLessonsView : BaseView {
 
     fun updateNavigationDay(date: String)
 
-    fun showRefresh(show: Boolean)
+    fun hideRefresh()
 
     fun showEmpty(show: Boolean)
 
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 a27dba882..3dc7a3a8c 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
@@ -10,9 +10,8 @@ import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+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
@@ -21,7 +20,6 @@ import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Co
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-@AndroidEntryPoint
 class TimetableWidgetConfigureActivity :
     BaseActivity<TimetableWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     TimetableWidgetConfigureView {
@@ -40,16 +38,10 @@ class TimetableWidgetConfigureActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(
-            ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root
-        )
+        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
 
         intent.extras.let {
-            presenter.onAttachView(
-                this,
-                it?.getInt(EXTRA_APPWIDGET_ID),
-                it?.getBoolean(EXTRA_FROM_PROVIDER)
-            )
+            presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
         }
     }
 
@@ -67,7 +59,6 @@ class TimetableWidgetConfigureActivity :
             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)
@@ -79,9 +70,8 @@ class TimetableWidgetConfigureActivity :
             .show()
     }
 
-    override fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long) {
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
         with(configureAdapter) {
-            selectedId = selectedStudentId
             items = data
             notifyDataSetChanged()
         }
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 2a40c8e4a..57dde824c 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,23 +1,21 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-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.StudentRepository
+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.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.flowWithResource
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
+import io.github.wulkanowy.utils.SchedulersProvider
 import javax.inject.Inject
 
 class TimetableWidgetConfigurePresenter @Inject constructor(
+    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository) {
+) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
 
     private var appWidgetId: Int? = null
 
@@ -25,11 +23,7 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
 
     private var selectedStudent: Student? = null
 
-    fun onAttachView(
-        view: TimetableWidgetConfigureView,
-        appWidgetId: Int?,
-        isFromProvider: Boolean?
-    ) {
+    fun onAttachView(view: TimetableWidgetConfigureView, appWidgetId: Int?, isFromProvider: Boolean?) {
         super.onAttachView(view)
         this.appWidgetId = appWidgetId
         this.isFromProvider = isFromProvider ?: false
@@ -56,26 +50,23 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.d("Timetable widget configure students data load")
-                Status.SUCCESS -> {
-                    val selectedStudentId = appWidgetId?.let { id ->
-                        sharedPref.getLong(getStudentWidgetKey(id), 0)
-                    } ?: -1
-
-                    when {
-                        it.data!!.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 && !isFromProvider -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
-                        else -> view?.updateData(it.data, selectedStudentId)
-                    }
-                }
-                Status.ERROR -> errorHandler.dispatch(it.error!!)
+        disposable.add(studentRepository.getSavedStudents(false)
+            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
+            .map { (students, currentStudentId) ->
+                students.map { student -> student to (student.id == currentStudentId) }
             }
-        }.launch()
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                when {
+                    it.isEmpty() -> view?.openLoginView()
+                    it.size == 1 && !isFromProvider -> {
+                        selectedStudent = it.single().first
+                        view?.showThemeDialog()
+                    }
+                    else -> view?.updateData(it)
+                }
+            }, { errorHandler.dispatch(it) }))
     }
 
     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 accdc28dc..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,13 +1,13 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface TimetableWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long)
+    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 df656c008..dd223ad8b 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,19 +14,19 @@ 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.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.repositories.TimetableRepository
+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.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCompatColor
-import io.github.wulkanowy.utils.toFirstResult
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
 import timber.log.Timber
-import java.time.LocalDate
 
 class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
@@ -34,6 +34,7 @@ class TimetableWidgetFactory(
     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 {
@@ -68,7 +69,7 @@ class TimetableWidgetFactory(
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
             updateTheme(appWidgetId)
-            lessons = getLessons(date, studentId)
+            updateLessons(date, studentId)
         }
     }
 
@@ -97,23 +98,30 @@ class TimetableWidgetFactory(
         }
     }
 
-    private fun getLessons(date: LocalDate, studentId: Long) = try {
-        runBlocking {
-            if (!studentRepository.isStudentSaved()) return@runBlocking emptyList<Timetable>()
+    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 }
 
-            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?.first.orEmpty()
-                .sortedWith(compareBy({ it.number }, { !it.isStudentPlan }))
-                .filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true }
+                    if (student != null) Maybe.just(student)
+                    else Maybe.empty()
+                }
+                .flatMap { student ->
+                    semesterRepository.getCurrentSemester(student).toMaybe().flatMap { semester ->
+                        timetableRepository.getTimetable(student, semester, date, date).toMaybe()
+                    }
+                }
+                .map { items -> items.sortedWith(compareBy({ it.number }, { !it.isStudentPlan })) }
+                .map { lessons -> lessons.filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true } }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet(emptyList())
+        } catch (e: Exception) {
+            Timber.e(e, "An error has occurred in timetable widget factory")
+            emptyList()
         }
-    } catch (e: Exception) {
-        Timber.e(e, "An error has occurred in timetable widget factory")
-        emptyList<Timetable>()
     }
 
     @SuppressLint("DefaultLocale")
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 071a2d178..79888f83d 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,41 +8,35 @@ 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.graphics.Bitmap
-import android.graphics.Canvas
 import android.widget.RemoteViews
-import dagger.hilt.android.AndroidEntryPoint
+import dagger.android.AndroidInjection
 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.StudentRepository
-import io.github.wulkanowy.services.HiltBroadcastReceiver
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 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.AnalyticsHelper
-import io.github.wulkanowy.utils.createNameInitialsDrawable
-import io.github.wulkanowy.utils.getCompatColor
+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.nickOrName
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import io.reactivex.Maybe
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.now
 import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDate.now
 import javax.inject.Inject
 
-@AndroidEntryPoint
-class TimetableWidgetProvider : HiltBroadcastReceiver() {
+class TimetableWidgetProvider : BroadcastReceiver() {
 
     @Inject
     lateinit var appWidgetManager: AppWidgetManager
@@ -54,7 +48,10 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
     lateinit var sharedPref: SharedPrefProvider
 
     @Inject
-    lateinit var analytics: AnalyticsHelper
+    lateinit var schedulers: SchedulersProvider
+
+    @Inject
+    lateinit var analytics: FirebaseAnalyticsHelper
 
     companion object {
 
@@ -76,46 +73,35 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
 
         fun getThemeWidgetKey(appWidgetId: Int) = "timetable_widget_theme_$appWidgetId"
 
-        fun getCurrentThemeWidgetKey(appWidgetId: Int) =
-            "timetable_widget_current_theme_$appWidgetId"
+        fun getCurrentThemeWidgetKey(appWidgetId: Int) = "timetable_widget_current_theme_$appWidgetId"
     }
 
     override fun onReceive(context: Context, intent: Intent) {
-        super.onReceive(context, intent)
-        GlobalScope.launch {
-            when (intent.action) {
-                ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
-                ACTION_APPWIDGET_DELETED -> onDelete(intent)
-            }
+        AndroidInjection.inject(this, context)
+        when (intent.action) {
+            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+            ACTION_APPWIDGET_DELETED -> onDelete(intent)
         }
     }
 
-    private suspend fun onUpdate(context: Context, intent: Intent) {
+    private 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)
+                val student = getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
                 updateWidget(context, appWidgetId, now().nextOrSameSchoolDay, student)
             }
         } else {
             val buttonType = intent.getStringExtra(EXTRA_BUTTON_TYPE)
             val toggledWidgetId = intent.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)
-            val student = getStudent(
-                sharedPref.getLong(getStudentWidgetKey(toggledWidgetId), 0),
-                toggledWidgetId
-            )
-            val savedDate =
-                LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
+            val student = getStudent(sharedPref.getLong(getStudentWidgetKey(toggledWidgetId), 0), toggledWidgetId)
+            val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
             val date = when (buttonType) {
                 BUTTON_RESET -> now().nextOrSameSchoolDay
                 BUTTON_NEXT -> savedDate.nextSchoolDay
                 BUTTON_PREV -> savedDate.previousSchoolDay
                 else -> now().nextOrSameSchoolDay
             }
-            if (!buttonType.isNullOrBlank()) analytics.logEvent(
-                "changed_timetable_widget_day",
-                "button" to buttonType
-            )
+            if (!buttonType.isNullOrBlank()) analytics.logEvent("changed_timetable_widget_day", "button" to buttonType)
             updateWidget(context, toggledWidgetId, date, student)
         }
     }
@@ -134,15 +120,9 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
     }
 
     @SuppressLint("DefaultLocale")
-    private fun updateWidget(
-        context: Context,
-        appWidgetId: Int,
-        date: LocalDate,
-        student: Student?
-    ) {
+    private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
         val savedConfigureTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val isSystemDarkMode =
-            context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        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
 
@@ -153,44 +133,26 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
 
         val nextNavIntent = createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT)
         val prevNavIntent = createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV)
-        val resetNavIntent =
-            createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET)
+        val resetNavIntent = createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET)
         val adapterIntent = Intent(context, TimetableWidgetService::class.java)
             .apply {
                 putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
                 //make Intent unique
                 action = appWidgetId.toString()
             }
-        val accountIntent = PendingIntent.getActivity(
-            context, -Int.MAX_VALUE + appWidgetId,
+        val accountIntent = PendingIntent.getActivity(context, -Int.MAX_VALUE + appWidgetId,
             Intent(context, TimetableWidgetConfigureActivity::class.java).apply {
                 addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)
                 putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
                 putExtra(EXTRA_FROM_PROVIDER, true)
-            }, FLAG_UPDATE_CURRENT
-        )
-        val appIntent = PendingIntent.getActivity(
-            context,
-            MainView.Section.TIMETABLE.id,
-            MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true),
-            FLAG_UPDATE_CURRENT
-        )
+            }, FLAG_UPDATE_CURRENT)
+        val appIntent = PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
+            MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT)
 
         val remoteView = RemoteViews(context.packageName, layoutId).apply {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
-            setTextViewText(
-                R.id.timetableWidgetDate,
-                date.toFormattedString("EEEE, dd.MM").capitalize()
-            )
-            setTextViewText(
-                R.id.timetableWidgetName,
-                student?.nickOrName ?: context.getString(R.string.all_no_data)
-            )
-
-            student?.let {
-                setImageViewBitmap(R.id.timetableWidgetAccount, context.createAvatarBitmap(it))
-            }
-
+            setTextViewText(R.id.timetableWidgetDate, date.toFormattedString("EEEE, dd.MM").capitalize())
+            setTextViewText(R.id.timetableWidgetName, student?.studentName ?: context.getString(R.string.all_no_data))
             setRemoteAdapter(R.id.timetableWidgetList, adapterIntent)
             setOnClickPendingIntent(R.id.timetableWidgetNext, nextNavIntent)
             setOnClickPendingIntent(R.id.timetableWidgetPrev, prevNavIntent)
@@ -206,69 +168,45 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
         }
 
         with(appWidgetManager) {
-            updateAppWidget(appWidgetId, remoteView)
             notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
-            Timber.d("TimetableWidgetProvider updated")
+            updateAppWidget(appWidgetId, remoteView)
         }
     }
 
-    private fun createNavIntent(
-        context: Context,
-        code: Int,
-        appWidgetId: Int,
-        buttonType: String
-    ): PendingIntent {
-        return PendingIntent.getBroadcast(
-            context, code,
+    private fun createNavIntent(context: Context, code: Int, appWidgetId: Int, buttonType: String): PendingIntent {
+        return PendingIntent.getBroadcast(context, code,
             Intent(context, TimetableWidgetProvider::class.java).apply {
                 action = ACTION_APPWIDGET_UPDATE
                 putExtra(EXTRA_BUTTON_TYPE, buttonType)
                 putExtra(EXTRA_TOGGLED_WIDGET_ID, appWidgetId)
-            }, FLAG_UPDATE_CURRENT
-        )
+            }, FLAG_UPDATE_CURRENT)
     }
 
-    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)
+    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()
+                    }
                 }
+                .subscribeOn(schedulers.backgroundThread)
+                .blockingGet()
+        } catch (e: Exception) {
+            if (e.cause !is NoCurrentStudentException) {
+                Timber.e(e, "An error has occurred in timetable widget provider")
             }
-            else -> null
+            null
         }
-    } catch (e: Exception) {
-        if (e.cause !is NoCurrentStudentException) {
-            Timber.e(e, "An error has occurred in timetable widget provider")
-        }
-        null
-    }
-
-    private fun Context.createAvatarBitmap(student: Student): Bitmap {
-        val avatarColor = if (student.avatarColor == -2937041L) {
-            getCompatColor(R.color.colorPrimaryLight).toLong()
-        } else {
-            student.avatarColor
-        }
-        val avatarDrawable = createNameInitialsDrawable(student.nickOrName, avatarColor, 0.5f)
-
-        val avatarBitmap =
-            if (avatarDrawable.intrinsicWidth <= 0 || avatarDrawable.intrinsicHeight <= 0) {
-                Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
-            } else {
-                Bitmap.createBitmap(
-                    avatarDrawable.intrinsicWidth,
-                    avatarDrawable.intrinsicHeight,
-                    Bitmap.Config.ARGB_8888
-                )
-            }
-
-        val canvas = Canvas(avatarBitmap)
-        avatarDrawable.setBounds(0, 0, canvas.width, canvas.height)
-        avatarDrawable.draw(canvas)
-        return avatarBitmap
     }
 }
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 a3961aed8..6912baa36 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -4,25 +4,18 @@ 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.BUILD_TIMESTAMP
 import io.github.wulkanowy.BuildConfig.DEBUG
-import io.github.wulkanowy.BuildConfig.FLAVOR
 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 @Inject constructor() {
+open class AppInfo {
 
     open val isDebug get() = DEBUG
 
     open val versionCode get() = VERSION_CODE
 
-    open val buildTimestamp get() = BUILD_TIMESTAMP
-
-    open val buildFlavor get() = FLAVOR
-
     open val versionName get() = VERSION_NAME
 
     open val systemVersion get() = SDK_INT
@@ -34,9 +27,4 @@ open class AppInfo @Inject constructor() {
     @Suppress("DEPRECATION")
     open val systemLanguage: String
         get() = Resources.getSystem().configuration.locale.language
-
-    val defaultColorsForAvatar = listOf(
-        0xd32f2f, 0xE64A19, 0xFFA000, 0xAFB42B, 0x689F38, 0x388E3C, 0x00796B, 0x0097A7,
-        0x1976D2, 0x3647b5, 0x6236c9, 0x9225c1, 0xC2185B, 0x616161, 0x455A64, 0x7a5348
-    ).map { (it and 0x00ffffff or (255 shl 24)).toLong() }
 }
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 f10b00a07..c2b1efaa8 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
@@ -1,9 +1,6 @@
 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]
@@ -26,15 +23,4 @@ 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 92c0ddfc5..2b40cb476 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -1,15 +1,8 @@
 package io.github.wulkanowy.utils
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.Rect
-import android.graphics.Typeface
 import android.net.Uri
-import android.text.TextPaint
 import android.util.DisplayMetrics.DENSITY_DEFAULT
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
@@ -17,9 +10,6 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
-import androidx.core.graphics.applyCanvas
-import androidx.core.graphics.drawable.RoundedBitmapDrawable
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import io.github.wulkanowy.BuildConfig.APPLICATION_ID
 
 @ColorInt
@@ -40,8 +30,7 @@ fun Context.getThemeAttrColor(@AttrRes colorAttr: Int, alpha: Int): Int {
 @ColorInt
 fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
 
-fun Context.getCompatDrawable(@DrawableRes drawableRes: Int) =
-    ContextCompat.getDrawable(this, drawableRes)
+fun Context.getCompatDrawable(@DrawableRes drawableRes: Int) = ContextCompat.getDrawable(this, drawableRes)
 
 fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit) {
     Intent.parseUri(uri, 0).let {
@@ -56,13 +45,7 @@ fun Context.openAppInMarket(onActivityNotFound: (uri: String) -> Unit) {
     }
 }
 
-fun Context.openEmailClient(
-    chooserTitle: String,
-    email: String,
-    subject: String,
-    body: String,
-    onActivityNotFound: () -> Unit = {}
-) {
+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)
@@ -88,53 +71,4 @@ 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
-
-@SuppressLint("DefaultLocale")
-fun Context.createNameInitialsDrawable(
-    text: String,
-    backgroundColor: Long,
-    scaleFactory: Float = 1f
-): RoundedBitmapDrawable {
-    val words = text.split(" ")
-    val firstCharFirstWord = words.getOrNull(0)?.firstOrNull() ?: ""
-    val firstCharSecondWord = words.getOrNull(1)?.firstOrNull() ?: ""
-
-    val initials = "$firstCharFirstWord$firstCharSecondWord".toUpperCase()
-
-    val bounds = Rect()
-    val dimension = this.dpToPx(64f * scaleFactory).toInt()
-    val textPaint = TextPaint().apply {
-        typeface = Typeface.SANS_SERIF
-        color = Color.WHITE
-        textAlign = Paint.Align.CENTER
-        isAntiAlias = true
-        textSize = this@createNameInitialsDrawable.dpToPx(30f * scaleFactory)
-        getTextBounds(initials, 0, initials.length, bounds)
-    }
-
-    val xCoordinate = (dimension / 2).toFloat()
-    val yCoordinate = (dimension / 2 + (bounds.bottom - bounds.top) / 2).toFloat()
-
-    val bitmap = Bitmap.createBitmap(dimension, dimension, Bitmap.Config.ARGB_8888)
-        .applyCanvas {
-            drawColor(backgroundColor.toInt())
-            drawText(initials, 0, initials.length, xCoordinate, yCoordinate, textPaint)
-        }
-
-    return RoundedBitmapDrawableFactory.create(this.resources, bitmap)
-        .apply { isCircular = true }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
deleted file mode 100644
index ecc8e05eb..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-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/FlowUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
deleted file mode 100644
index 5dd289677..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.Status
-import kotlinx.coroutines.FlowPreview
-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
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-
-inline fun <ResultType, RequestType> networkBoundResource(
-    mutex: Mutex = Mutex(),
-    showSavedOnLoading: Boolean = true,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> 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 {
-            val newData = fetch(data)
-            mutex.withLock { saveFetchResult(query().first(), newData) }
-            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(
-    mutex: Mutex = Mutex(),
-    showSavedOnLoading: Boolean = true,
-    crossinline query: () -> Flow<ResultType>,
-    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline onFetchFailed: (Throwable) -> 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 {
-            val newData = fetch(data)
-            mutex.withLock { saveFetchResult(query().first(), newData) }
-            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(Resource.success(block()))
-}.catch { emit(Resource.error(it)) }
-
-@OptIn(FlowPreview::class)
-fun <T> flowWithResourceIn(block: suspend () -> Flow<Resource<T>>) = flow {
-    emit(Resource.loading())
-    emitAll(block().filter { it.status != Status.LOADING || (it.status == Status.LOADING && it.data != null) })
-}.catch { emit(Resource.error(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/FragmentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
index a49360d7a..0b71c964b 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
@@ -2,8 +2,6 @@ package io.github.wulkanowy.utils
 
 import androidx.fragment.app.Fragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
-import io.github.wulkanowy.ui.modules.account.AccountFragment
-import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsFragment
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
@@ -15,7 +13,6 @@ 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.settings.SettingsFragment
-import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 
 fun Fragment.toSection(): MainView.Section? {
@@ -32,9 +29,6 @@ fun Fragment.toSection(): MainView.Section? {
         is SettingsFragment -> MainView.Section.SETTINGS
         is AboutFragment -> MainView.Section.ABOUT
         is SchoolAndTeachersFragment -> MainView.Section.SCHOOL
-        is AccountFragment -> MainView.Section.ACCOUNT
-        is AccountDetailsFragment -> MainView.Section.ACCOUNT
-        is StudentInfoFragment -> MainView.Section.STUDENT_INFO
         else -> null
     }
 }
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 6facb5ef6..c57b62470 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -16,68 +16,63 @@ fun List<Grade>.calcAverage(): Double {
 }
 
 @JvmName("calcSummaryAverage")
-fun List<GradeSummary>.calcAverage(plusModifier: Double, minusModifier: Double) = asSequence()
-    .mapNotNull {
-        if (it.finalGrade.matches("[0-6][+-]?".toRegex())) {
-            when {
-                it.finalGrade.endsWith('+') -> {
-                    it.finalGrade.removeSuffix("+").toDouble() + plusModifier
-                }
-                it.finalGrade.endsWith('-') -> {
-                    it.finalGrade.removeSuffix("-").toDouble() - minusModifier
-                }
-                else -> {
-                    it.finalGrade.toDouble()
-                }
-            }
-        } else null
-    }
-    .average()
-    .let { if (it.isNaN()) 0.0 else it }
+fun List<GradeSummary>.calcAverage(): Double {
+    return asSequence().mapNotNull {
+        if (it.finalGrade.matches("[0-6]".toRegex())) it.finalGrade.toDouble() else null
+    }.average().let { if (it.isNaN()) 0.0 else it }
+}
 
-fun Grade.getBackgroundColor(theme: String) = when (theme) {
-    "grade_color" -> getGradeColor()
-    "material" -> when (value.toInt()) {
-        6 -> R.color.grade_material_six
-        5 -> R.color.grade_material_five
-        4 -> R.color.grade_material_four
-        3 -> R.color.grade_material_three
-        2 -> R.color.grade_material_two
-        1 -> R.color.grade_material_one
-        else -> R.color.grade_material_default
-    }
-    else -> when (value.toInt()) {
-        6 -> R.color.grade_vulcan_six
-        5 -> R.color.grade_vulcan_five
-        4 -> R.color.grade_vulcan_four
-        3 -> R.color.grade_vulcan_three
-        2 -> R.color.grade_vulcan_two
-        1 -> R.color.grade_vulcan_one
-        else -> R.color.grade_vulcan_default
+fun Grade.getBackgroundColor(theme: String): Int {
+    return when (theme) {
+        "grade_color" -> getGradeColor()
+        "material" -> when (value.toInt()) {
+            6 -> R.color.grade_material_six
+            5 -> R.color.grade_material_five
+            4 -> R.color.grade_material_four
+            3 -> R.color.grade_material_three
+            2 -> R.color.grade_material_two
+            1 -> R.color.grade_material_one
+            else -> R.color.grade_material_default
+        }
+        else -> when (value.toInt()) {
+            6 -> R.color.grade_vulcan_six
+            5 -> R.color.grade_vulcan_five
+            4 -> R.color.grade_vulcan_four
+            3 -> R.color.grade_vulcan_three
+            2 -> R.color.grade_vulcan_two
+            1 -> R.color.grade_vulcan_one
+            else -> R.color.grade_vulcan_default
+        }
     }
 }
 
-fun Grade.getGradeColor() = 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
+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() = when (color) {
-        "000000" -> R.string.all_black
-        "F04C4C" -> R.string.all_red
-        "20A4F7" -> R.string.all_blue
-        "6ECD07" -> R.string.all_green
-        "B16CF1" -> R.string.all_purple
-        else -> R.string.all_empty_color
+    get() {
+        return when (color) {
+            "000000" -> R.string.all_black
+            "F04C4C" -> R.string.all_red
+            "20A4F7" -> R.string.all_blue
+            "6ECD07" -> R.string.all_green
+            "B16CF1" -> R.string.all_purple
+            else -> R.string.all_empty_color
+        }
     }
 
-fun Grade.changeModifier(plusModifier: Double, minusModifier: Double) = when {
-    modifier > 0 -> copy(modifier = plusModifier)
-    modifier < 0 -> copy(modifier = -minusModifier)
-    else -> this
+fun Grade.changeModifier(plusModifier: Double, minusModifier: Double): Grade {
+    return when {
+        modifier > 0 -> copy(modifier = plusModifier)
+        modifier < 0 -> copy(modifier = -minusModifier)
+        else -> this
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
index d2a8908ce..2c49ee97c 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
@@ -1,7 +1,5 @@
 package io.github.wulkanowy.utils
 
-import android.os.Handler
-import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
@@ -30,8 +28,7 @@ class LifecycleAwareVariable<T : Any> : ReadWriteProperty<Fragment, T>, Lifecycl
     }
 }
 
-class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActivity, T>,
-    LifecycleObserver {
+class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActivity, T>, LifecycleObserver {
 
     private var _value: T? = null
 
@@ -47,13 +44,12 @@ class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActiv
     @Suppress("unused")
     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     fun onDestroyView() {
-        Handler(Looper.getMainLooper()).post {
-            _value = null
-        }
+        _value = null
     }
 }
 
+
 @Suppress("unused")
 fun <T : Any> Fragment.lifecycleAwareVariable() = LifecycleAwareVariable<T>()
 
-fun <T : Any> lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
+fun <T : Any> AppCompatActivity.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 48d46892b..fc3528495 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -22,32 +22,32 @@ private fun Bundle?.checkSavedState() = if (this == null) "(STATE IS NULL)" else
 
 class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 
-    override fun onActivityPaused(activity: Activity) {
-        Timber.d("${activity::class.java.simpleName} PAUSED")
+    override fun onActivityPaused(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} PAUSED") }
     }
 
-    override fun onActivityResumed(activity: Activity) {
-        Timber.d("${activity::class.java.simpleName} RESUMED")
+    override fun onActivityResumed(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} RESUMED") }
     }
 
-    override fun onActivityStarted(activity: Activity) {
-        Timber.d("${activity::class.java.simpleName} STARTED")
+    override fun onActivityStarted(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} STARTED") }
     }
 
-    override fun onActivityDestroyed(activity: Activity) {
-        Timber.d("${activity::class.java.simpleName} DESTROYED")
+    override fun onActivityDestroyed(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} DESTROYED") }
     }
 
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-        Timber.d("${activity::class.java.simpleName} SAVED INSTANCE STATE")
+    override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} SAVED INSTANCE STATE") }
     }
 
-    override fun onActivityStopped(activity: Activity) {
-        Timber.d("${activity::class.java.simpleName} STOPPED")
+    override fun onActivityStopped(activity: Activity?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} STOPPED") }
     }
 
-    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        Timber.d("${activity::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}")
+    override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
+        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}") }
     }
 }
 
diff --git a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
deleted file mode 100644
index cd59b8648..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.enums.MessageFolder
-import timber.log.Timber
-import java.time.LocalDate
-import java.time.LocalDateTime
-import javax.inject.Inject
-
-fun getRefreshKey(name: String, semester: Semester, start: LocalDate, end: LocalDate): String {
-    return "${name}_${semester.studentId}_${semester.semesterId}_${start.monday}_${end.sunday}"
-}
-
-fun getRefreshKey(name: String, semester: Semester): String {
-    return "${name}_${semester.studentId}_${semester.semesterId}"
-}
-
-fun getRefreshKey(name: String, student: Student): String {
-    return "${name}_${student.userLoginId}"
-}
-
-fun getRefreshKey(name: String, student: Student, folder: MessageFolder): String {
-    return "${name}_${student.id}_${folder.id}"
-}
-
-class AutoRefreshHelper @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val sharedPref: SharedPrefProvider
-) {
-
-    fun isShouldBeRefreshed(key: String): Boolean {
-        val timestamp = sharedPref.getLong(key, 0).toLocalDateTime()
-        val servicesInterval = sharedPref.getString(context.getString(R.string.pref_key_services_interval), context.getString(R.string.pref_default_services_interval)).toLong()
-
-        val shouldBeRefreshed = timestamp < LocalDateTime.now().minusMinutes(servicesInterval)
-
-        Timber.d("Check if $key need to be refreshed: $shouldBeRefreshed (last refresh: $timestamp, interval: $servicesInterval min)")
-
-        return shouldBeRefreshed
-    }
-
-    fun updateLastRefreshTimestamp(key: String) {
-        sharedPref.putLong(key, LocalDateTime.now().toTimestamp())
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
index da5fd3dbb..a2d0384e3 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
@@ -2,28 +2,22 @@ package io.github.wulkanowy.utils
 
 import android.content.res.Resources
 import io.github.wulkanowy.R
+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.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 io.github.wulkanowy.sdk.exception.NotLoggedInException
+import io.github.wulkanowy.sdk.exception.PasswordChangeRequiredException
+import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
 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 SocketTimeoutException, is InterruptedIOException -> 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
new file mode 100644
index 000000000..e426d4d5d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
@@ -0,0 +1,14 @@
+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 e7c51745c..46a707abb 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 java.time.DayOfWeek
-import java.time.LocalDate
+import org.threeten.bp.DayOfWeek
+import org.threeten.bp.LocalDate
 import java.util.Calendar
 
 @Suppress("UNUSED_PARAMETER")
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
index 63a30db8c..e4d4163b4 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -23,8 +23,6 @@ fun Sdk.init(student: Student): Sdk {
     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
index 6e11a8b2c..b3c479c38 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.utils
 
 import io.github.wulkanowy.data.db.entities.Semester
-import java.time.LocalDate.now
+import org.threeten.bp.LocalDate.now
 
 inline val Semester.isCurrent: Boolean
     get() = now() in start..end
@@ -13,7 +13,7 @@ fun List<Semester>.getCurrentOrLast(): 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 }
+    singleOrNull { semester -> semester.semesterId == maxBy { 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/StudentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/StudentExtension.kt
deleted file mode 100644
index fdd0610a0..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/StudentExtension.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.github.wulkanowy.data.db.entities.Student
-
-inline val Student.nickOrName get() = if (nick.isBlank()) studentName else nick
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 d80abbd12..802b2ee0f 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,23 +1,21 @@
 package io.github.wulkanowy.utils
 
-import android.annotation.SuppressLint
-import java.text.SimpleDateFormat
-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.now
-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.temporal.TemporalAdjusters.firstInMonth
-import java.time.temporal.TemporalAdjusters.next
-import java.time.temporal.TemporalAdjusters.previous
+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.ofEpochMilli
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.ofInstant
+import org.threeten.bp.Month
+import org.threeten.bp.ZoneId
+import org.threeten.bp.ZoneOffset
+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.Locale
 
 private const val DATE_PATTERN = "dd.MM.yyyy"
@@ -26,18 +24,34 @@ fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.par
 
 fun LocalDateTime.toTimestamp() = atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
 
-fun Long.toLocalDateTime(): LocalDateTime = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
+fun Long.toLocalDateTime() = 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))
 
-@SuppressLint("DefaultLocale")
+/**
+ * https://github.com/ThreeTen/threetenbp/issues/55
+ */
 fun Month.getFormattedName(): String {
-    val formatter = SimpleDateFormat("LLLL", Locale.getDefault())
-
-    val date = now().withMonth(value)
-    return formatter.format(date.toInstant(ZoneOffset.UTC).toEpochMilli()).capitalize()
+    return getDisplayName(FULL_STANDALONE, Locale.getDefault())
+        .let {
+            when (it) {
+                "stycznia" -> "Styczeń"
+                "lutego" -> "Luty"
+                "marca" -> "Marzec"
+                "kwietnia" -> "Kwiecień"
+                "maja" -> "Maj"
+                "czerwca" -> "Czerwiec"
+                "lipca" -> "Lipiec"
+                "sierpnia" -> "Sierpień"
+                "września" -> "Wrzesień"
+                "października" -> "Październik"
+                "listopada" -> "Listopad"
+                "grudnia" -> "Grudzień"
+                else -> it
+            }
+        }
 }
 
 inline val LocalDate.nextSchoolDay: LocalDate
@@ -64,12 +78,6 @@ 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) {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
index f3591306e..ccb2afeb0 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
@@ -1,10 +1,10 @@
 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
+import org.threeten.bp.Duration
+import org.threeten.bp.Duration.between
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 
 fun Timetable.isShowTimeUntil(previousLessonEnd: LocalDateTime?) = when {
     !isStudentPlan -> false
diff --git a/app/src/main/play/listings/pl-PL/full-description.txt b/app/src/main/play/listings/pl-PL/full-description.txt
index 7da51da2d..641b7706d 100644
--- a/app/src/main/play/listings/pl-PL/full-description.txt
+++ b/app/src/main/play/listings/pl-PL/full-description.txt
@@ -4,7 +4,7 @@ Wyróżnione cechy i funkcje:
 - obliczanie średniej ważonej,
 - procentowy podgląd frekwencji,
 - szczęśliwy numerek,
-- podgląd lekcji dodatkowych i zrealizowanych,
+- podgląd lekcji zrealizowanych,
 - ciemny motyw.
 - brak reklam,
 - tryb offline,
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-grades.png
new file mode 100644
index 000000000..56768bf57
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-grades.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-start.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-start.jpg
deleted file mode 100644
index 0ed20c04d..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/1-start.jpg and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2-timetable-dialog.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2-timetable-dialog.png
new file mode 100644
index 000000000..83d9353ae
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2-timetable-dialog.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2.jpg
deleted file mode 100644
index f70e2c43b..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/2.jpg and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-exams.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-exams.png
new file mode 100644
index 000000000..f83a7af8b
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-exams.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-timetable-dialog.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-timetable-dialog.jpg
deleted file mode 100644
index 968fccdbe..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/3-timetable-dialog.jpg and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-exams.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-exams.jpg
deleted file mode 100644
index 3f49e774a..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-exams.jpg and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-timetable-widget.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-timetable-widget.png
new file mode 100644
index 000000000..90d5fef4f
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/4-timetable-widget.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-messages.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-messages.png
new file mode 100644
index 000000000..eadbf2db2
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-messages.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-timetable-widget.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-timetable-widget.jpg
deleted file mode 100644
index f68daaf1a..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/5-timetable-widget.jpg and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-account-switcher.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-account-switcher.png
new file mode 100644
index 000000000..2a11a3db9
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-account-switcher.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-class-grades.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-class-grades.jpg
deleted file mode 100644
index ca5446a24..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/6-class-grades.jpg and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-account-switcher.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-account-switcher.jpg
deleted file mode 100644
index ca747aff0..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-account-switcher.jpg and /dev/null differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-class-grades.png b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-class-grades.png
new file mode 100644
index 000000000..d9b2f1c76
Binary files /dev/null and b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/7-class-grades.png differ
diff --git a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/8-themes.jpg b/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/8-themes.jpg
deleted file mode 100644
index ce3af9bbf..000000000
Binary files a/app/src/main/play/listings/pl-PL/graphics/phone-screenshots/8-themes.jpg and /dev/null differ
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 868c75e3f..db9e9a9a3 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,5 +1,6 @@
-Wersja 1.1.5
-
-Naprawiliśmy liczenie średniej wszystkich ocen z całego roku
+Wersja 0.18.3
+- poprawiliśmy liczenie średniej i dodaliśmy nowy sposób jej liczenia w ustawieniach
+- naprawiliśmy usuwanie wiadomości
+- naprawiliśmy wysyłanie wiadomości na Lubelskim Portalu Oświatowym
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_timetable.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_timetable.xml
deleted file mode 100644
index 9efc03489..000000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_stat_timetable.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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">
-    <group
-        android:scaleX="0.92"
-        android:scaleY="0.92"
-        android:translateX="0.96"
-        android:translateY="0.96">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M14,12H15.5V14.82L17.94,16.23L17.19,17.53L14,15.69V12M4,2H18A2,2 0 0,1 20,4V10.1C21.24,11.36 22,13.09 22,15A7,7 0 0,1 15,22C13.09,22 11.36,21.24 10.1,20H4A2,2 0 0,1 2,18V4A2,2 0 0,1 4,2M4,15V18H8.67C8.24,17.09 8,16.07 8,15H4M4,8H10V5H4V8M18,8V5H12V8H18M4,13H8.29C8.63,11.85 9.26,10.82 10.1,10H4V13M15,10.15A4.85,4.85 0 0,0 10.15,15C10.15,17.68 12.32,19.85 15,19.85A4.85,4.85 0 0,0 19.85,15C19.85,12.32 17.68,10.15 15,10.15Z" />
-    </group>
-</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
deleted file mode 100644
index 0b5feff2d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_attendance.png and /dev/null 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
deleted file mode 100644
index e5af0d086..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_exam.png and /dev/null 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
deleted file mode 100644
index 095a8228c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_grade.png and /dev/null 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
deleted file mode 100644
index 7bcd79e01..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_message.png and /dev/null 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
deleted file mode 100644
index 2808559a5..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_timetable.png and /dev/null 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
index 21095e296..201419d5d 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_timetable.png 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
deleted file mode 100644
index e81e7ad92..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_attendance.png and /dev/null 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
deleted file mode 100644
index 3bdb5297f..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_exam.png and /dev/null 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
deleted file mode 100644
index e35135071..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_grade.png and /dev/null 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
deleted file mode 100644
index 392c45d24..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_message.png and /dev/null 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
deleted file mode 100644
index 7d61306a4..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_timetable.png and /dev/null 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
index 9147c4090..dcfe95f26 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png and b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_attendance.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_attendance.png
deleted file mode 100644
index 302b9e0ee..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_attendance.png and /dev/null 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
deleted file mode 100644
index 9f36ca47a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_exam.png and /dev/null 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
deleted file mode 100644
index 281bc7a31..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_grade.png and /dev/null 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
deleted file mode 100644
index 184929a3c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_message.png and /dev/null 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
deleted file mode 100644
index 9a40fe61c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_timetable.png and /dev/null 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
index 96942b5a3..7264bd92a 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png 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
deleted file mode 100644
index 9b4ef2daf..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_attendance.png and /dev/null 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
deleted file mode 100644
index c2677a139..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_exam.png and /dev/null 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
deleted file mode 100644
index 8b51021cb..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_grade.png and /dev/null 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
deleted file mode 100644
index 250c290aa..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_message.png and /dev/null 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
deleted file mode 100644
index c530153a1..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_timetable.png and /dev/null 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
index 510da8d52..1fb37b092 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png 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
deleted file mode 100644
index 7b9a68a70..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_attendance.png and /dev/null 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
deleted file mode 100644
index 519c50abc..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_exam.png and /dev/null 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
deleted file mode 100644
index 13c793d5e..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_grade.png and /dev/null 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
deleted file mode 100644
index eaffa2dde..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_message.png and /dev/null 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
deleted file mode 100644
index 03522e9a5..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_about_facebook.xml b/app/src/main/res/drawable/ic_about_facebook.xml
deleted file mode 100644
index a1b7b46eb..000000000
--- a/app/src/main/res/drawable/ic_about_facebook.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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:fillType="nonZero"
-        android:pathData="M12,2C6.4883,2 2,6.4883 2,12C2,17.5117 6.4883,22 12,22C17.5117,22 22,17.5117 22,12C22,6.4883 17.5117,2 12,2ZM12,4C16.4297,4 20,7.5703 20,12C20,16.0156 17.0664,19.3125 13.2188,19.8984L13.2188,14.3828L15.5469,14.3828L15.9102,12.0195L13.2188,12.0195L13.2188,10.7266C13.2188,9.7422 13.5391,8.8711 14.457,8.8711L15.9336,8.8711L15.9336,6.8047C15.6758,6.7734 15.125,6.6953 14.0898,6.6953C11.9258,6.6953 10.6523,7.8398 10.6523,10.4453L10.6523,12.0195L8.4258,12.0195L8.4258,14.3828L10.6523,14.3828L10.6523,19.8789C6.8711,19.2422 4,15.9688 4,12C4,7.5703 7.5703,4 12,4ZM12,4" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_all_home.xml b/app/src/main/res/drawable/ic_about_homepage.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_all_home.xml
rename to app/src/main/res/drawable/ic_about_homepage.xml
diff --git a/app/src/main/res/drawable/ic_account_details_family.xml b/app/src/main/res/drawable/ic_account_details_family.xml
deleted file mode 100644
index 363b4f58b..000000000
--- a/app/src/main/res/drawable/ic_account_details_family.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@android:color/white"
-        android:pathData="M16,4c0,-1.11 0.89,-2 2,-2s2,0.89 2,2s-0.89,2 -2,2S16,5.11 16,4zM20,22v-6h2.5l-2.54,-7.63C19.68,7.55 18.92,7 18.06,7h-0.12c-0.86,0 -1.63,0.55 -1.9,1.37l-0.86,2.58C16.26,11.55 17,12.68 17,14v8H20zM12.5,11.5c0.83,0 1.5,-0.67 1.5,-1.5s-0.67,-1.5 -1.5,-1.5S11,9.17 11,10S11.67,11.5 12.5,11.5zM5.5,6c1.11,0 2,-0.89 2,-2s-0.89,-2 -2,-2s-2,0.89 -2,2S4.39,6 5.5,6zM7.5,22v-7H9V9c0,-1.1 -0.9,-2 -2,-2H4C2.9,7 2,7.9 2,9v6h1.5v7H7.5zM14,22v-4h1v-4c0,-0.82 -0.68,-1.5 -1.5,-1.5h-2c-0.82,0 -1.5,0.68 -1.5,1.5v4h1v4H14z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_all_about.xml b/app/src/main/res/drawable/ic_all_about.xml
index 3868f85c6..3dfbbda19 100644
--- a/app/src/main/res/drawable/ic_all_about.xml
+++ b/app/src/main/res/drawable/ic_all_about.xml
@@ -2,7 +2,6 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:tint="?colorOnSurface"
     android:viewportHeight="24">
     <path
         android:fillColor="#FFF"
diff --git a/app/src/main/res/drawable/ic_all_round_check.xml b/app/src/main/res/drawable/ic_all_round_check.xml
deleted file mode 100644
index aecaf234a..000000000
--- a/app/src/main/res/drawable/ic_all_round_check.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_main_timetable.xml b/app/src/main/res/drawable/ic_main_timetable.xml
index e33aae165..b8f5cb855 100644
--- a/app/src/main/res/drawable/ic_main_timetable.xml
+++ b/app/src/main/res/drawable/ic_main_timetable.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FFF"
-        android:pathData="M14,12H15.5V14.82L17.94,16.23L17.19,17.53L14,15.69V12M4,2H18A2,2 0 0,1 20,4V10.1C21.24,11.36 22,13.09 22,15A7,7 0 0,1 15,22C13.09,22 11.36,21.24 10.1,20H4A2,2 0 0,1 2,18V4A2,2 0 0,1 4,2M4,15V18H8.67C8.24,17.09 8,16.07 8,15H4M4,8H10V5H4V8M18,8V5H12V8H18M4,13H8.29C8.63,11.85 9.26,10.82 10.1,10H4V13M15,10.15A4.85,4.85 0 0,0 10.15,15C10.15,17.68 12.32,19.85 15,19.85A4.85,4.85 0 0,0 19.85,15C19.85,12.32 17.68,10.15 15,10.15Z" />
+        android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,9h14v10zM5,7L5,5h14v2L5,7zM7,11h10v2L7,13zM7,15h7v2L7,17z" />
 </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
deleted file mode 100644
index 204b0f6e3..000000000
--- a/app/src/main/res/drawable/ic_menu_message_print.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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
deleted file mode 100644
index 67a8ee494..000000000
--- a/app/src/main/res/drawable/ic_menu_message_share.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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_menu_timetable_lessons_additional.xml b/app/src/main/res/drawable/ic_menu_timetable_lessons_additional.xml
deleted file mode 100644
index ddb6d2f57..000000000
--- a/app/src/main/res/drawable/ic_menu_timetable_lessons_additional.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="M6,1L6,3L5,3C3.89,3 3,3.89 3,5v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.89 2,-2L21,5C21,3.9 20.11,3 19,3L18,3L18,1L16,1L16,3L8,3L8,1ZM5,5L19,5L19,7L5,7ZM5,9L19,9L19,19L5,19ZM11,10v3L8,13v2h3v3h2v-3h3v-2h-3v-3z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_more_conferences.xml b/app/src/main/res/drawable/ic_more_conferences.xml
deleted file mode 100644
index 87be8e055..000000000
--- a/app/src/main/res/drawable/ic_more_conferences.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#FF000000"
-        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_phone.xml b/app/src/main/res/drawable/ic_school_phone.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_all_phone.xml
rename to app/src/main/res/drawable/ic_school_phone.xml
diff --git a/app/src/main/res/drawable/ic_settings_advanced.xml b/app/src/main/res/drawable/ic_settings_advanced.xml
deleted file mode 100644
index 2fd7e5907..000000000
--- a/app/src/main/res/drawable/ic_settings_advanced.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?colorOnSurface"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M14.17,13.71l1.4,-2.42c0.09,-0.15 0.05,-0.34 -0.08,-0.45l-1.48,-1.16c0.03,-0.22 0.05,-0.45 0.05,-0.68s-0.02,-0.46 -0.05,-0.69l1.48,-1.16c0.13,-0.11 0.17,-0.3 0.08,-0.45l-1.4,-2.42c-0.09,-0.15 -0.27,-0.21 -0.43,-0.15L12,4.83c-0.36,-0.28 -0.75,-0.51 -1.18,-0.69l-0.26,-1.85C10.53,2.13 10.38,2 10.21,2h-2.8C7.24,2 7.09,2.13 7.06,2.3L6.8,4.15C6.38,4.33 5.98,4.56 5.62,4.84l-1.74,-0.7c-0.16,-0.06 -0.34,0 -0.43,0.15l-1.4,2.42C1.96,6.86 2,7.05 2.13,7.16l1.48,1.16C3.58,8.54 3.56,8.77 3.56,9s0.02,0.46 0.05,0.69l-1.48,1.16C2,10.96 1.96,11.15 2.05,11.3l1.4,2.42c0.09,0.15 0.27,0.21 0.43,0.15l1.74,-0.7c0.36,0.28 0.75,0.51 1.18,0.69l0.26,1.85C7.09,15.87 7.24,16 7.41,16h2.8c0.17,0 0.32,-0.13 0.35,-0.3l0.26,-1.85c0.42,-0.18 0.82,-0.41 1.18,-0.69l1.74,0.7C13.9,13.92 14.08,13.86 14.17,13.71zM8.81,11c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C10.81,10.1 9.91,11 8.81,11z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M21.92,18.67l-0.96,-0.74c0.02,-0.14 0.04,-0.29 0.04,-0.44c0,-0.15 -0.01,-0.3 -0.04,-0.44l0.95,-0.74c0.08,-0.07 0.11,-0.19 0.05,-0.29l-0.9,-1.55c-0.05,-0.1 -0.17,-0.13 -0.28,-0.1l-1.11,0.45c-0.23,-0.18 -0.48,-0.33 -0.76,-0.44l-0.17,-1.18C18.73,13.08 18.63,13 18.53,13h-1.79c-0.11,0 -0.21,0.08 -0.22,0.19l-0.17,1.18c-0.27,0.12 -0.53,0.26 -0.76,0.44l-1.11,-0.45c-0.1,-0.04 -0.22,0 -0.28,0.1l-0.9,1.55c-0.05,0.1 -0.04,0.22 0.05,0.29l0.95,0.74c-0.02,0.14 -0.03,0.29 -0.03,0.44c0,0.15 0.01,0.3 0.03,0.44l-0.95,0.74c-0.08,0.07 -0.11,0.19 -0.05,0.29l0.9,1.55c0.05,0.1 0.17,0.13 0.28,0.1l1.11,-0.45c0.23,0.18 0.48,0.33 0.76,0.44l0.17,1.18c0.02,0.11 0.11,0.19 0.22,0.19h1.79c0.11,0 0.21,-0.08 0.22,-0.19l0.17,-1.18c0.27,-0.12 0.53,-0.26 0.75,-0.44l1.12,0.45c0.1,0.04 0.22,0 0.28,-0.1l0.9,-1.55C22.03,18.86 22,18.74 21.92,18.67zM17.63,18.83c-0.74,0 -1.35,-0.6 -1.35,-1.35s0.6,-1.35 1.35,-1.35s1.35,0.6 1.35,1.35S18.37,18.83 17.63,18.83z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_appearance.xml b/app/src/main/res/drawable/ic_settings_appearance.xml
deleted file mode 100644
index afea27f27..000000000
--- a/app/src/main/res/drawable/ic_settings_appearance.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?colorOnSurface"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6 -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.12 0.05,0.23 0.13,0.33 0.41,0.47 0.64,1.06 0.64,1.67 0,1.38 -1.12,2.5 -2.5,2.5zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22 0.5,-0.5 0,-0.16 -0.08,-0.28 -0.14,-0.35 -0.41,-0.46 -0.63,-1.05 -0.63,-1.65 0,-1.38 1.12,-2.5 2.5,-2.5L16,15c2.21,0 4,-1.79 4,-4 0,-3.86 -3.59,-7 -8,-7z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M14.5,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M17.5,11.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_notifications.xml b/app/src/main/res/drawable/ic_settings_notifications.xml
deleted file mode 100644
index f4ff247f4..000000000
--- a/app/src/main/res/drawable/ic_settings_notifications.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?colorOnSurface"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_sync.xml b/app/src/main/res/drawable/ic_settings_sync.xml
deleted file mode 100644
index 3697ac0ba..000000000
--- a/app/src/main/res/drawable/ic_settings_sync.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?colorOnSurface"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index 10b581f77..e0ec52bb6 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -194,8 +194,9 @@
             tools:text="No messages" />
     </LinearLayout>
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/sendMessageProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true"
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
new file mode 100644
index 000000000..6e975c80d
--- /dev/null
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="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"
+        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" />
+
+    <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" />
+
+    <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_margin="8dp"
+        android:text="@string/account_logout" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_account_edit.xml b/app/src/main/res/layout/dialog_account_edit.xml
deleted file mode 100644
index 9f617e440..000000000
--- a/app/src/main/res/layout/dialog_account_edit.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/accountEditDetailsHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
-            android:text="@string/account_edit_header"
-            android:textSize="21sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/accountEditDetailsNick"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="28dp"
-            android:layout_marginEnd="24dp"
-            android:hint="@string/account_edit_nick_hint"
-            app:endIconMode="clear_text"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/accountEditDetailsHeader">
-
-            <requestFocus />
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/accountEditDetailsNickText"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:inputType="textPersonName"
-                android:maxLength="20" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <TextView
-            android:id="@+id/accountEditDetailsSecondHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="28dp"
-            android:layout_marginEnd="24dp"
-            android:text="@string/account_edit_avatar_title"
-            android:textSize="21sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/accountEditDetailsNick" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/account_edit_colors"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="14dp"
-            android:layout_marginEnd="24dp"
-            android:overScrollMode="never"
-            android:scrollbars="none"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/accountEditDetailsSecondHeader"
-            tools:itemCount="12"
-            tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            tools:listitem="@layout/item_account_edit_color"
-            tools:spanCount="4" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/accountEditDetailsSave"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            android:minWidth="88dp"
-            android:text="@string/all_save"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/account_edit_colors" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/accountEditDetailsCancel"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            android:minWidth="88dp"
-            android:text="@android:string/cancel"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/accountEditDetailsSave"
-            app:layout_constraintTop_toBottomOf="@id/account_edit_colors" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/dialog_account_quick.xml b/app/src/main/res/layout/dialog_account_quick.xml
deleted file mode 100644
index 4095c91ae..000000000
--- a/app/src/main/res/layout/dialog_account_quick.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        tools:ignore="UselessParent">
-
-        <TextView
-            android:id="@+id/account_quick_dialog_title"
-            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_quick_title"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            app:firstBaselineToTopHeight="40dp" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/account_quick_dialog_recycler"
-            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/account_quick_dialog_manger"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:text="@string/account_quick_manager" />
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index 680f57197..7b1286053 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -86,8 +86,9 @@
                 android:text="@string/all_close" />
         </LinearLayout>
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/mobileDeviceDialogProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
deleted file mode 100644
index b78738338..000000000
--- a/app/src/main/res/layout/fragment_account.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/accountRecycler"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/accountAdd"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/item_account" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/accountAdd"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="16dp"
-        android:insetLeft="0dp"
-        android:insetTop="0dp"
-        android:insetRight="0dp"
-        android:insetBottom="0dp"
-        android:text="@string/account_add_new"
-        app:layout_constraintBottom_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_account_details.xml b/app/src/main/res/layout/fragment_account_details.xml
deleted file mode 100644
index af9564b5e..000000000
--- a/app/src/main/res/layout/fragment_account_details.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/account_details_progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/account_details_error"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="gone">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_all_account"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/account_details_error_message"
-            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/account_details_error_details"
-                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/account_details_error_retry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/account_details_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:fillViewport="true"
-            app:layout_constraintBottom_toTopOf="@id/accountDetailsSelect"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <ImageView
-                    android:id="@+id/accountDetailsAvatar"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:layout_marginTop="36dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:ignore="ContentDescription"
-                    tools:src="@tools:sample/avatars" />
-
-                <com.mikhaellopez.circularimageview.CircularImageView
-                    android:id="@+id/account_details_check"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="70dp"
-                    android:layout_marginTop="70dp"
-                    app:civ_border_color="?colorSurface"
-                    app:civ_border_width="1dp"
-                    app:civ_circle_color="?colorSurface"
-                    app:layout_constraintStart_toStartOf="@id/accountDetailsAvatar"
-                    app:layout_constraintTop_toTopOf="@id/accountDetailsAvatar"
-                    app:srcCompat="@drawable/ic_all_round_check"
-                    app:tint="?colorPrimary" />
-
-                <TextView
-                    android:id="@+id/accountDetailsName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:textSize="24sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/accountDetailsAvatar"
-                    tools:text="Jan Kowalski" />
-
-                <TextView
-                    android:id="@+id/accountDetailsSchool"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="14sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/accountDetailsName"
-                    tools:text="Szkoła FakeLog" />
-
-                <LinearLayout
-                    android:id="@+id/accountDetailsPersonalData"
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:layout_marginTop="16dp"
-                    android:background="?selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:orientation="horizontal"
-                    app:layout_constraintTop_toBottomOf="@id/accountDetailsSchool"
-                    tools:ignore="UseCompoundDrawables">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="16dp"
-                        app:srcCompat="@drawable/ic_all_account"
-                        app:tint="?colorOnBackground"
-                        tools:ignore="ContentDescription" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="32dp"
-                        android:layout_marginEnd="16dp"
-                        android:gravity="center_vertical"
-                        android:text="@string/account_personal_data"
-                        android:textSize="16sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/accountDetailsAddressData"
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:background="?selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:orientation="horizontal"
-                    app:layout_constraintTop_toBottomOf="@id/accountDetailsPersonalData"
-                    tools:ignore="UseCompoundDrawables">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="16dp"
-                        app:srcCompat="@drawable/ic_all_home"
-                        app:tint="?colorOnBackground"
-                        tools:ignore="ContentDescription" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="32dp"
-                        android:layout_marginEnd="16dp"
-                        android:gravity="center_vertical"
-                        android:text="@string/account_address"
-                        android:textSize="16sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/accountDetailsContactData"
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:background="?selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:orientation="horizontal"
-                    app:layout_constraintTop_toBottomOf="@id/accountDetailsAddressData"
-                    tools:ignore="UseCompoundDrawables">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="16dp"
-                        app:srcCompat="@drawable/ic_all_phone"
-                        app:tint="?colorOnBackground"
-                        tools:ignore="ContentDescription" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="32dp"
-                        android:layout_marginEnd="16dp"
-                        android:gravity="center_vertical"
-                        android:text="@string/account_contact"
-                        android:textSize="16sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/accountDetailsFamilyData"
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp"
-                    android:background="?selectableItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:orientation="horizontal"
-                    app:layout_constraintTop_toBottomOf="@id/accountDetailsContactData"
-                    tools:ignore="UseCompoundDrawables">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="16dp"
-                        app:srcCompat="@drawable/ic_account_details_family"
-                        app:tint="?colorOnBackground"
-                        tools:ignore="ContentDescription" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="32dp"
-                        android:layout_marginEnd="16dp"
-                        android:gravity="center_vertical"
-                        android:text="@string/account_family"
-                        android:textSize="16sp" />
-                </LinearLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </ScrollView>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/accountDetailsSelect"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            android:text="@string/account_select_student"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/accountDetailsLogout" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/accountDetailsLogout"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            android:text="@string/account_logout"
-            app:layout_constraintBottom_toBottomOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 8016081b8..39b00d306 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -10,8 +10,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/attendanceProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_attendance_summary.xml b/app/src/main/res/layout/fragment_attendance_summary.xml
index 613ea5063..da0ce7f28 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -49,8 +49,9 @@
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/attendanceSummaryProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_conference.xml b/app/src/main/res/layout/fragment_conference.xml
deleted file mode 100644
index 730b46d55..000000000
--- a/app/src/main/res/layout/fragment_conference.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<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"
-    tools:context=".ui.modules.conference.ConferenceFragment">
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/conferenceProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/conferenceSwipe"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/conferenceRecycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_conference" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <LinearLayout
-        android:id="@+id/conferenceEmpty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:visibility="gone"
-        tools:ignore="UseCompoundDrawables">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_more_conferences"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="@string/conference_no_items"
-            android:textSize="20sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/conferenceError"
-        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/conferenceErrorMessage"
-            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/conferenceErrorDetails"
-                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/conferenceErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_contributor.xml b/app/src/main/res/layout/fragment_contributor.xml
index 8b71ffed1..399ab5999 100644
--- a/app/src/main/res/layout/fragment_contributor.xml
+++ b/app/src/main/res/layout/fragment_contributor.xml
@@ -1,11 +1,11 @@
 <?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">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <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"
@@ -20,18 +20,17 @@
             android:id="@+id/creatorRecycler"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
-            tools:listitem="@layout/item_contributor" />
+            android:layout_weight="1" />
 
         <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"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="32dp"
             android:layout_marginBottom="8dp"
+            android:layout_marginLeft="32dp"
+            android:layout_marginRight="32dp"
             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 ca88849c5..ed4094a50 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -10,8 +10,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/examProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index ed0447fb5..0bc864b2d 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -25,8 +25,9 @@
         android:visibility="invisible"
         tools:visibility="visible" />
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index c1b88580a..a1faefe7a 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -17,8 +17,9 @@
             tools:listitem="@layout/item_grade_details" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeDetailsProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index 3bd57b4b1..b3fcac448 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.modules.grade.statistics.GradeStatisticsFragment">
 
     <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
         android:id="@+id/gradeStatisticsSubjectsContainer"
@@ -11,8 +12,7 @@
         android:layout_height="wrap_content"
         android:background="?android:windowBackground"
         android:padding="5dp"
-        android:visibility="visible"
-        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"
         tools:ignore="UnusedAttribute"
         tools:listitem="@layout/item_attendance_summary"
         tools:visibility="visible">
@@ -34,101 +34,154 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeStatisticsSwipe"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
-        <FrameLayout
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/gradeStatisticsScroll"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:fillViewport="true">
 
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/gradeStatisticsProgress"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                tools:visibility="gone" />
+                android:orientation="vertical">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/gradeStatisticsRecycler"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:listitem="@layout/item_grade_statistics_pie" />
-
-            <LinearLayout
-                android:id="@+id/gradeStatisticsEmpty"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="invisible"
-                tools:ignore="UseCompoundDrawables">
-
-                <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    app:srcCompat="@drawable/ic_main_grade"
-                    app:tint="?colorOnBackground"
-                    tools:ignore="contentDescription" />
-
-                <TextView
+                <HorizontalScrollView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:gravity="center"
-                    android:text="@string/grade_no_items"
-                    android:textSize="20sp" />
-            </LinearLayout>
+                    android:layout_gravity="center">
 
-            <LinearLayout
-                android:id="@+id/gradeStatisticsError"
-                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">
+                    <RadioGroup
+                        android:id="@+id/gradeStatisticsTypeSwitch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingStart="16dp"
+                        android:paddingTop="5dp"
+                        android:paddingEnd="16dp">
 
-                <ImageView
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    app:srcCompat="@drawable/ic_error"
-                    app:tint="?colorOnBackground"
-                    tools:ignore="contentDescription" />
+                        <com.google.android.material.radiobutton.MaterialRadioButton
+                            android:id="@+id/gradeStatisticsTypePartial"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:checked="true"
+                            android:tag="partial"
+                            android:text="@string/grade_statistics_partial" />
 
-                <TextView
-                    android:id="@+id/gradeStatisticsErrorMessage"
-                    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" />
+                        <com.google.android.material.radiobutton.MaterialRadioButton
+                            android:id="@+id/gradeStatisticsTypeSemester"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:tag="annual"
+                            android:text="@string/grade_statistics_semester" />
 
-                <LinearLayout
+                        <com.google.android.material.radiobutton.MaterialRadioButton
+                            android:id="@+id/gradeStatisticsTypePoints"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:tag="points"
+                            android:text="@string/grade_statistics_points" />
+                    </RadioGroup>
+                </HorizontalScrollView>
+
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center"
-                    android:orientation="horizontal">
+                    android:layout_height="match_parent">
 
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/gradeStatisticsErrorDetails"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/gradeStatisticsRecycler"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        tools:listitem="@layout/item_grade_statistics_pie" />
+
+                    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+                        android:id="@+id/gradeStatisticsProgress"
+                        style="@style/Widget.MaterialProgressBar.ProgressBar"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
-                        android:text="@string/all_details" />
+                        android:layout_gravity="center"
+                        android:indeterminate="true"
+                        tools:visibility="gone" />
 
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/gradeStatisticsErrorRetry"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/all_retry" />
-                </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/gradeStatisticsEmpty"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:visibility="invisible"
+                        tools:ignore="UseCompoundDrawables">
+
+                        <ImageView
+                            android:layout_width="100dp"
+                            android:layout_height="100dp"
+                            app:srcCompat="@drawable/ic_main_grade"
+                            app:tint="?colorOnBackground"
+                            tools:ignore="contentDescription" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:gravity="center"
+                            android:text="@string/grade_no_items"
+                            android:textSize="20sp" />
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:id="@+id/gradeStatisticsError"
+                        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/gradeStatisticsErrorMessage"
+                            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/gradeStatisticsErrorDetails"
+                                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/gradeStatisticsErrorRetry"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/all_retry" />
+                        </LinearLayout>
+                    </LinearLayout>
+                </FrameLayout>
             </LinearLayout>
-        </FrameLayout>
+        </androidx.core.widget.NestedScrollView>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index a3425513d..3f21e61c7 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -17,8 +17,9 @@
             tools:listitem="@layout/item_grade_summary" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/gradeSummaryProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index c0b5698d5..26381da6a 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -10,8 +10,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/homeworkProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
index 5551d4f19..80ecd6b10 100644
--- a/app/src/main/res/layout/fragment_license.xml
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -1,11 +1,11 @@
 <?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">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/licenseProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -14,6 +14,5 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/licenseRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/item_license" />
+        android:layout_height="match_parent" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index c7acaa70b..65af0b543 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.advanced.LoginAdvancedFragment">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginFormProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index fb0e138e9..d91d7b037 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.form.LoginFormFragment">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginFormProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -237,7 +238,9 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="48dp"
                 android:layout_marginEnd="24dp"
+                android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
 
diff --git a/app/src/main/res/layout/fragment_login_recover.xml b/app/src/main/res/layout/fragment_login_recover.xml
index 76bdad228..205a4bea3 100644
--- a/app/src/main/res/layout/fragment_login_recover.xml
+++ b/app/src/main/res/layout/fragment_login_recover.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.recover.LoginRecoverFragment">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <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"
@@ -25,7 +26,8 @@
             android:id="@+id/loginRecoverFormContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="16dp">
+            android:paddingBottom="16dp"
+            android:visibility="visible">
 
             <TextView
                 android:id="@+id/loginFormHeader"
@@ -84,9 +86,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="emailAddress"
-                    android:imeOptions="actionDone"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
+                    android:imeOptions="actionDone"
                     tools:targetApi="o" />
 
                 <requestFocus />
@@ -155,7 +157,7 @@
         android:orientation="vertical"
         android:visibility="invisible"
         tools:ignore="UseCompoundDrawables"
-        tools:visibility="visible">
+        tools:visibility="invisible">
 
         <ImageView
             android:layout_width="100dp"
@@ -174,10 +176,12 @@
             android:text="@string/error_unknown"
             android:textSize="20sp" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp">
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:orientation="horizontal">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginRecoverErrorDetails"
@@ -186,21 +190,14 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
-                android:text="@string/all_details"
-                app:layout_constraintEnd_toStartOf="@id/loginRecoverErrorRetry"
-                app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                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"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/loginRecoverErrorDetails"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                android:text="@string/all_retry" />
+        </LinearLayout>
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
@@ -210,7 +207,7 @@
         android:fillViewport="true"
         android:scrollbars="none"
         android:visibility="invisible"
-        tools:visibility="gone">
+        tools:visibility="invisible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -257,5 +254,6 @@
                 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 bf5431164..f9c6c1572 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginStudentSelectProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index f1c9be4a0..77f44d213 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.login.symbol.LoginSymbolFragment">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/loginSymbolProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
index b2d4f40ab..a6b9b8221 100644
--- a/app/src/main/res/layout/fragment_lucky_number.xml
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -5,8 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/luckyNumberProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -67,26 +68,6 @@
             android:textSize="20sp" />
     </LinearLayout>
 
-
-    <LinearLayout
-        android:id="@+id/luckyNumberHistory"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="visible"
-        android:gravity="bottom"
-        android:orientation="vertical">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/luckyNumberHistoryButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginBottom="15dp"
-            android:text="@string/lucky_number_history_button" />
-
-    </LinearLayout>
-
     <LinearLayout
         android:id="@+id/luckyNumberError"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_lucky_number_history.xml b/app/src/main/res/layout/fragment_lucky_number_history.xml
deleted file mode 100644
index 5f50d1261..000000000
--- a/app/src/main/res/layout/fragment_lucky_number_history.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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">
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/luckyNumberHistoryProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        tools:visibility="invisible" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/luckyNumberHistoryRecycler"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/item_lucky_number_history"/>
-
-
-    <LinearLayout
-        android:id="@+id/luckyNumberHistoryEmpty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:visibility="gone"
-        tools:ignore="UseCompoundDrawables">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_more_lucky_number"
-            app:tint="?colorOnBackground"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="@string/lucky_number_history_empty"
-            android:textSize="20sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/luckyNumberHistoryError"
-        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/luckyNumberHistoryErrorMessage"
-            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/luckyNumberHistoryErrorDetails"
-                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/luckyNumberHistoryErrorRetry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
-        android:id="@+id/luckyNumberHistoryNavContainer"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_gravity="bottom"
-        android:gravity="center"
-        android:orientation="horizontal"
-        tools:ignore="UnusedAttribute">
-
-        <ImageButton
-            android:id="@+id/luckyNumberHistoryPreviousButton"
-            android:layout_width="wrap_content"
-            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" />
-
-        <TextView
-            android:id="@+id/luckyNumberHistoryNavDate"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?selectableItemBackgroundBorderless"
-            android:fontFamily="sans-serif"
-            android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
-
-        <ImageButton
-            android:id="@+id/luckyNumberHistoryNextButton"
-            android:layout_width="wrap_content"
-            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" />
-    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index a61f37381..b4cc0c2fe 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -39,8 +39,9 @@
         android:tint="?colorOnSecondary"
         app:icon="@drawable/ic_menu_message_write" />
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messageProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 4b15cf108..0931990f6 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -62,8 +62,9 @@
         </LinearLayout>
     </LinearLayout>
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messagePreviewProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_message_tab.xml b/app/src/main/res/layout/fragment_message_tab.xml
index 4a6948f09..e83d913e9 100644
--- a/app/src/main/res/layout/fragment_message_tab.xml
+++ b/app/src/main/res/layout/fragment_message_tab.xml
@@ -16,8 +16,9 @@
             tools:listitem="@layout/item_message" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/messageTabProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_mobile_device.xml b/app/src/main/res/layout/fragment_mobile_device.xml
index afe1db8e0..cf11c2831 100644
--- a/app/src/main/res/layout/fragment_mobile_device.xml
+++ b/app/src/main/res/layout/fragment_mobile_device.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.mobiledevice.MobileDeviceFragment">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/mobileDevicesProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index f62a11a64..e55f0007f 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/noteProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_school.xml b/app/src/main/res/layout/fragment_school.xml
index 32be61db8..a7e9a213b 100644
--- a/app/src/main/res/layout/fragment_school.xml
+++ b/app/src/main/res/layout/fragment_school.xml
@@ -5,8 +5,9 @@
     android:layout_height="match_parent"
     tools:context=".ui.modules.schoolandteachers.school.SchoolFragment">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/schoolProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -139,7 +140,7 @@
                     android:id="@+id/schoolTelephoneButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:srcCompat="@drawable/ic_all_phone"
+                    app:srcCompat="@drawable/ic_school_phone"
                     android:contentDescription="@string/school_telephone_button"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:tint="?colorPrimary"
diff --git a/app/src/main/res/layout/fragment_schoolandteachers.xml b/app/src/main/res/layout/fragment_schoolandteachers.xml
index f9fec1dd9..6414abb92 100644
--- a/app/src/main/res/layout/fragment_schoolandteachers.xml
+++ b/app/src/main/res/layout/fragment_schoolandteachers.xml
@@ -27,8 +27,9 @@
         android:layout_marginTop="48dp"
         android:visibility="invisible" />
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/schoolandteachersProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_student_info.xml b/app/src/main/res/layout/fragment_student_info.xml
deleted file mode 100644
index 5970e2fc4..000000000
--- a/app/src/main/res/layout/fragment_student_info.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/student_info_progress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:layout_width="match_parent"
-        android:id="@+id/student_info_swipe"
-        android:layout_height="match_parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/student_info_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <LinearLayout
-        android:id="@+id/student_info_empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:visibility="gone"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="visible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_all_about"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="center"
-            android:text="@string/student_info_empty"
-            android:textSize="20sp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/student_info_error"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="invisible"
-        tools:ignore="UseCompoundDrawables"
-        tools:visibility="visible">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:srcCompat="@drawable/ic_error"
-            app:tint="?colorOnBackground"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:id="@+id/student_info_error_message"
-            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/student_info_error_details"
-                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/student_info_error_retry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
-        </LinearLayout>
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_teacher.xml b/app/src/main/res/layout/fragment_teacher.xml
index ef27d2c47..484bf0651 100644
--- a/app/src/main/res/layout/fragment_teacher.xml
+++ b/app/src/main/res/layout/fragment_teacher.xml
@@ -4,8 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
         android:id="@+id/teacherProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index df33b289e..533af2fa1 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -10,8 +10,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/timetableProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_timetable_additional.xml b/app/src/main/res/layout/fragment_timetable_additional.xml
deleted file mode 100644
index 61eb44454..000000000
--- a/app/src/main/res/layout/fragment_timetable_additional.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<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.timetable.additional.AdditionalLessonsFragment">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="50dp">
-
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/additionalLessonsProgress"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:indeterminate="true" />
-
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/additionalLessonsSwipe"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/additionalLessonsRecycler"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:listitem="@layout/item_timetable_additional" />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-        <LinearLayout
-            android:id="@+id/additionalLessonsEmpty"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="10dp"
-            android:visibility="gone">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/additionalLessonsInfoImage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minWidth="100dp"
-                android:minHeight="100dp"
-                app:srcCompat="@drawable/ic_menu_timetable_lessons_additional"
-                app:tint="?android:attr/textColorPrimary"
-                tools:ignore="contentDescription" />
-
-            <TextView
-                android:id="@+id/additionalLessonsInfo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:gravity="center"
-                android:text="@string/additional_lessons_no_items"
-                android:textSize="20sp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/additionalLessonsError"
-            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/additionalLessonsErrorMessage"
-                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/additionalLessonsErrorDetails"
-                    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/additionalLessonsErrorRetry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/all_retry" />
-            </LinearLayout>
-        </LinearLayout>
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <io.github.wulkanowy.ui.widgets.MaterialLinearLayout
-        android:id="@+id/additionalLessonsNavContainer"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_gravity="bottom"
-        android:gravity="center"
-        android:orientation="horizontal"
-        tools:ignore="UnusedAttribute">
-
-        <ImageButton
-            android:id="@+id/additionalLessonsPreviousButton"
-            android:layout_width="wrap_content"
-            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" />
-
-        <TextView
-            android:id="@+id/additionalLessonsNavDate"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="?selectableItemBackgroundBorderless"
-            android:fontFamily="sans-serif"
-            android:gravity="center"
-            android:textSize="16sp"
-            tools:text="@tools:sample/date/ddmmyy" />
-
-        <ImageButton
-            android:id="@+id/additionalLessonsNextButton"
-            android:layout_width="wrap_content"
-            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" />
-    </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
-</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 1a890fe12..4934327c5 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -10,8 +10,9 @@
         android:layout_height="match_parent"
         android:layout_marginBottom="50dp">
 
-        <com.google.android.material.progressindicator.CircularProgressIndicator
+        <me.zhanghai.android.materialprogressbar.MaterialProgressBar
             android:id="@+id/completedLessonsProgress"
+            style="@style/Widget.MaterialProgressBar.ProgressBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/header_account.xml b/app/src/main/res/layout/header_account.xml
deleted file mode 100644
index 862525522..000000000
--- a/app/src/main/res/layout/header_account.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="16dp"
-    android:paddingBottom="16dp"
-    tools:context=".ui.modules.account.AccountAdapter">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:id="@+id/accountHeaderDivider"
-        android:layout_marginTop="16dp"
-        android:background="@color/colorDivider" />
-
-    <TextView
-        android:id="@+id/accountHeaderEmail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        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:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="Konto ucznia" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml
index 6a95e5529..f988c47ba 100644
--- a/app/src/main/res/layout/item_about.xml
+++ b/app/src/main/res/layout/item_about.xml
@@ -33,8 +33,7 @@
     <TextView
         android:id="@+id/aboutItemSummary"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="20dp"
+        android:layout_height="20dp"
         android:layout_below="@id/aboutItemTitle"
         android:layout_marginEnd="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 563e6b1e9..614e4d2df 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -3,42 +3,31 @@
     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:layout_height="56dp"
     android:background="?selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
     android:orientation="horizontal"
-    android:paddingHorizontal="16dp"
-    android:paddingVertical="8dp"
+    android:paddingStart="24dp"
+    android:paddingLeft="24dp"
+    android:paddingEnd="24dp"
+    android:paddingRight="24dp"
     tools:context=".ui.modules.account.AccountAdapter">
 
     <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_all_account"
         tools:ignore="ContentDescription"
-        tools:src="@tools:sample/avatars" />
-
-    <com.mikhaellopez.circularimageview.CircularImageView
-        android:id="@+id/account_item_check"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="28dp"
-        app:civ_border_width="1dp"
-        app:layout_constraintStart_toStartOf="@id/accountItemImage"
-        app:layout_constraintTop_toTopOf="@id/accountItemImage"
-        app:srcCompat="@drawable/ic_all_round_check"
-        app:tint="?colorPrimary" />
+        tools:tint="@color/colorPrimary" />
 
     <TextView
         android:id="@+id/accountItemName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="20dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
@@ -51,9 +40,8 @@
         android:id="@+id/accountItemSchool"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
@@ -62,21 +50,4 @@
         app:layout_constraintStart_toEndOf="@id/accountItemImage"
         app:layout_constraintTop_toBottomOf="@id/accountItemName"
         tools:text="@tools:sample/lorem/random" />
-
-    <TextView
-        android:id="@+id/accountItemAccountType"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="3dp"
-        android:layout_marginEnd="16dp"
-        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/accountItemSchool"
-        tools:text="Tryb API mobilne"
-        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_account_edit_color.xml b/app/src/main/res/layout/item_account_edit_color.xml
deleted file mode 100644
index c701f28da..000000000
--- a/app/src/main/res/layout/item_account_edit_color.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<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:id="@+id/account_edit_item_color_container"
-    android:layout_width="48dp"
-    android:layout_height="48dp"
-    android:layout_marginTop="10dp"
-    android:layout_marginEnd="10dp"
-    android:clickable="true"
-    android:focusable="true">
-
-    <ImageView
-        android:id="@+id/account_edit_item_color"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:ignore="ContentDescription"
-        tools:src="@tools:sample/avatars" />
-
-    <ImageView
-        android:id="@+id/account_edit_check"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="center"
-        app:srcCompat="@drawable/ic_check"
-        app:tint="@android:color/white"
-        tools:ignore="ContentDescription" />
-</FrameLayout>
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index e25b51f69..6917c6ce0 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -1,4 +1,4 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/attendanceItemContainer"
@@ -15,17 +15,10 @@
 
     <LinearLayout
         android:id="@+id/attendanceItemNumberContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="40dp"
-        android:minHeight="40dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:gravity="center"
-        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">
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/attendanceItemNumber"
@@ -55,52 +48,38 @@
             app:tint="?attr/colorOnSurface" />
     </LinearLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/attendanceItemDetailsContainer"
-        android:layout_width="0dp"
+    <TextView
+        android:id="@+id/attendanceItemSubject"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        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">
+        android:layout_marginEnd="40dp"
+        android:layout_toStartOf="@id/attendanceItemAlert"
+        android:layout_toEndOf="@+id/attendanceItemNumberContainer"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="17sp"
+        tools:text="Matematyka" />
 
-        <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>
+    <TextView
+        android:id="@+id/attendanceItemDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@id/attendanceItemSubject"
+        android:layout_alignBottom="@+id/attendanceItemNumberContainer"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Present" />
 
     <ImageView
         android:id="@+id/attendanceItemAlert"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        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"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="10dp"
         app:srcCompat="@drawable/ic_all_mark"
         app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
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 ff731461d..263c08a73 100644
--- a/app/src/main/res/layout/item_attendance_summary_subject.xml
+++ b/app/src/main/res/layout/item_attendance_summary_subject.xml
@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceSummaryItemSubject"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="48dp"
+    android:layout_height="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 e9944f56f..b9beec804 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -12,11 +12,8 @@
 
     <TextView
         android:id="@+id/completedLessonItemNumber"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:minWidth="40dp"
-        android:minHeight="40dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_centerVertical="true"
         android:gravity="center"
         android:includeFontPadding="false"
@@ -43,9 +40,9 @@
         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_alignEnd="@+id/completedLessonItemAlert"
+        android:layout_alignBottom="@+id/completedLessonItemNumber"
         android:layout_marginEnd="40dp"
         android:ellipsize="end"
         android:maxLines="1"
@@ -59,7 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="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_conference.xml b/app/src/main/res/layout/item_conference.xml
deleted file mode 100644
index 4c881f344..000000000
--- a/app/src/main/res/layout/item_conference.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<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/conference_item_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    tools:context=".ui.modules.conference.ConferenceAdapter">
-
-    <TextView
-        android:id="@+id/conferenceItemDate"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="10dp"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="15sp"
-        app:layout_constraintRight_toLeftOf="@+id/conferenceItemName"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/date/ddmmyy" />
-
-    <TextView
-        android:id="@+id/conferenceItemName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="15dp"
-        android:ellipsize="end"
-        android:gravity="end"
-        android:singleLine="true"
-        android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/conferenceItemDate"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
-
-    <TextView
-        android:id="@+id/conferenceItemTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="@id/conferenceItemName"
-        app:layout_constraintStart_toStartOf="@id/conferenceItemDate"
-        app:layout_constraintTop_toBottomOf="@id/conferenceItemDate"
-        app:layout_goneMarginEnd="0dp"
-        tools:text="@tools:sample/lorem" />
-
-    <TextView
-        android:id="@+id/conferenceItemSubject"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textSize="16sp"
-        app:layout_constraintBottom_toTopOf="@id/conferenceItemContent"
-        app:layout_constraintEnd_toEndOf="@id/conferenceItemTitle"
-        app:layout_constraintStart_toStartOf="@id/conferenceItemTitle"
-        app:layout_constraintTop_toBottomOf="@id/conferenceItemTitle"
-        app:layout_goneMarginBottom="15dp"
-        app:layout_goneMarginEnd="0dp"
-        tools:text="@tools:sample/lorem" />
-
-    <TextView
-        android:id="@+id/conferenceItemContent"
-        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_constraintEnd_toEndOf="@+id/conferenceItemName"
-        app:layout_constraintStart_toStartOf="@id/conferenceItemDate"
-        app:layout_constraintTop_toBottomOf="@id/conferenceItemSubject"
-        tools:text="@tools:sample/lorem/random"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
index 9b1263438..36eb64ecc 100644
--- a/app/src/main/res/layout/item_contributor.xml
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -15,8 +15,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:contentDescription="@string/contributor_avatar_description"
-        tools:src="@tools:sample/avatars" />
+        android:contentDescription="@string/contributor_avatar_description" />
 
     <TextView
         android:id="@+id/creatorItemName"
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index 2f3bd2de5..ccc968c08 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -18,82 +18,62 @@
 
         <TextView
             android:id="@+id/gradeItemValue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="45dp"
+            android:layout_height="40dp"
             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_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/gradeDetailsContainer"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="6" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/gradeDetailsContainer"
+        <TextView
+            android:id="@+id/gradeItemDescription"
             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"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="20dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
             app:layout_constraintStart_toEndOf="@+id/gradeItemValue"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/lorem" />
 
-            <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/gradeItemValue"
+            app:layout_constraintStart_toStartOf="@+id/gradeItemDescription"
+            tools:text="@tools:sample/date/ddmmyy" />
 
-            <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>
+        <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/gradeItemValue"
+            app:layout_constraintEnd_toStartOf="@id/gradeItemNote"
+            app:layout_constraintStart_toEndOf="@+id/gradeItemDate"
+            tools:text="@tools:sample/lorem" />
 
         <ImageView
             android:id="@+id/gradeItemNote"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+            android:layout_marginTop="10dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/gradeDetailsContainer"
-            app:layout_constraintTop_toTopOf="@+id/gradeDetailsContainer"
+            app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/ic_all_round_mark"
             app:tint="?colorPrimary"
             tools:ignore="contentDescription" />
diff --git a/app/src/main/res/layout/item_grade_statistics_header.xml b/app/src/main/res/layout/item_grade_statistics_header.xml
deleted file mode 100644
index 92f522ba4..000000000
--- a/app/src/main/res/layout/item_grade_statistics_header.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <HorizontalScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <RadioGroup
-            android:id="@+id/gradeStatisticsTypeSwitch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingStart="16dp"
-            android:paddingTop="5dp"
-            android:paddingEnd="16dp">
-
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/gradeStatisticsTypePartial"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:tag="partial"
-                android:text="@string/grade_statistics_partial" />
-
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/gradeStatisticsTypeSemester"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:tag="annual"
-                android:text="@string/grade_statistics_semester" />
-
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/gradeStatisticsTypePoints"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:tag="points"
-                android:text="@string/grade_statistics_points" />
-        </RadioGroup>
-    </HorizontalScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grade_statistics_pie.xml b/app/src/main/res/layout/item_grade_statistics_pie.xml
index 2ea91ecf9..15992a37e 100644
--- a/app/src/main/res/layout/item_grade_statistics_pie.xml
+++ b/app/src/main/res/layout/item_grade_statistics_pie.xml
@@ -23,4 +23,5 @@
         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_license.xml b/app/src/main/res/layout/item_license.xml
index cb55ab87a..aaa7cd349 100644
--- a/app/src/main/res/layout/item_license.xml
+++ b/app/src/main/res/layout/item_license.xml
@@ -2,8 +2,7 @@
 <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:minHeight="64dp"
+    android:layout_height="64dp"
     android:background="?selectableItemBackground"
     android:orientation="vertical"
     android:paddingStart="16dp"
@@ -15,8 +14,7 @@
     <TextView
         android:id="@+id/licenseItemName"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="28dp"
+        android:layout_height="28dp"
         android:ellipsize="end"
         android:gravity="bottom"
         android:singleLine="true"
@@ -26,8 +24,7 @@
     <TextView
         android:id="@+id/licenseItemSummary"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="20dp"
+        android:layout_height="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 1003636fc..04858196c 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -48,8 +48,7 @@
     <TextView
         android:id="@+id/loginItemSignedIn"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="20dp"
+        android:layout_height="20dp"
         android:layout_below="@id/loginItemSchool"
         android:layout_marginEnd="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
diff --git a/app/src/main/res/layout/item_lucky_number_history.xml b/app/src/main/res/layout/item_lucky_number_history.xml
deleted file mode 100644
index 79a0fcb29..000000000
--- a/app/src/main/res/layout/item_lucky_number_history.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="15dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="15dp"
-    android:paddingBottom="8dp"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <TextView
-        android:id="@+id/luckyNumberHistoryWeekName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        tools:text="Monday" />
-
-    <TextView
-        android:id="@+id/luckyNumberHistoryDate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/luckyNumberHistoryWeekName"
-        android:textColor="?android:textColorSecondary"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
-        android:textSize="16sp"
-        tools:text="05.03" />
-
-    <TextView
-        android:id="@+id/luckyNumberHistory"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_toEndOf="@id/luckyNumberHistoryWeekName"
-        android:padding="4dp"
-        android:gravity="end"
-        android:includeFontPadding="false"
-        android:layout_marginStart="10dp"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="35sp"
-        tools:text="5" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml
index 83a4406bb..6c130909d 100644
--- a/app/src/main/res/layout/item_message_preview.xml
+++ b/app/src/main/res/layout/item_message_preview.xml
@@ -1,6 +1,5 @@
 <?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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/messagePreviewContentContainer"
     android:layout_width="match_parent"
@@ -10,84 +9,37 @@
 
     <TextView
         android:id="@+id/messagePreviewSubject"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
         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:id="@+id/messagePreviewAuthor"
         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:layout_marginBottom="4dp"
         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]" />
+        tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/messagePreviewDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginBottom="15dp"
         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_width="match_parent"
         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>
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_mobile_device.xml b/app/src/main/res/layout/item_mobile_device.xml
index f49c62f38..3f3d0a751 100644
--- a/app/src/main/res/layout/item_mobile_device.xml
+++ b/app/src/main/res/layout/item_mobile_device.xml
@@ -3,30 +3,25 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mobileDevice_subitem_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="64dp"
+    android:layout_height="64dp"
     tools:context=".ui.modules.mobiledevice.MobileDeviceAdapter">
 
     <TextView
         android:id="@+id/mobileDeviceItemName"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
+        android:layout_height="32dp"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="0dp"
         android:layout_toStartOf="@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="wrap_content"
-        android:minHeight="20dp"
+        android:layout_height="20dp"
         android:layout_below="@id/mobileDeviceItemName"
         android:layout_marginStart="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
diff --git a/app/src/main/res/layout/item_student_info.xml b/app/src/main/res/layout/item_student_info.xml
deleted file mode 100644
index 203ce86b2..000000000
--- a/app/src/main/res/layout/item_student_info.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="64dp"
-    android:background="?selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true">
-
-    <TextView
-        android:id="@+id/student_info_item_title"
-        android:layout_width="match_parent"
-        android:layout_height="28dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="bottom"
-        android:maxLines="1"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/lorem/random" />
-
-    <TextView
-        android:id="@+id/student_info_item_subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="18dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:gravity="bottom"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/student_info_item_title"
-        tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index 7a90d5e74..4e278261a 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -13,10 +13,8 @@
 
     <TextView
         android:id="@+id/timetableItemNumber"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="40dp"
-        android:minHeight="40dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLength="2"
@@ -76,22 +74,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
         app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
         tools:text="22"
-        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" />
+        tools:visibility="gone" />
 
     <TextView
         android:id="@+id/timetableItemTeacher"
@@ -104,9 +87,9 @@
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
-        app:layout_constraintStart_toEndOf="@id/timetableItemGroup"
+        app:layout_constraintStart_toEndOf="@id/timetableItemRoom"
         tools:text="Agata Kowalska - Błaszczyk"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
 
     <TextView
         android:id="@+id/timetableItemDescription"
@@ -118,7 +101,7 @@
         android:textColor="?colorTimetableChange"
         android:textSize="13sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/timetableItemTeacher"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
         app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
         tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/item_timetable_additional.xml b/app/src/main/res/layout/item_timetable_additional.xml
deleted file mode 100644
index cc39db5d4..000000000
--- a/app/src/main/res/layout/item_timetable_additional.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="8dp"
-    android:paddingTop="6dp"
-    android:paddingEnd="12dp"
-    android:paddingBottom="6dp"
-    tools:context=".ui.modules.timetable.additional.AdditionalLessonsAdapter">
-
-    <TextView
-        android:id="@+id/additionalLessonItemSubject"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="16dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="15sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/lorem" />
-
-    <TextView
-        android:id="@+id/additionalLessonItemTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="4dp"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="13sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/additionalLessonItemSubject"
-        tools:text="11:11 - 12:12" />
-
-</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
index 037c10d5d..98a213ec3 100644
--- a/app/src/main/res/layout/item_timetable_small.xml
+++ b/app/src/main/res/layout/item_timetable_small.xml
@@ -7,8 +7,7 @@
 
     <TextView
         android:id="@+id/timetableSmallItemNumber"
-        android:layout_width="wrap_content"
-        android:minWidth="40dp"
+        android:layout_width="40dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:gravity="center"
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 34535c694..3dfc3f548 100644
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_dark.xml
@@ -19,10 +19,8 @@
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="40dp"
-            android:minHeight="40dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml
index 36a6bbddf..3a3a2d658 100644
--- a/app/src/main/res/layout/item_widget_timetable_small.xml
+++ b/app/src/main/res/layout/item_widget_timetable_small.xml
@@ -16,8 +16,7 @@
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="wrap_content"
-            android:minWidth="40dp"
+            android:layout_width="40dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:maxLength="2"
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
index a02d85850..0cc297091 100644
--- a/app/src/main/res/layout/item_widget_timetable_small_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
@@ -16,8 +16,7 @@
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="wrap_content"
-            android:minWidth="40dp"
+            android:layout_width="40dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:maxLength="2"
@@ -30,6 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
+            android:layout_marginLeft="6dp"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -46,6 +46,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@android:color/white"
@@ -57,6 +58,7 @@
             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"
@@ -67,6 +69,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/scrollable_header_about.xml b/app/src/main/res/layout/scrollable_header_about.xml
index e203d98d4..72186bf79 100644
--- a/app/src/main/res/layout/scrollable_header_about.xml
+++ b/app/src/main/res/layout/scrollable_header_about.xml
@@ -3,8 +3,7 @@
     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:minHeight="104dp"
+    android:layout_height="104dp"
     android:orientation="vertical"
     tools:context=".ui.modules.about.AboutAdapter">
 
diff --git a/app/src/main/res/menu/action_menu_account_details.xml b/app/src/main/res/menu/action_menu_account_details.xml
deleted file mode 100644
index 9ddc1e550..000000000
--- a/app/src/main/res/menu/action_menu_account_details.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/accountDetailsMenuEdit"
-        android:icon="@drawable/ic_menu_message_write"
-        android:orderInCategory="1"
-        android:title="@string/account_details_edit"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
-</menu>
diff --git a/app/src/main/res/menu/action_menu_main.xml b/app/src/main/res/menu/action_menu_main.xml
index 219059391..72bea25a2 100644
--- a/app/src/main/res/menu/action_menu_main.xml
+++ b/app/src/main/res/menu/action_menu_main.xml
@@ -1,11 +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"
-    xmlns:tools="http://schemas.android.com/tools">
-
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/mainMenuAccount"
+        android:icon="@drawable/ic_all_account"
         android:orderInCategory="2"
-        app:showAsAction="always"
-        tools:ignore="MenuTitle" />
+        android:title="@string/main_account_picker"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="always" />
 </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 4c1332e10..dfc12e234 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -22,18 +22,4 @@
         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_timetable.xml b/app/src/main/res/menu/action_menu_timetable.xml
index 47257f5b4..c3d0222c1 100644
--- a/app/src/main/res/menu/action_menu_timetable.xml
+++ b/app/src/main/res/menu/action_menu_timetable.xml
@@ -1,13 +1,6 @@
 <?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/timetableMenuAdditionalLessons"
-        android:icon="@drawable/ic_menu_timetable_lessons_additional"
-        android:orderInCategory="1"
-        android:title="@string/additional_lessons_button"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/timetableMenuCompletedLessons"
         android:icon="@drawable/ic_menu_timetable_lessons_completed"
diff --git a/app/src/main/res/values-cs-v29/preferences_values.xml b/app/src/main/res/values-cs-v29/preferences_values.xml
deleted file mode 100644
index 25125a308..000000000
--- a/app/src/main/res/values-cs-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>Motiv systému</item>
-        <item>Světlý</item>
-        <item>Tmavý</item>
-        <item>Černý (AMOLED)</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
deleted file mode 100644
index 7abbb10bc..000000000
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>
-        <item>Slovenčina</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>Nezobrazovat</item>
-        <item>Zobrazit vše</item>
-        <item>Zobrazit menší</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
deleted file mode 100644
index a2118955a..000000000
--- a/app/src/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Přihlášení</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Známky</string>
-    <string name="attendance_title">Docházka</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í úkoly</string>
-    <string name="account_title">Manažer účtů</string>
-    <string name="account_quick_title">Vyberte účet</string>
-    <string name="account_details_title">Podrobnosti účtu</string>
-    <string name="student_info_title">Informace o žáku</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 rodičovského účtu</string>
-    <string name="login_header_symbol">Zadejte symbol ze stránky deníku</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">Variace deníku 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é. Ujistěte se, že je v poli níže vybrána správná variace deníku UONET+</string>
-    <string name="login_invalid_pin">Neplatný PIN</string>
-    <string name="login_invalid_token">Neplatný token</string>
-    <string name="login_expired_token">Token vypršel</string>
-    <string name="login_invalid_email">Neplatný e-mail</string>
-    <string name="login_invalid_login">Místo e-mailu použijte přiřazené přihlašovací údaje</string>
-    <string name="login_invalid_custom_email">Použijte přiřazené přihlašovací nebo e-mail v @%1$s</string>
-    <string name="login_invalid_symbol">Neplatný symbol</string>
-    <string name="login_incorrect_symbol">Žák nebyl nalezen. Zkontrolujte správnost symbolu a vybrané varianty deníku UONET+</string>
-    <string name="login_field_required">Toto pole je povinné</string>
-    <string name="login_duplicate_student">Vybraný žák je už 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>.\n\nUjistěte se, že jste na předchozí obrazovce nastavili správnou variantu deníku do pole <b>Variace deníku UONET+</b>. Wulkanowy v tuto chvíli nezjistí předškolní żaków</string>
-    <string name="login_select_student">Vyberte žáky, kteří se mají do aplikace přihlásit</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, dokončené 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 jste vybrali správnou variantu deníku UONET+!</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">Žák je už přihlášen</string>
-    <!--Main-->
-    <string name="main_account_picker">Manažer účtů</string>
-    <string name="main_log_in">Přihlásit se</string>
-    <string name="main_session_expired">Relace vypršela</string>
-    <string name="main_session_relogin">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ěr: %1$.2f</string>
-    <string name="grade_points_sum">Body: %s</string>
-    <string name="grade_no_average">Bez průměru</string>
-    <string name="grade_predicted">Předpokládaná: %1$s</string>
-    <string name="grade_final">Konečná: %1$s</string>
-    <string name="grade_summary_points">Součet 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">Shrnutí</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>
-    <string name="grade_statistics_legend">Vysvětlivky</string>
-    <string name="grade_statistics_average">Průměr: %1$s</string>
-    <string name="grade_statistics_average_class">Třída</string>
-    <string name="grade_statistics_average_student">Žák</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ámek</item>
-        <item quantity="other">%d známek</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ých známek</item>
-        <item quantity="other">Máte %1$d nových známek</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Máte %1$d novou předpokládanou známku</item>
-        <item quantity="few">Máte %1$d nové předpokládané známky</item>
-        <item quantity="many">Máte %1$d nových předpokládaných známek</item>
-        <item quantity="other">Máte %1$d nových předpokládaných známek</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ých konečných známek</item>
-        <item quantity="other">Máte %1$d nových konečných známek</item>
-    </plurals>
-    <!--Timetable-->
-    <string name="timetable_lesson">Lekce</string>
-    <string name="timetable_room">Učebna</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">Žádné lekce tento den</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sek</string>
-    <string name="timetable_time_left">ještě %1$s</string>
-    <string name="timetable_time_until">za %1$s</string>
-    <string name="timetable_finished">Ukončila</string>
-    <string name="timetable_now">Teď: %s</string>
-    <string name="timetable_next">Za chvíli: %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 dokončených lekcích</string>
-    <string name="completed_lessons_topic">Téma</string>
-    <string name="completed_lessons_absence">Nepřítomnost</string>
-    <string name="completed_lessons_resources">Zdroje</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Další lekce</string>
-    <string name="additional_lessons_button">Zobrazit další lekce</string>
-    <string name="additional_lessons_no_items">Žádné informace o dalších lekcích</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Shrnutí docházky</string>
-    <string name="attendance_absence_school">Neprítomnosť zo školských dôvodov</string>
-    <string name="attendance_absence_excused">Omluvená nepřítomnost</string>
-    <string name="attendance_absence_unexcused">Neomluvená nepřítomnost</string>
-    <string name="attendance_exemption">Osvobození</string>
-    <string name="attendance_excused_lateness">Omluvené 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">Odstraně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 nepřítomnost</item>
-        <item quantity="few">%1$d nepřítomnosti</item>
-        <item quantity="many">%1$d nepřítomnosti</item>
-        <item quantity="other">%1$d nepřítomnosti</item>
-    </plurals>
-    <string name="attendance_excuse_dialog_reason">Důvod nepřítomnosti (volitelný)</string>
-    <string name="attendance_excuse_dialog_submit">Poslat</string>
-    <string name="attendance_excuse_success">Žádost o omluvu nepřítomnosti byla úspěšně odeslána!</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">Docházka</string>
-    <string name="attendance_summary_total">Společně</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ý předmět)</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">Komu:</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">Odstranit</string>
-    <string name="message_move_to_bin">Přesunout do koše</string>
-    <string name="message_delete_forever">Odstranit natrvalo</string>
-    <string name="message_delete_success">Zpráva byla úspěšně odstraněna</string>
-    <string name="message_share">Sdílet</string>
-    <string name="message_print">Vytisknout</string>
-    <string name="message_subject">Předmět</string>
-    <string name="message_content">Obsah</string>
-    <string name="message_send_successful">Zpráva úspěšně odeslána</string>
-    <string name="message_not_exists">Zpráva neexistuje</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áv</item>
-        <item quantity="other">%d zpráv</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">Máte %1$d novou zprávu</item>
-        <item quantity="few">Máte %1$d nové zprávy</item>
-        <item quantity="many">Máte %1$d nových zpráv</item>
-        <item quantity="other">Máte %1$d nových 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ámek</item>
-        <item quantity="other">%d poznámek</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ých poznámek</item>
-        <item quantity="other">Máte %1$d nových poznámek</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ál</item>
-        <item quantity="other">%d chvál</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ých chvál</item>
-        <item quantity="other">Máte %1$d nových chvál</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í poznámku</item>
-        <item quantity="few">Máte %1$d nové neutrální poznámky</item>
-        <item quantity="many">Máte %1$d nových neutrální poznámek</item>
-        <item quantity="other">Máte %1$d nových neutrální poznámek</item>
-    </plurals>
-    <!--Homework-->
-    <string name="homework_no_items">Žádné informace o domácích úkolech</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>
-    <string name="lucky_number_history_button">Zobrazit historii</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Historie šťastných čísel</string>
-    <string name="lucky_number_history_empty">Žádné informace o šťastných číslech</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ění</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">Název školy</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">Volat</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>
-    <!--Conference-->
-    <string name="conferences_title">Setkání</string>
-    <string name="conference_no_items">Žádné informace o setkáních</string>
-    <!--Account-->
-    <string name="account_add_new">Přidat účet</string>
-    <string name="account_logout">Odhlásit</string>
-    <string name="account_confirm">Chcete se odhlásit z aktivního žáka?</string>
-    <string name="account_logout_student">Odhlášení žáků</string>
-    <string name="account_type_student">Žákův účet</string>
-    <string name="account_type_parent">Rodičovský účet</string>
-    <string name="account_login_mobile_api">Režim Mobilního API</string>
-    <string name="account_login_hybrid">Hybridní režim</string>
-    <string name="account_details_edit">Upravit data</string>
-    <string name="account_quick_manager">Manažer účtů</string>
-    <string name="account_select_student">Vyberte žáka</string>
-    <string name="account_family">Rodina</string>
-    <string name="account_contact">Kontakt</string>
-    <string name="account_address">Údaje o adresách</string>
-    <string name="account_personal_data">Osobní údaje</string>
-    <!--About-->
-    <string name="about_version">Verze aplikace</string>
-    <string name="about_contributor">Tvůrci</string>
-    <string name="about_contributor_summary">Seznam vývojářů Wulkanového</string>
-    <string name="about_feedback">Nahlásit chybu</string>
-    <string name="about_feedback_summary">Odeslat zprávu 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ě Wulkanového</string>
-    <string name="about_facebook">Facebooková fanpage</string>
-    <string name="about_facebook_summary">Stejně jako naše facebooková fanpage</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 stránku 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>
-    <!--Student info-->
-    <string name="student_info_empty">Žádné informace o žáků nebo rodině žáka</string>
-    <string name="student_info_first_name">Jméno</string>
-    <string name="student_info_second_name">Druhé jméno</string>
-    <string name="student_info_gender">Pohlaví</string>
-    <string name="student_info_polish_citizenship">Polské občanství</string>
-    <string name="student_info_family_name">Rodinné jméno</string>
-    <string name="student_info_parents_name">Jména matky a otce</string>
-    <string name="student_info_phone">Telefon</string>
-    <string name="student_info_cellphone">Mobilní telefon</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Adresa bydliště</string>
-    <string name="student_info_registered_address">Registrovaná adresa</string>
-    <string name="student_info_correspondence_address">Korespondenční adresa</string>
-    <string name="student_info_full_name">Příjmení a jméno</string>
-    <string name="student_info_kinship">Stupeň příbuznosti</string>
-    <string name="student_info_guardian_address">Adresa</string>
-    <string name="student_info_phones">Telefony</string>
-    <string name="student_info_male">Muž</string>
-    <string name="student_info_female">Žena</string>
-    <string name="student_info_last_name">Příjmení</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Přezdívka</string>
-    <string name="account_edit_header">Přidat přezdívku</string>
-    <string name="account_edit_avatar_title">Vybrat barvu avataru</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Sdílet protokoly</string>
-    <string name="logviewer_refresh">Obnovit</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Zkontrolovat aktualizace</string>
-    <string name="dialog_error_check_update_message">Před hlášením chyby zkontrolujte, zda je k dispozici aktualizace s opravou chyb</string>
-    <!--Generic-->
-    <string name="all_content">Obsah</string>
-    <string name="all_retry">Zkusit znovu</string>
-    <string name="all_description">Popis</string>
-    <string name="all_no_description">Žádný popis</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">Podrobnosti</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">Hledat</string>
-    <string name="all_search_hint">Hledat…</string>
-    <string name="all_yes">Ano</string>
-    <string name="all_no">Ne</string>
-    <string name="all_save">Uložit</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">Žádné lekce</string>
-    <string name="widget_timetable_theme_title">Vybrat motiv</string>
-    <string name="widget_timetable_theme_light">Světlý</string>
-    <string name="widget_timetable_theme_dark">Tmavý</string>
-    <string name="widget_timetable_theme_system">Motiv systému</string>
-    <!--Preferences-->
-    <string name="pref_view_header">Vzhled a chování aplikací</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</string>
-    <string name="pref_view_app_theme">Motiv</string>
-    <string name="pref_view_expand_grade">Rozbalit známky</string>
-    <string name="pref_view_timetable_show_timers">Označit aktuální lekci</string>
-    <string name="pref_view_timetable_show_groups">Zobrazit skupiny vedle předmětů</string>
-    <string name="pref_view_grade_statistics_list">Zobrazit seznam grafů v známkách třídy</string>
-    <string name="pref_view_timetable_show_whole_class">Zobrazit lekce pro celou třídu</string>
-    <string name="pref_view_subjects_without_grades">Zobrazit předměty bez známek</string>
-    <string name="pref_view_grade_color_scheme">Známky barevné schéma</string>
-    <string name="pref_view_grade_sorting_mode">Třídění předmětů</string>
-    <string name="pref_view_app_language">Jazyk</string>
-    <string name="pref_notify_header">Upozornění</string>
-    <string name="pref_notify_switch">Zobrazit upozornění</string>
-    <string name="pref_notify_upcoming_lessons_switch">Zobrazit upozornění o nadcházející 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">Vaše zařízení může mít problémy se synchronizací dat as upozorněními.\n\nChcete-li je opravit, přidejte Wulkanového do funkce Autostart a vypněte optimalizaci/úsporu baterie v nastavení systému telefonu.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Přejít do nastavení</string>
-    <string name="pref_notify_debug_switch">Zobrazit upozornění o ladění</string>
-    <string name="pref_notify_disabled_summary">Synchronizace je vypnutá</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">Synchronizovat teď</string>
-    <string name="pref_services_message_sync_success">Synchronizováno!</string>
-    <string name="pref_services_message_sync_failed">Synchronizace selhala</string>
-    <string name="pref_services_sync_in_progress">Probíhá synchronizace</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>
-    <string name="pref_settings_advanced_title">Pokročilé</string>
-    <string name="pref_settings_appearance_title">Vzhled a chování</string>
-    <string name="pref_settings_notifications_title">Upozornění</string>
-    <string name="pref_settings_sync_title">Synchronizace</string>
-    <string name="pref_grades_appearance_header">Známky</string>
-    <string name="pref_attendance_appearance_view">Docházka</string>
-    <string name="pref_timetable_appearance_view">Plán lekce</string>
-    <string name="pref_grades_advanced_header">Známky</string>
-    <string name="pref_messages_advanced_header">Zprávy</string>
-    <string name="pref_appearance_category">Vzhled a chování</string>
-    <string name="pref_appearance_category_summary">Jazyky, motivy, třídění předmětů</string>
-    <string name="pref_notifications_category_summary">Upozornění aplikace, oprava problémů</string>
-    <string name="pref_notifications_category">Upozornění</string>
-    <string name="pref_sync_category">Synchronizace</string>
-    <string name="pref_sync_category_summary">Automatická aktualizace, interval aktualizací</string>
-    <string name="pref_advanced_category_summary">Hodnota plusu a mínusu, výpočet průměru</string>
-    <string name="pref_advanced_category">Pokročilé</string>
-    <string name="pref_about_category_summary">Verze aplikace, tvůrci, sociální portály, licence</string>
-    <!--Notification Channels-->
-    <string name="channel_new_entries">Nové položky v deníku</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">Push upozornění</string>
-    <string name="channel_upcoming_lessons">Nadcházející lekce</string>
-    <string name="channel_debug">Ladění</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Konec podpory</string>
-    <string name="drop_kitkat_content">Ukončujeme podporu pro vaše zařízení. V Wulkanovým už pro něj nebudou žádné nové funkce. Kritické opravy však budeme vydávat až do konce roku 2021, abyste měli čas přejít na novější model</string>
-    <string name="drop_kitkat_again">Nezobrazovat znovu</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">Fialový</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>
-    <!--Update helper-->
-    <string name="update_download_started">Stahování aktualizací začalo…</string>
-    <string name="update_download_success">Aktualizace byla stažena.</string>
-    <string name="update_download_success_button">Restartovat</string>
-    <string name="update_failed">Aktualizace selhala! Wulkanowy nemusí fungovat správně. Zvažte aktualizaci</string>
-    <!--Errors-->
-    <string name="error_no_internet">Žádné internetové připojení</string>
-    <string name="error_timeout">Nelze se připojit ke deníku. Servery mohou být přetíženy. Prosím zkuste to znovu později</string>
-    <string name="error_login_failed">Načítání dat se nezdařilo. Prosím zkuste to znovu později</string>
-    <string name="error_password_change_required">Je vyžadována změna hesla pro deník</string>
-    <string name="error_service_unavailable">Probíhá údržba UONET+ deník. Zkuste to později znovu</string>
-    <string name="error_unknown_uonet">Neznámá chyba denika UONET+. Prosím zkuste to znovu později</string>
-    <string name="error_unknown_app">Neznámá chyba aplikace. Prosím zkuste to znovu později</string>
-    <string name="error_unknown">Vyskytla se neočekávaná chyba</string>
-    <string name="error_feature_disabled">Funkce je deaktivována přes 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/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index f578ff11f..496287984 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -12,8 +12,6 @@
         <item>Pусский</item>
         <item>Українська</item>
         <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
     </string-array>
     <string-array name="services_interval_entries">
         <item>15 Minuten</item>
@@ -31,10 +29,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetisch</item>
-        <item>Nach Datum</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -42,8 +36,8 @@
     </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>
+        <item>Average of grades from both semesters</item>
+        <item>Durchschnitt der Bewertungen für das ganze Jahr</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Nicht zeigen</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2880996a8..4b1669371 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,20 +17,17 @@
     <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">Konten-Manager</string>
-    <string name="account_quick_title">Konto auswählen</string>
-    <string name="account_details_title">Kontodetails</string>
-    <string name="student_info_title">Schülerinfo</string>
+    <string name="account_title">Wählen Sie ein Konto</string>
     <!--Subtitles-->
-    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+    <string name="grade_subtitle">Semester %d, %d/%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 von der Registerseite ein</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+ Registervariante</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>
@@ -40,18 +37,17 @@
     <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 die richtige UONET+ Registervariation im unteren Feld ausgewählt ist</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">Den zugewiesenen Login anstelle von email verwenden</string>
-    <string name="login_invalid_custom_email">Benutze den zugewiesenen Login oder E-Mail in @%1$s</string>
+    <string name="login_invalid_login">Ungültige login</string>
     <string name="login_invalid_symbol">Ungültige symbol</string>
-    <string name="login_incorrect_symbol">Schüler nicht gefunden. Überprüfen Sie das Symbol und die gewählte Variation des UONET+ Registers</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 kann auf der Registerseite in&#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>gefunden werden.\n\nStellen Sie sicher, dass Sie die entsprechende Registervariante im Feld <b>UONET+ Registervariante</b> auf dem vorherigen Bildschirm festgelegt haben. Wulkanowy erkennt zur Zeit keine Vorschulstudenten</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>
@@ -63,7 +59,7 @@
     <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 Sie die richtige UONET+ Registervariation wählen!</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>
@@ -99,10 +95,6 @@
     <string name="grade_statistics_partial">Partiell</string>
     <string name="grade_statistics_semester">Semester</string>
     <string name="grade_statistics_points">Punkte</string>
-    <string name="grade_statistics_legend">Legende</string>
-    <string name="grade_statistics_average">Durchschnitt: %1$s</string>
-    <string name="grade_statistics_average_class">Klasse</string>
-    <string name="grade_statistics_average_student">Schüler</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d Note</item>
         <item quantity="other">%d Noten</item>
@@ -111,26 +103,10 @@
         <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>
@@ -153,10 +129,6 @@
     <string name="completed_lessons_topic">Thema</string>
     <string name="completed_lessons_absence">Abwesenheit</string>
     <string name="completed_lessons_resources">Ressourcen</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Zusätzliche Lektionen</string>
-    <string name="additional_lessons_button">Zusätzliche Lektionen anzeigen</string>
-    <string name="additional_lessons_no_items">Keine Infos zu zusätzlichen Lektionen</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Übersicht über die Schulbesuch</string>
     <string name="attendance_absence_school">Aus schulischen Gründen abwesend</string>
@@ -166,8 +138,6 @@
     <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">Entfernt</string>
-    <string name="attendance_unknown">Unbekannt</string>
     <string name="attendance_number">Lektion Nummer</string>
     <string name="attendance_no_items">Keine Einträgen</string>
     <plurals name="attendance_number_absences">
@@ -176,7 +146,7 @@
     </plurals>
     <string name="attendance_excuse_dialog_reason">Abwesenheitsgrund (optional)</string>
     <string name="attendance_excuse_dialog_submit">Senden</string>
-    <string name="attendance_excuse_success">Abwesenheitsentschuldigungsanfrage erfolgreich gesendet!</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-->
@@ -202,12 +172,9 @@
     <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_not_exists">Nachricht existiert nicht</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">
@@ -237,32 +204,6 @@
         <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 Lob</item>
-        <item quantity="other">%d Lob</item>
-    </plurals>
-    <plurals name="praise_new_items">
-        <item quantity="one">Neues Lob</item>
-        <item quantity="other">Neues Lob</item>
-    </plurals>
-    <plurals name="praise_notify_new_items">
-        <item quantity="one">Du hast %1$d Lob erhalten</item>
-        <item quantity="other">Du hast %1$d Lob erhalten</item>
-    </plurals>
-    <!--Neutral notes-->
-    <plurals name="neutral_note_number_item">
-        <item quantity="one">%d neutrale Notiz</item>
-        <item quantity="other">%d neutrale Notizen</item>
-    </plurals>
-    <plurals name="neutral_note_new_items">
-        <item quantity="one">Neue neutrale Notiz</item>
-        <item quantity="other">Neue neutrale Notizen</item>
-    </plurals>
-    <plurals name="neutral_note_notify_new_items">
-        <item quantity="one">Du hast %1$d neutrale Notiz erhalten</item>
-        <item quantity="other">Du hast %1$d neutrale Notizen erhalten</item>
-    </plurals>
     <!--Homework-->
     <string name="homework_no_items">Keine Informationen über Hausaufgaben</string>
     <string name="homework_mark_as_done">Gemacht</string>
@@ -273,11 +214,7 @@
     <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>
-    <string name="lucky_number_history_button">Verlauf anzeigen</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Glücksnummerverlauf</string>
-    <string name="lucky_number_history_empty">Keine Information über die Glücksnummer</string>
+    <string name="lucky_number_notify_new_item">Die heutige Glücksnummer ist: </string>
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile Geräte</string>
     <string name="mobile_devices_no_items">Keine Geräte</string>
@@ -303,25 +240,11 @@
     <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>
-    <!--Conference-->
-    <string name="conferences_title">Sitzungen</string>
-    <string name="conference_no_items">Keine Informationen über Sitzungen</string>
     <!--Account-->
     <string name="account_add_new">Konto hinzufügen</string>
     <string name="account_logout">Abmelden</string>
-    <string name="account_confirm">Wollen Sie diesen Schüler 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>
-    <string name="account_details_edit">Daten bearbeiten</string>
-    <string name="account_quick_manager">Konten-Manager</string>
-    <string name="account_select_student">Schüler auswählen</string>
-    <string name="account_family">Familie</string>
-    <string name="account_contact">Kontakt</string>
-    <string name="account_address">Wohnungsdetails</string>
-    <string name="account_personal_data">Persönliche Information</string>
     <!--About-->
     <string name="about_version">Version der App</string>
     <string name="about_contributor">Mitarbeiter</string>
@@ -332,8 +255,6 @@
     <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_facebook">Facebook fanpage</string>
-    <string name="about_facebook_summary">Gefällt unsere Facebook-Fanpage</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>
@@ -345,37 +266,12 @@
     <!--Contributor-->
     <string name="contributor_avatar_description">Benutzerbild</string>
     <string name="contributor_see_more">Sehen Sie mehr auf GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">Keine Informationen über Schüler- oder Studentenfamilie</string>
-    <string name="student_info_first_name">Name</string>
-    <string name="student_info_second_name">Zweite Name</string>
-    <string name="student_info_gender">Geschlecht</string>
-    <string name="student_info_polish_citizenship">Polnische Staatsbürgerschaft</string>
-    <string name="student_info_family_name">Familienname</string>
-    <string name="student_info_parents_name">Namen von Mutter und Vater</string>
-    <string name="student_info_phone">Telefonnummer</string>
-    <string name="student_info_cellphone">Mobiltelefonnummer</string>
-    <string name="student_info_email">E-Mail</string>
-    <string name="student_info_address">Wohnadresse</string>
-    <string name="student_info_registered_address">Adresse der Registrierung</string>
-    <string name="student_info_correspondence_address">Korrespondenzadresse</string>
-    <string name="student_info_full_name">Nachname und Vorname</string>
-    <string name="student_info_kinship">Verwandtschaftsgrad</string>
-    <string name="student_info_guardian_address">Adresse</string>
-    <string name="student_info_phones">Telefonnummern</string>
-    <string name="student_info_male">Mann</string>
-    <string name="student_info_female">Frau</string>
-    <string name="student_info_last_name">Nachname</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Nick</string>
-    <string name="account_edit_header">Nick hinzufügen</string>
-    <string name="account_edit_avatar_title">Avatar-Farbe wählen</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>
+    <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">Inhalt</string>
     <string name="all_retry">Wiederhol</string>
@@ -389,14 +285,11 @@
     <string name="all_category">Kategorie</string>
     <string name="all_close">Schließ</string>
     <string name="all_no_data">Keine Daten</string>
-    <string name="all_subject">Schulfach</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>
-    <string name="all_yes">Ja</string>
-    <string name="all_no">Nein</string>
-    <string name="all_save">Speichern</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>
@@ -404,21 +297,18 @@
     <string name="widget_timetable_theme_dark">Dunkel</string>
     <string name="widget_timetable_theme_system">Systemthema</string>
     <!--Preferences-->
-    <string name="pref_view_header">Aussehen &amp; Verhalten</string>
+    <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">Anwesendheit zeigen</string>
-    <string name="pref_view_app_theme">Thema</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 markieren</string>
-    <string name="pref_view_timetable_show_groups">Gruppen neben Schulfächen anzeigen</string>
+    <string name="pref_view_timetable_show_timers">Aktuelle Lektion im Stundenplan markieren</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">Schulfächer ohne Noten anzeigen</string>
     <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
-    <string name="pref_view_grade_sorting_mode">Schulfachen sortieren</string>
-    <string name="pref_view_app_language">Sprache</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>
@@ -426,7 +316,6 @@
     <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_notify_disabled_summary">Synchronisierung ist deaktiviert</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>
@@ -436,27 +325,14 @@
     <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>
-    <string name="pref_settings_advanced_title">Erweitert</string>
-    <string name="pref_settings_appearance_title">Aussehen &amp; Verhalten</string>
-    <string name="pref_settings_notifications_title">Benachrichtigungen</string>
-    <string name="pref_settings_sync_title">Synchronisierung</string>
-    <string name="pref_grades_appearance_header">Noten</string>
-    <string name="pref_attendance_appearance_view">Schulbesuch</string>
-    <string name="pref_timetable_appearance_view">Zeitplan</string>
-    <string name="pref_grades_advanced_header">Noten</string>
-    <string name="pref_messages_advanced_header">Nachrichten</string>
-    <string name="pref_appearance_category">Aussehen &amp; Verhalten</string>
-    <string name="pref_appearance_category_summary">Sprachen, Themen, Schulfachen sortieren</string>
-    <string name="pref_notifications_category_summary">App-Benachrichtigungen, Probleme beheben</string>
-    <string name="pref_notifications_category">Benachrichtigungen</string>
-    <string name="pref_sync_category">Synchronisierung</string>
-    <string name="pref_sync_category_summary">Automatisches Update, Synchronisierungsintervall</string>
-    <string name="pref_advanced_category_summary">Plus und Minus Werte, Durchschnittsberechnung</string>
-    <string name="pref_advanced_category">Erweitert</string>
-    <string name="pref_about_category_summary">App-Version, Mitarbeiter, soziale Portale, Lizenzen</string>
     <!--Notification Channels-->
     <string name="channel_new_entries">Neue Einträge im Klassenbuch</string>
     <string name="channel_new_grades">Neue Noten</string>
@@ -466,10 +342,6 @@
     <string name="channel_push">Push-Benachrichtigungen</string>
     <string name="channel_upcoming_lessons">Bevorstehende Lektionen</string>
     <string name="channel_debug">Debuggen</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Ende der Unterstützung</string>
-    <string name="drop_kitkat_content">Wir beenden die Unterstützung für dein Gerät. Es werden keine neuen Funktionen mehr in Wulkanowy erscheinen. Allerdings werden wir bis Ende 2021 kritische Patches veröffentlichen, so dass du Zeit hast, zu einem neueren Modell zu wechseln</string>
-    <string name="drop_kitkat_again">Nicht mehr fragen</string>
     <!--Colors-->
     <string name="all_black">Schwarz</string>
     <string name="all_red">Rot</string>
@@ -480,19 +352,12 @@
     <!--Others-->
     <string name="all_copied">Kopiert</string>
     <string name="all_undo">lösen</string>
-    <!--Update helper-->
-    <string name="update_download_started">Download der Updates wurde gestartet…</string>
-    <string name="update_download_success">Ein Update wurde gerade heruntergeladen.</string>
-    <string name="update_download_success_button">Neustart</string>
-    <string name="update_failed">Update fehlgeschlagen! Wulkanowy funktioniert möglicherweise nicht richtig. Überlegen Sie die Aktualisierung</string>
     <!--Errors-->
     <string name="error_no_internet">Keine Internetverbindung</string>
-    <string name="error_timeout">Registrierungsverbindung fehlgeschlagen. Server können überlastet sein. Bitte versuchen Sie es später noch einmal</string>
-    <string name="error_login_failed">Das Laden der Daten ist fehlgeschlagen. Bitte versuchen Sie es später noch einmal</string>
-    <string name="error_password_change_required">Passwortänderung für Registrierung erforderlich</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_uonet">Unbekannter UONET + Registerfehler. Versuchen Sie es später erneut</string>
-    <string name="error_unknown_app">Unbekannter Anwendungsfehler. Bitte 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>
diff --git a/app/src/main/res/values-lt-v29/preferences_values.xml b/app/src/main/res/values-lt-v29/preferences_values.xml
deleted file mode 100644
index 18cbd4cf5..000000000
--- a/app/src/main/res/values-lt-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>Sistemos tema</item>
-        <item>Šviesi</item>
-        <item>Tamsi</item>
-        <item>Juoda (AMOLED)</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-lt/preferences_values.xml b/app/src/main/res/values-lt/preferences_values.xml
deleted file mode 100644
index fcb637d23..000000000
--- a/app/src/main/res/values-lt/preferences_values.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>Šviesi</item>
-        <item>Tamsi</item>
-        <item>Juoda (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>Sistemos kalba</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minučių</item>
-        <item>30 minučių</item>
-        <item>1 valandą</item>
-        <item>2 valandas</item>
-        <item>6 valandas</item>
-        <item>12 valandas</item>
-        <item>24 valandas</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>Pagal abėcėlę</item>
-        <item>Pagal datą</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Laipsnio spalvos registre</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Antrojo semestro laipsnių vidurkis</item>
-        <item>Abiejų semestrų laipsnių vidurkis</item>
-        <item>Visų metų laipsnių vidurkis</item>
-    </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nerodyti</item>
-        <item>Rodyti viską</item>
-        <item>Rodyti mažesnį</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
deleted file mode 100644
index 424cc2523..000000000
--- a/app/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Prisijungti</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Laipsnis</string>
-    <string name="attendance_title">Attendance</string>
-    <string name="exam_title">Exams</string>
-    <string name="timetable_title">Timetable</string>
-    <string name="settings_title">Nustatymai</string>
-    <string name="more_title">Daugiau</string>
-    <string name="about_title">Apie</string>
-    <string name="logviewer_title">Peržiūrėti žurnalą</string>
-    <string name="contributors_title">Prisidėję</string>
-    <string name="license_title">Licencijos</string>
-    <string name="message_title">Žinutės</string>
-    <string name="send_message_title">Nauja žinutė</string>
-    <string name="note_title">Pastabos ir pasiekimai</string>
-    <string name="homework_title">Namų darbai</string>
-    <string name="account_title">Paskyros valdymas</string>
-    <string name="account_quick_title">Pasirinkite paskyrą</string>
-    <string name="account_details_title">Paskyros informacija</string>
-    <string name="student_info_title">Studentų informacija</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semestras %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 from the register page</string>
-    <string name="login_nickname_hint">Vartotojo vardas</string>
-    <string name="login_email_hint">El. paštas</string>
-    <string name="login_login_pesel_email_hint">Prisijunkite, PESEL arba el. paštas</string>
-    <string name="login_password_hint">Slaptažodis</string>
-    <string name="login_host_hint">UONET+ register variant</string>
-    <string name="login_type_api">Mobile API</string>
-    <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Hibridas</string>
-    <string name="login_token_hint">Token</string>
-    <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">API raktas</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_sign_in">Prisijungti</string>
-    <string name="login_invalid_password">Slaptažodis per trumpas</string>
-    <string name="login_incorrect_password">Login details are incorrect. Make sure the correct UONET+ register variation is selected in the field below</string>
-    <string name="login_invalid_pin">Netinkamas PIN kodas</string>
-    <string name="login_invalid_token">Invalid token</string>
-    <string name="login_expired_token">Token expired</string>
-    <string name="login_invalid_email">Neteisingas el. paštas</string>
-    <string name="login_invalid_login">Use the assigned login instead of email</string>
-    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Netinkamas simbolis</string>
-    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</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&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the previous screen. Wulkanowy does not detect pre-school students at the moment</string>
-    <string name="login_select_student">Select students to log in to the application</string>
-    <string name="login_advanced">Papildomi nustatymai</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">Privatumo politika</string>
-    <string name="login_contact_header">Trouble signing in? Contact us!</string>
-    <string name="login_contact_email">El. paštas</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_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">I forgot my password</string>
-    <string name="login_recover_title">Recover your account</string>
-    <string name="login_recover">Atkurti</string>
-    <string name="login_signed_in">Student is already signed in</string>
-    <!--Main-->
-    <string name="main_account_picker">Paskyros valdymas</string>
-    <string name="main_log_in">Prisijungti</string>
-    <string name="main_session_expired">Sesijos laikas baigėsi</string>
-    <string name="main_session_relogin">Sesijos laikas baigėsi, prašome prisijungti iš naujo</string>
-    <!--Grade-->
-    <string name="grade_header">Laipsnis</string>
-    <string name="grade_semester">Semestras %d</string>
-    <string name="grade_switch_semester">Keisti semestrą</string>
-    <string name="grade_no_items">Jokių laipsnių</string>
-    <string name="grade_weight">Svoris</string>
-    <string name="grade_weight_value">Svoris: %s</string>
-    <string name="grade_comment">Pastabos</string>
-    <string name="grade_no_new_items">Jokių naujų laipsnių</string>
-    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
-    <string name="grade_average">Vidurkis: %1$.2f</string>
-    <string name="grade_points_sum">Puantai: %s</string>
-    <string name="grade_no_average">Jokiu vidurkis</string>
-    <string name="grade_predicted">Numatomas: %1$s</string>
-    <string name="grade_final">Galutinis: %1$s</string>
-    <string name="grade_summary_points">Bendras punktų skaičius</string>
-    <string name="grade_summary_final_grade">Galutinis laipsnis</string>
-    <string name="grade_summary_predicted_grade">Numatomas laipsnis</string>
-    <string name="grade_summary_calculated_average">Calculated average</string>
-    <string name="grade_summary_final_average">Final average</string>
-    <string name="grade_menu_summary">Summary</string>
-    <string name="grade_menu_statistics">Class</string>
-    <string name="grade_menu_read">Mark as read</string>
-    <string name="grade_statistics_partial">Partial</string>
-    <string name="grade_statistics_semester">Semester</string>
-    <string name="grade_statistics_points">Points</string>
-    <string name="grade_statistics_legend">Legend</string>
-    <string name="grade_statistics_average">Average: %1$s</string>
-    <string name="grade_statistics_average_class">Class</string>
-    <string name="grade_statistics_average_student">Student</string>
-    <plurals name="grade_number_item">
-        <item quantity="one">%d grade</item>
-        <item quantity="few">%d grades</item>
-        <item quantity="many">%d grades</item>
-        <item quantity="other">%d grades</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one">New grade</item>
-        <item quantity="few">New grades</item>
-        <item quantity="many">New grades</item>
-        <item quantity="other">New grades</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">You received %1$d grade</item>
-        <item quantity="few">You received %1$d grades</item>
-        <item quantity="many">You received %1$d grades</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="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">Lesson</string>
-    <string name="timetable_room">Room</string>
-    <string name="timetable_group">Group</string>
-    <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-->
-    <string name="completed_lessons_title">Completed lessons</string>
-    <string name="completed_lessons_button">Show completed lessons</string>
-    <string name="completed_lessons_no_items">No info about completed lessons</string>
-    <string name="completed_lessons_topic">Topic</string>
-    <string name="completed_lessons_absence">Absence</string>
-    <string name="completed_lessons_resources">Resources</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Additional lessons</string>
-    <string name="additional_lessons_button">Show additional lessons</string>
-    <string name="additional_lessons_no_items">No info about additional lessons</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Attendance summary</string>
-    <string name="attendance_absence_school">Absent for school reasons</string>
-    <string name="attendance_absence_excused">Excused absence</string>
-    <string name="attendance_absence_unexcused">Unexcused absence</string>
-    <string name="attendance_exemption">Exemption</string>
-    <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="few">%1$d absences</item>
-        <item quantity="many">%1$d absences</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 excuse request sent 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-->
-    <string name="exam_no_items">No exams this week</string>
-    <string name="exam_type">Type</string>
-    <string name="exam_entry_date">Entry date</string>
-    <!--Message-->
-    <string name="message_inbox">Inbox</string>
-    <string name="message_sent">Sent</string>
-    <string name="message_trash">Trash</string>
-    <string name="message_no_subject">(no subject)</string>
-    <string name="message_no_items">No messages</string>
-    <string name="message_preview_error">An error occurred while downloading message content</string>
-    <string name="message_from">From:</string>
-    <string name="message_to">To:</string>
-    <string name="message_date">Date: %s</string>
-    <string name="message_reply">Reply</string>
-    <string name="message_forward">Forward</string>
-    <string name="message_delete">Delete</string>
-    <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>
-    <string name="message_not_exists">Message does not exist</string>
-    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
-    <string name="message_content_min_length">The message content must be at least 3 characters</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%d message</item>
-        <item quantity="few">%d messages</item>
-        <item quantity="many">%d messages</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">New message</item>
-        <item quantity="few">New messages</item>
-        <item quantity="many">New messages</item>
-        <item quantity="other">New messages</item>
-    </plurals>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">You received %1$d message</item>
-        <item quantity="few">You received %1$d messages</item>
-        <item quantity="many">You received %1$d messages</item>
-        <item quantity="other">You received %1$d messages</item>
-    </plurals>
-    <!--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="few">%d notes</item>
-        <item quantity="many">%d notes</item>
-        <item quantity="other">%d notes</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one">New note</item>
-        <item quantity="few">New notes</item>
-        <item quantity="many">New notes</item>
-        <item quantity="other">New notes</item>
-    </plurals>
-    <plurals name="note_notify_new_items">
-        <item quantity="one">You received %1$d note</item>
-        <item quantity="few">You received %1$d notes</item>
-        <item quantity="many">You received %1$d notes</item>
-        <item quantity="other">You received %1$d notes</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">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-->
-    <string name="lucky_number_title">Lucky number</string>
-    <string name="lucky_number_header">Today\'s lucky number is</string>
-    <string name="lucky_number_empty">No info about the lucky number</string>
-    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
-    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %d</string>
-    <string name="lucky_number_history_button">Show history</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Lucky number history</string>
-    <string name="lucky_number_history_empty">No info about lucky numbers</string>
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Mobile devices</string>
-    <string name="mobile_devices_no_items">No devices</string>
-    <string name="mobile_devices_unregister">Deregister</string>
-    <string name="mobile_device_removed">Device removed</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">School and teachers</string>
-    <!--School-->
-    <string name="school_title">School</string>
-    <string name="school_no_info">No info about school</string>
-    <string name="school_name">School name</string>
-    <string name="school_address">School address</string>
-    <string name="school_telephone">Telephone</string>
-    <string name="school_headmaster">Name of headmaster</string>
-    <string name="school_pedagogue">Name of pedagogue</string>
-    <string name="school_address_button">Show on map</string>
-    <string name="school_telephone_button">Call</string>
-    <!--Teacher-->
-    <string name="teachers_title">Teachers</string>
-    <string name="teacher_no_items">No info about teachers</string>
-    <string name="teacher_no_subject">No subject</string>
-    <!--Conference-->
-    <string name="conferences_title">Conferences</string>
-    <string name="conference_no_items">No info about conferences</string>
-    <!--Account-->
-    <string name="account_add_new">Add account</string>
-    <string name="account_logout">Logout</string>
-    <string name="account_confirm">Do you want to log out this 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>
-    <string name="account_details_edit">Edit data</string>
-    <string name="account_quick_manager">Accounts manager</string>
-    <string name="account_select_student">Select student</string>
-    <string name="account_family">Family</string>
-    <string name="account_contact">Contact</string>
-    <string name="account_address">Residence details</string>
-    <string name="account_personal_data">Personal information</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>
-    <string name="about_faq_summary">Read Frequently Asked Questions</string>
-    <string name="about_discord">Discord server</string>
-    <string name="about_discord_summary">Join the Wulkanowy community</string>
-    <string name="about_facebook">Facebook fanpage</string>
-    <string name="about_facebook_summary">Like our facebook fanpage</string>
-    <string name="about_privacy">Privacy policy</string>
-    <string name="about_privacy_summary">Rules for collecting personal data</string>
-    <string name="about_homepage">Homepage</string>
-    <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>
-    <!--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>
-    <!--Student info-->
-    <string name="student_info_empty">No info about student or student family</string>
-    <string name="student_info_first_name">Name</string>
-    <string name="student_info_second_name">Second name</string>
-    <string name="student_info_gender">Gender</string>
-    <string name="student_info_polish_citizenship">Polish citizenship</string>
-    <string name="student_info_family_name">Family name</string>
-    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
-    <string name="student_info_phone">Phone</string>
-    <string name="student_info_cellphone">Cellphone</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Address of residence</string>
-    <string name="student_info_registered_address">Address of registration</string>
-    <string name="student_info_correspondence_address">Correspondence address</string>
-    <string name="student_info_full_name">Surname and first name</string>
-    <string name="student_info_kinship">Degree of kinship</string>
-    <string name="student_info_guardian_address">Address</string>
-    <string name="student_info_phones">Phones</string>
-    <string name="student_info_male">Male</string>
-    <string name="student_info_female">Female</string>
-    <string name="student_info_last_name">Last name</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Nick</string>
-    <string name="account_edit_header">Add nick</string>
-    <string name="account_edit_avatar_title">Choose avatar color</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>
-    <string name="all_description">Description</string>
-    <string name="all_no_description">No description</string>
-    <string name="all_teacher">Teacher</string>
-    <string name="all_date">Date</string>
-    <string name="all_entry_date">Entry date</string>
-    <string name="all_color">Color</string>
-    <string name="all_details">Details</string>
-    <string name="all_category">Category</string>
-    <string name="all_close">Close</string>
-    <string name="all_no_data">No data</string>
-    <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>
-    <string name="all_yes">Yes</string>
-    <string name="all_no">No</string>
-    <string name="all_save">Save</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">No lessons</string>
-    <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-->
-    <string name="pref_view_header">App appearance &amp; behavior</string>
-    <string name="pref_view_list">Default view</string>
-    <string name="pref_view_grade_average_mode">Calculation of the end-of-year average</string>
-    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
-    <string name="pref_view_present">Show presence</string>
-    <string name="pref_view_app_theme">Theme</string>
-    <string name="pref_view_expand_grade">Expand grades</string>
-    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
-    <string name="pref_view_timetable_show_groups">Show groups next to subjects</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</string>
-    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
-    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
-    <string name="pref_view_app_language">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_notify_disabled_summary">Synchronization is disabled</string>
-    <string name="pref_services_header">Synchronization</string>
-    <string name="pref_services_switch">Automatic update</string>
-    <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_other_grade_modifier_plus">Value of the plus</string>
-    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
-    <string name="pref_other_fill_message_content">Reply with message history</string>
-    <string name="pref_settings_advanced_title">Advanced</string>
-    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
-    <string name="pref_settings_notifications_title">Notifications</string>
-    <string name="pref_settings_sync_title">Synchronization</string>
-    <string name="pref_grades_appearance_header">Grades</string>
-    <string name="pref_attendance_appearance_view">Attendance</string>
-    <string name="pref_timetable_appearance_view">Timetable</string>
-    <string name="pref_grades_advanced_header">Grades</string>
-    <string name="pref_messages_advanced_header">Messages</string>
-    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
-    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
-    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
-    <string name="pref_notifications_category">Notifications</string>
-    <string name="pref_sync_category">Synchronization</string>
-    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
-    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
-    <string name="pref_advanced_category">Advanced</string>
-    <string name="pref_about_category_summary">App version, contributors, social portals, licenses</string>
-    <!--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>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">End of support</string>
-    <string name="drop_kitkat_content">We are ending support for your device. No more new features will appear for it in Wulkanowy. However, we will be releasing critical patches until the end of 2021 so you have time to switch to a newer model</string>
-    <string name="drop_kitkat_again">Don\'t show again</string>
-    <!--Colors-->
-    <string name="all_black">Black</string>
-    <string name="all_red">Red</string>
-    <string name="all_blue">Blue</string>
-    <string name="all_green">Green</string>
-    <string name="all_purple">Purple</string>
-    <string name="all_empty_color">No color</string>
-    <!--Others-->
-    <string name="all_copied">Copied</string>
-    <string name="all_undo">Undo</string>
-    <!--Update helper-->
-    <string name="update_download_started">Download of updates has started…</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 register failed. Servers can be overloaded. Please try again later</string>
-    <string name="error_login_failed">Loading data failed. Please try again later</string>
-    <string name="error_password_change_required">Register 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. Please try again later</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. Login in a mode other than Mobile API</string>
-</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 68a9fa2fe..a06a46f00 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,60 +1,21 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents">
-        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
         <item name="colorPrimary">@color/colorPrimaryLight</item>
         <item name="colorSecondary">@color/colorPrimaryLight</item>
         <item name="colorTimetableChange">@color/timetable_change_light</item>
         <item name="colorError">@color/colorErrorLight</item>
         <item name="colorDivider">@color/colorDividerInverse</item>
-        <item name="colorSwipeRefresh">@color/colorSwipeRefreshDark</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">
-            @color/colorNavigationBarLight
-        </item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">
-            @color/colorStatusBarLight
+        <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>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
     </style>
 
     <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
         <item name="colorSurface">@android:color/black</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">
-            @color/colorNavigationBarBlack
-        </item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@color/colorStatusBarBlack</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-    </style>
-
-    <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">?colorSurface</item>
-    </style>
-
-    <style name="WulkanowyTheme.Login.Black" parent="WulkanowyTheme.Black">
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">?colorSurface</item>
-    </style>
-
-    <style name="WulkanowyTheme.MessageSend" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">#1C1C1C</item>
-    </style>
-
-    <style name="WulkanowyTheme.MessageSend.Black" parent="WulkanowyTheme.Black">
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
-    </style>
-
-    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Dialog">
-        <item name="colorPrimary">@color/colorPrimaryLight</item>
-        <item name="colorSecondary">@color/colorPrimaryLight</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index b25dc3e59..1d81fb586 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -12,8 +12,6 @@
         <item>Pусский</item>
         <item>Українська</item>
         <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
     </string-array>
     <string-array name="services_interval_entries">
         <item>15 minut</item>
@@ -25,16 +23,12 @@
         <item>24 godziny</item>
     </string-array>
     <string-array name="grade_modifier_entries">
-        <item>0,00</item>
+        <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>Alfabetycznie</item>
-        <item>Według daty</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fb538fadb..7f25d8a67 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -17,20 +17,17 @@
     <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">Menadżer kont</string>
-    <string name="account_quick_title">Wybierz konto</string>
-    <string name="account_details_title">Szczegóły konta</string>
-    <string name="student_info_title">Informacje o uczniu</string>
+    <string name="account_title">Wybierz konto</string>
     <!--Subtitles-->
-    <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
+    <string name="grade_subtitle">Semestr %d, %d/%d</string>
     <!--Login-->
     <string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
-    <string name="login_header_symbol">Podaj symbol ze strony dziennika</string>
+    <string name="login_header_symbol">Podaj symbol</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">Odmiana dziennika UONET+</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>
@@ -40,18 +37,17 @@
     <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. Upewnij się, że została wybrana odpowiednia odmiana dziennika UONET+ w polu poniżej</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">Użyj przydzielonego loginu zamiast emaila</string>
-    <string name="login_invalid_custom_email">Użyj przypisanego loginu lub adresu e-mail w @%1$s</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ź poprawność symbolu i wybranej odmiany dziennika UONET+</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&#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ła ustawiona odpowiednia odmiana dziennika. Wulkanowy na chwilę obecną nie wykrywa uczniów przedszkolnych</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>
@@ -63,7 +59,7 @@
     <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ła wybrana odpowiednia odmiana dziennika UONET+!</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>
@@ -99,10 +95,6 @@
     <string name="grade_statistics_partial">Cząstkowe</string>
     <string name="grade_statistics_semester">Semestralne</string>
     <string name="grade_statistics_points">Punkty</string>
-    <string name="grade_statistics_legend">Legenda</string>
-    <string name="grade_statistics_average">Średnia: %1$s</string>
-    <string name="grade_statistics_average_class">Klasa</string>
-    <string name="grade_statistics_average_student">Uczeń</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d ocena</item>
         <item quantity="few">%d oceny</item>
@@ -115,36 +107,12 @@
         <item quantity="many">Nowe oceny</item>
         <item quantity="other">Nowe oceny</item>
     </plurals>
-    <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>
@@ -167,10 +135,6 @@
     <string name="completed_lessons_topic">Temat</string>
     <string name="completed_lessons_absence">Nieobecność</string>
     <string name="completed_lessons_resources">Zasoby</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Dodatkowe lekcje</string>
-    <string name="additional_lessons_button">Pokaż dodatkowe lekcje</string>
-    <string name="additional_lessons_no_items">Brak informacji o dodatkowych lekcjach</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Podsumowanie frekwencji</string>
     <string name="attendance_absence_school">Nieobecność z przyczyn szkolnych</string>
@@ -180,8 +144,6 @@
     <string name="attendance_excused_lateness">Spóźnienie usprawiedliwione</string>
     <string name="attendance_unexcused_lateness">Spóźnienie nieusprawiedliwione</string>
     <string name="attendance_present">Obecność</string>
-    <string name="attendance_deleted">Usunięto</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">
@@ -192,7 +154,7 @@
     </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">Prośba o usprawiedliwienie została pomyślnie wysłana!</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-->
@@ -218,12 +180,9 @@
     <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>
-    <string name="message_not_exists">Wiadomość nie istnieje</string>
     <string name="message_required_recipients">Musisz wybrać co najmniej 1 adresata</string>
     <string name="message_content_min_length">Treść wiadomości musi zawierać co najmniej 3 znaki</string>
     <plurals name="message_number_item">
@@ -265,44 +224,6 @@
         <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>
@@ -314,10 +235,6 @@
     <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>
-    <string name="lucky_number_history_button">Pokaż historię</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Historia numerków</string>
-    <string name="lucky_number_history_empty">Brak informacji o szczęśliwych numerkach</string>
     <!--Mobile devices-->
     <string name="mobile_devices_title">Dostęp mobilny</string>
     <string name="mobile_devices_no_items">Brak urządzeń</string>
@@ -343,25 +260,11 @@
     <string name="teachers_title">Nauczyciele</string>
     <string name="teacher_no_items">Brak informacji o nauczycielach</string>
     <string name="teacher_no_subject">Brak przedmiotu</string>
-    <!--Conference-->
-    <string name="conferences_title">Zebrania</string>
-    <string name="conference_no_items">Brak informacji o zebraniach</string>
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
-    <string name="account_confirm">Czy chcesz wylogować tego ucznia?</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>
-    <string name="account_details_edit">Edytuj dane</string>
-    <string name="account_quick_manager">Menadżer kont</string>
-    <string name="account_select_student">Wybierz ucznia</string>
-    <string name="account_family">Rodzina</string>
-    <string name="account_contact">Kontakt</string>
-    <string name="account_address">Dane adresowe</string>
-    <string name="account_personal_data">Dane osobowe</string>
     <!--About-->
     <string name="about_version">Wersja aplikacji</string>
     <string name="about_contributor">Twórcy</string>
@@ -372,8 +275,6 @@
     <string name="about_faq_summary">Zobacz Najczęściej Zadawane Pytania</string>
     <string name="about_discord">Serwer Discord</string>
     <string name="about_discord_summary">Dołącz do społeczności Wulkanowego</string>
-    <string name="about_facebook">Fanpage na Facebooku</string>
-    <string name="about_facebook_summary">Polub nasz fanpage na Facebooku</string>
     <string name="about_privacy">Polityka prywatności</string>
     <string name="about_privacy_summary">Zasady zbierania danych osobowych</string>
     <string name="about_homepage">Strona domowa</string>
@@ -385,31 +286,6 @@
     <!--Contributor-->
     <string name="contributor_avatar_description">Awatar</string>
     <string name="contributor_see_more">Zobacz więcej na GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">Brak informacji o uczniu lub rodzinie ucznia</string>
-    <string name="student_info_first_name">Imię</string>
-    <string name="student_info_second_name">Drugie imię</string>
-    <string name="student_info_gender">Płeć</string>
-    <string name="student_info_polish_citizenship">Obywatelstwo polskie</string>
-    <string name="student_info_family_name">Nazwisko rodowe</string>
-    <string name="student_info_parents_name">Imiona matki i ojca</string>
-    <string name="student_info_phone">Telefon</string>
-    <string name="student_info_cellphone">Telefon komórkowy</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Adres zamieszkania</string>
-    <string name="student_info_registered_address">Adres zameldowania</string>
-    <string name="student_info_correspondence_address">Adres korespondencyjny</string>
-    <string name="student_info_full_name">Nazwisko i imię</string>
-    <string name="student_info_kinship">Stopień pokrewieństwa</string>
-    <string name="student_info_guardian_address">Adres</string>
-    <string name="student_info_phones">Telefony</string>
-    <string name="student_info_male">Mężczyzna</string>
-    <string name="student_info_female">Kobieta</string>
-    <string name="student_info_last_name">Nazwisko</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Pseudonim</string>
-    <string name="account_edit_header">Dodaj pseudonim</string>
-    <string name="account_edit_avatar_title">Wybierz kolor awatara</string>
     <!--Log viewer-->
     <string name="logviewer_share">Udostępnij logi</string>
     <string name="logviewer_refresh">Odśwież</string>
@@ -433,10 +309,7 @@
     <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>
-    <string name="all_yes">Tak</string>
-    <string name="all_no">Nie</string>
-    <string name="all_save">Zapisz</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>
@@ -444,21 +317,18 @@
     <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 i zachowanie aplikacji</string>
+    <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
     <string name="pref_view_grade_average_mode">Obliczanie średniej końcoworocznej</string>
     <string name="pref_view_grade_average_force_calc">Wymuś obliczanie średniej przez aplikację</string>
-    <string name="pref_view_present">Pokazuj obecność</string>
-    <string name="pref_view_app_theme">Motyw</string>
+    <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ę</string>
-    <string name="pref_view_timetable_show_groups">Pokazuj grupę obok przedmiotu</string>
+    <string name="pref_view_timetable_show_timers">Oznaczaj bieżącą lekcję 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</string>
     <string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
-    <string name="pref_view_grade_sorting_mode">Sortowanie przedmiotów</string>
-    <string name="pref_view_app_language">Język</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>
@@ -466,7 +336,6 @@
     <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_notify_disabled_summary">Synchronizacja jest wyłączona</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>
@@ -476,27 +345,14 @@
     <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>
-    <string name="pref_settings_advanced_title">Zaawansowane</string>
-    <string name="pref_settings_appearance_title">Wygląd i zachowanie</string>
-    <string name="pref_settings_notifications_title">Powiadomienia</string>
-    <string name="pref_settings_sync_title">Synchronizacja</string>
-    <string name="pref_grades_appearance_header">Oceny</string>
-    <string name="pref_attendance_appearance_view">Frekwencja</string>
-    <string name="pref_timetable_appearance_view">Plan lekcji</string>
-    <string name="pref_grades_advanced_header">Oceny</string>
-    <string name="pref_messages_advanced_header">Wiadomości</string>
-    <string name="pref_appearance_category">Wygląd i zachowanie</string>
-    <string name="pref_appearance_category_summary">Języki, motywy, sortowanie przedmiotów</string>
-    <string name="pref_notifications_category_summary">Powiadomienia aplikacji, naprawianie problemów</string>
-    <string name="pref_notifications_category">Powiadomienia</string>
-    <string name="pref_sync_category">Synchronizacja</string>
-    <string name="pref_sync_category_summary">Automatyczna aktualizacja, interwał synchronizacji</string>
-    <string name="pref_advanced_category_summary">Wartości plusa i minusa, obliczanie średniej</string>
-    <string name="pref_advanced_category">Zaawansowane</string>
-    <string name="pref_about_category_summary">Wersja aplikacji, twórcy, media społecznościowe, licencje</string>
     <!--Notification Channels-->
     <string name="channel_new_entries">Nowe wpisy w dzienniku</string>
     <string name="channel_new_grades">Nowe oceny</string>
@@ -506,10 +362,6 @@
     <string name="channel_push">Powiadomienia push</string>
     <string name="channel_upcoming_lessons">Nadchodzące lekcje</string>
     <string name="channel_debug">Debugowanie</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Koniec wsparcia</string>
-    <string name="drop_kitkat_content">Kończymy wsparcie dla Twojego urządzenia. Nie pojawią się już dla niego żadne nowe funkcje w Wulkanowym. Będziemy jednak wypuszczać krytyczne poprawki do końca 2021 roku, abyś miał czas na przeniesienie się na nowszy model</string>
-    <string name="drop_kitkat_again">Nie pokazuj ponownie</string>
     <!--Colors-->
     <string name="all_black">Czarny</string>
     <string name="all_red">Czerwony</string>
@@ -520,19 +372,12 @@
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
     <string name="all_undo">Cofnij</string>
-    <!--Update helper-->
-    <string name="update_download_started">Rozpoczęto pobieranie aktualizacji…</string>
-    <string name="update_download_success">Aktualizacja została pobrana.</string>
-    <string name="update_download_success_button">Uruchom ponownie</string>
-    <string name="update_failed">Aktualizacja nie powiodła się! Wulkanowy może nie działać prawidłowo. Rozważ aktualizację</string>
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
-    <string name="error_timeout">Nie udało się połączyć z dziennikiem. Serwery mogą być przeciążone. Spróbuj ponownie później</string>
-    <string name="error_login_failed">Ładowanie danych nie powiodło się. Spróbuj ponownie później</string>
-    <string name="error_password_change_required">Wymagana zmiana hasła do dziennika</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_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">Nieznany błąd dziennika UONET+. Spróbuj ponownie później</string>
-    <string name="error_unknown_app">Nieznany błąd aplikacji. Spróbuj ponownie później</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. Zaloguj się w trybie innym niż Mobilne API</string>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index 64b777fb3..bd8bb844f 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -12,8 +12,6 @@
         <item>Pусский</item>
         <item>Українська</item>
         <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
     </string-array>
     <string-array name="services_interval_entries">
         <item>15 минут</item>
@@ -31,10 +29,6 @@
         <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>
@@ -42,8 +36,8 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Средняя оценка со 2 семестра</item>
-        <item>Средняя оценка с двух семестров</item>
-        <item>Средняя оценок со всего года</item>
+        <item>Average of grades from both semesters</item>
+        <item>Средняя оценка с целого года</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показывать</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 665d9dc46..6eb8f7741 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -8,7 +8,7 @@
     <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>
@@ -17,41 +17,37 @@
     <string name="send_message_title">Новое сообщение</string>
     <string name="note_title">Предупреждения и свершения</string>
     <string name="homework_title">Домашние задания</string>
-    <string name="account_title">Менеджер аккаунтов</string>
-    <string name="account_quick_title">Выбор учетной записи</string>
-    <string name="account_details_title">Данные аккаунта</string>
-    <string name="student_info_title">Информация о студенте</string>
+    <string name="account_title">Выберите аккаунт</string>
     <!--Subtitles-->
-    <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
+    <string name="grade_subtitle">%d семестр, %d/%d</string>
     <!--Login-->
     <string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
-    <string name="login_header_symbol">Введите символ со страницы регистрации</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">UONET + вариант регистрации</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_symbol_hint">Symbol</string>
     <string name="login_sign_in">Войти</string>
     <string name="login_invalid_password">Слишком короткий пароль</string>
-    <string name="login_incorrect_password">Данные для входа неверны. Убедитесь, что в поле ниже выбран правильный вариант регистра UONET+</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">Token просрочен</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_custom_email">Использовать назначенный логин или email в @%1$s</string>
-    <string name="login_invalid_symbol">Неправильный символ</string>
-    <string name="login_incorrect_symbol">Студент не найден. Подтвердите символ и выбранный вариант регистра UONET+</string>
-    <string name="login_field_required">Это обязательное поле</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">Этот символ можно найти на странице регистрации в &#160;<b>Ученик</b> → &#160;<b>Телефонный доступ</b> → &#160;<b> Зарегистрируйте мобильное устройство</b>.\n\nУбедитесь, что вы установили соответствующий вариант регистра в поле <b>Разновидностью бревна UONET+</b> на предыдущем экране. Вулкановый на данный момент не обнаруживает дошкольников</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>
@@ -63,8 +59,8 @@
     <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">Убедитесь, что вы выбрали правильный вариант регистра UONET+!</string>
-    <string name="login_recover_button">Я забыл свой пароль</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>
@@ -72,7 +68,7 @@
     <string name="main_account_picker">Менеджер аккаунтов</string>
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
-    <string name="main_session_relogin">Сеанс истёк, пожалуйста, войдите ещё раз</string>
+    <string name="main_session_relogin">Сеанс истёк, пожалуйста, авторизируйтесь ещё раз</string>
     <!--Grade-->
     <string name="grade_header">Оценка</string>
     <string name="grade_semester">Семестр %d</string>
@@ -99,10 +95,6 @@
     <string name="grade_statistics_partial">Частичные</string>
     <string name="grade_statistics_semester">За семестр</string>
     <string name="grade_statistics_points">Баллы</string>
-    <string name="grade_statistics_legend">Легенда</string>
-    <string name="grade_statistics_average">Средняя: %1$s</string>
-    <string name="grade_statistics_average_class">Класс</string>
-    <string name="grade_statistics_average_student">Студент</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d оценка</item>
         <item quantity="few">%d оценки</item>
@@ -115,43 +107,19 @@
         <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>
+    <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>
@@ -167,10 +135,6 @@
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Отсутствие</string>
     <string name="completed_lessons_resources">Ресурсы</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Дополнительные уроки</string>
-    <string name="additional_lessons_button">Показать дополнительные уроки</string>
-    <string name="additional_lessons_no_items">Нет информации о дополнительных уроках</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Итоговая посещаемость</string>
     <string name="attendance_absence_school">Отсутствие по школьным причинам</string>
@@ -180,8 +144,6 @@
     <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">
@@ -192,7 +154,7 @@
     </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_success">Статус отсутствия изменён</string>
     <string name="attendance_excuse_no_selection">Выберите хотя-бы одно отсутствие</string>
     <string name="attendance_excuse_title">Изменить статус</string>
     <!--Attendance summary-->
@@ -218,12 +180,9 @@
     <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>
-    <string name="message_not_exists">Сообщения не существует</string>
     <string name="message_required_recipients">Вы должны выбрать как минимум одного получателя</string>
     <string name="message_content_min_length">Текст сообщения должен содержать как минимум 3 знака</string>
     <plurals name="message_number_item">
@@ -245,7 +204,7 @@
         <item quantity="other">Вы получили %1$d новых сообщений</item>
     </plurals>
     <!--Note-->
-    <string name="note_no_items">Нет информации о заметках</string>
+    <string name="note_no_items">Нет данных о предупреждениях</string>
     <string name="note_points">Баллы</string>
     <plurals name="note_number_item">
         <item quantity="one">%d предупреждение</item>
@@ -265,63 +224,21 @@
         <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_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_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>
-    <string name="lucky_number_history_button">Показать историю</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">История удачных чисел</string>
-    <string name="lucky_number_history_empty">Нет информации о номерах удачи</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_devices_unregister">Удалить</string>
     <string name="mobile_device_removed">Устройство удалено</string>
     <string name="mobile_device_qr">QR-код</string>
     <string name="mobile_device_token">Token</string>
@@ -335,45 +252,29 @@
     <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_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>
-    <!--Conference-->
-    <string name="conferences_title">Встречи</string>
-    <string name="conference_no_items">Нет информации о встречах</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>
-    <string name="account_details_edit">Изменить данные</string>
-    <string name="account_quick_manager">Менеджер аккаунтов</string>
-    <string name="account_select_student">Выберите Студента</string>
-    <string name="account_family">Семья</string>
-    <string name="account_contact">Контакт</string>
-    <string name="account_address">Детали проживания</string>
-    <string name="account_personal_data">Персональные данные</string>
     <!--About-->
     <string name="about_version">Версия приложения</string>
     <string name="about_contributor">Разработчики</string>
-    <string name="about_contributor_summary">Список разработчиков \"Вулкановый\"</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_discord">Сервер Discord</string>
     <string name="about_discord_summary">Присоединиться к сообществу приложения</string>
-    <string name="about_facebook">Facebook фан-страница</string>
-    <string name="about_facebook_summary">Поставьте лайк на нашей странице в Facebook</string>
     <string name="about_privacy">Политика приватности</string>
     <string name="about_privacy_summary">Правила хранения личных данных</string>
     <string name="about_homepage">Домашняя страница</string>
@@ -385,31 +286,6 @@
     <!--Contributor-->
     <string name="contributor_avatar_description">Aватар</string>
     <string name="contributor_see_more">Страница проекта на GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">Нет информации об ученике или семье ученика</string>
-    <string name="student_info_first_name">Имя</string>
-    <string name="student_info_second_name">Фамилия</string>
-    <string name="student_info_gender">Пол</string>
-    <string name="student_info_polish_citizenship">Польское гражданство</string>
-    <string name="student_info_family_name">Фамилия</string>
-    <string name="student_info_parents_name">Имена матери и отца</string>
-    <string name="student_info_phone">Телефон</string>
-    <string name="student_info_cellphone">Сотовый телефон</string>
-    <string name="student_info_email">Эл. почта</string>
-    <string name="student_info_address">Адрес проживания</string>
-    <string name="student_info_registered_address">Адрес регистрации</string>
-    <string name="student_info_correspondence_address">Адрес переписки</string>
-    <string name="student_info_full_name">Фамилия и имя</string>
-    <string name="student_info_kinship">Степень родства</string>
-    <string name="student_info_guardian_address">Адрес</string>
-    <string name="student_info_phones">Телефоны</string>
-    <string name="student_info_male">Муж</string>
-    <string name="student_info_female">Женская</string>
-    <string name="student_info_last_name">Фамилия</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Ник</string>
-    <string name="account_edit_header">Добавить ник</string>
-    <string name="account_edit_avatar_title">Выберите цвет аватара</string>
     <!--Log viewer-->
     <string name="logviewer_share">Поделиться логами</string>
     <string name="logviewer_refresh">Обновить</string>
@@ -433,10 +309,7 @@
     <string name="all_prev">Предыдущий</string>
     <string name="all_next">Следующий</string>
     <string name="all_search">Поиск</string>
-    <string name="all_search_hint">Поиск…</string>
-    <string name="all_yes">Да</string>
-    <string name="all_no">Нет</string>
-    <string name="all_save">Сохранить</string>
+    <string name="all_search_hint">Поиск...</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
@@ -444,21 +317,18 @@
     <string name="widget_timetable_theme_dark">Тёмная</string>
     <string name="widget_timetable_theme_system">Тема системы</string>
     <!--Preferences-->
-    <string name="pref_view_header">Внешний вид приложения &amp; поведение</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_timetable_show_timers">Отметить текущий урок</string>
-    <string name="pref_view_timetable_show_groups">Показать группы рядом с темами</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_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_view_app_language">Язык приложения</string>
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
     <string name="pref_notify_upcoming_lessons_switch">Показывать уведомления о будущих уроках</string>
@@ -466,7 +336,6 @@
     <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_notify_disabled_summary">Синхронизация отключена</string>
     <string name="pref_services_header">Синхронизация</string>
     <string name="pref_services_switch">Автоматическая синхронизация</string>
     <string name="pref_services_suspended">Приостановить синхронизации во время каникул</string>
@@ -476,27 +345,14 @@
     <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_settings_advanced_title">Расширенные</string>
-    <string name="pref_settings_appearance_title">Внешний вид &amp; Поведение</string>
-    <string name="pref_settings_notifications_title">Уведомления</string>
-    <string name="pref_settings_sync_title">Синхронизация</string>
-    <string name="pref_grades_appearance_header">Оценки</string>
-    <string name="pref_attendance_appearance_view">Посещаемость</string>
-    <string name="pref_timetable_appearance_view">Расписание</string>
-    <string name="pref_grades_advanced_header">Оценки</string>
-    <string name="pref_messages_advanced_header">Сообщения</string>
-    <string name="pref_appearance_category">Внешний вид &amp; Поведение</string>
-    <string name="pref_appearance_category_summary">Языки, темы, темы сортировки темы</string>
-    <string name="pref_notifications_category_summary">Уведомления приложений, проблемы с устранением</string>
-    <string name="pref_notifications_category">Уведомления</string>
-    <string name="pref_sync_category">Синхронизация</string>
-    <string name="pref_sync_category_summary">Автоматическое обновление, интервал синхронизации</string>
-    <string name="pref_advanced_category_summary">Значения плюс и минус, средний расчет</string>
-    <string name="pref_advanced_category">Расширенные</string>
-    <string name="pref_about_category_summary">Версия приложения, участники, социальные порталы, лицензии</string>
     <!--Notification Channels-->
     <string name="channel_new_entries">Новые данные в дневнике</string>
     <string name="channel_new_grades">Новые оценки</string>
@@ -506,10 +362,6 @@
     <string name="channel_push">Показывать push-уведомления</string>
     <string name="channel_upcoming_lessons">Будущие уроки</string>
     <string name="channel_debug">Дебаг</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Конец поддержки</string>
-    <string name="drop_kitkat_content">Поддержка заканчивается на вашем устройстве. В Wulkanowy больше не появятся новые возможности. Однако до конца 2021 года мы выпустим критические патчи, чтобы у вас было время перейти на новую модель</string>
-    <string name="drop_kitkat_again">Не показывать снова</string>
     <!--Colors-->
     <string name="all_black">Чёрный</string>
     <string name="all_red">Красный</string>
@@ -520,19 +372,12 @@
     <!--Others-->
     <string name="all_copied">Скопировано</string>
     <string name="all_undo">Отменить</string>
-    <!--Update helper-->
-    <string name="update_download_started">Загрузка обновлений началась…</string>
-    <string name="update_download_success">Только что было скачано обновление.</string>
-    <string name="update_download_success_button">Перезапустить</string>
-    <string name="update_failed">Не удалось обновить! Wulkanowy может работать некорректно. Рассмотрите возможность обновления</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_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_uonet">Неизвестная ошибка UONET + регистр. Попробуйте позже</string>
-    <string name="error_unknown_app">Неизвестная ошибка приложения. Пожалуйста, повторите попытку позже</string>
     <string name="error_unknown">Произошла неожиданная ошибка</string>
     <string name="error_feature_disabled">Функция была выключена школой</string>
     <string name="error_feature_not_available">Функция не доступна в этом режиме</string>
diff --git a/app/src/main/res/values-sk-v29/preferences_values.xml b/app/src/main/res/values-sk-v29/preferences_values.xml
deleted file mode 100644
index 8c5306bb7..000000000
--- a/app/src/main/res/values-sk-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>Motív systému</item>
-        <item>Svetlý</item>
-        <item>Tmavý</item>
-        <item>Čierny (AMOLED)</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
deleted file mode 100644
index b0ba9839c..000000000
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>Svetlý</item>
-        <item>Tmavý</item>
-        <item>Čierny (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>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minút</item>
-        <item>30 minút</item>
-        <item>1 hodina</item>
-        <item>2 hodiny</item>
-        <item>6 hodín</item>
-        <item>12 hodín</item>
-        <item>24 hodín</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>Abecedne</item>
-        <item>Podľa dátumu</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Farby známok v denníku</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Priemer známok až od druhého semestra</item>
-        <item>Priemer známok z oboch semestrov</item>
-        <item>Priemer známok z celého roka</item>
-    </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nezobrazovať</item>
-        <item>Zobraziť všetko</item>
-        <item>Zobraziť menšie</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
deleted file mode 100644
index 8a5b8d242..000000000
--- a/app/src/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Prihlásenie</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Známky</string>
-    <string name="attendance_title">Dochádzka</string>
-    <string name="exam_title">Skúšky</string>
-    <string name="timetable_title">Plán lekcie</string>
-    <string name="settings_title">Nastavenia</string>
-    <string name="more_title">Viac</string>
-    <string name="about_title">O aplikácii</string>
-    <string name="logviewer_title">Prehliadač protokolov</string>
-    <string name="contributors_title">Prispievatelia</string>
-    <string name="license_title">Licencie</string>
-    <string name="message_title">Správy</string>
-    <string name="send_message_title">Nová správa</string>
-    <string name="note_title">Poznámky a úspechy</string>
-    <string name="homework_title">Domáce úlohy</string>
-    <string name="account_title">Manažér účtov</string>
-    <string name="account_quick_title">Vyberte účet</string>
-    <string name="account_details_title">Podrobnosti účtu</string>
-    <string name="student_info_title">Informácie o žiakovi</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
-    <!--Login-->
-    <string name="login_header_default">Prihláste sa pomocou študentského alebo rodičovského konta</string>
-    <string name="login_header_symbol">Zadajte symbol zo stránky denníka</string>
-    <string name="login_nickname_hint">Užívateľské meno</string>
-    <string name="login_email_hint">Email</string>
-    <string name="login_login_pesel_email_hint">Prihlásenie, číslo PESEL alebo e-mail</string>
-    <string name="login_password_hint">Heslo</string>
-    <string name="login_host_hint">Variácie denníka 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">Kľúč API</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_sign_in">Prihlásiť</string>
-    <string name="login_invalid_password">Toto heslo je príliš krátke</string>
-    <string name="login_incorrect_password">Prihlasovacie údaje sú nesprávne. Uistite sa, že je v poli nižšie vybraná správna variácie denníka UONET+</string>
-    <string name="login_invalid_pin">Neplatný PIN</string>
-    <string name="login_invalid_token">Neplatný token</string>
-    <string name="login_expired_token">Platnosť tokenu vypršala</string>
-    <string name="login_invalid_email">Neplatný e-mail</string>
-    <string name="login_invalid_login">Namiesto e-mailu použite priradené prihlasovacie údaje</string>
-    <string name="login_invalid_custom_email">Použite priradené prihlasovacie alebo e-mail v @%1$s</string>
-    <string name="login_invalid_symbol">Neplatný symbol</string>
-    <string name="login_incorrect_symbol">Žiak nebol nájdený. Skontrolujte správnosť symbolu a vybrané varianty denníka UONET+</string>
-    <string name="login_field_required">Toto pole je povinné</string>
-    <string name="login_duplicate_student">Vybraný žiak už je prihlásený</string>
-    <string name="login_symbol_helper">Symbol nájdete na stránke denníka v &#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nUistite sa, že ste na predchádzajúcu obrazovke nastaviť správny variant denníka do poľa <b>Variácie denníka UONET+</b>. Wulkanowy v túto chvíľu nezistí predškolské żaków</string>
-    <string name="login_select_student">Vyberte žiakov, ktorí sa majú do aplikácie prihlásiť</string>
-    <string name="login_advanced">Iné možnosti</string>
-    <string name="login_advanced_warning_mobile_api">V tomto režime nefungujú nasledovné: šťastné číslo, štatistiky triedy, zhrnutie dochádzky, ospravedlnenie neprítomnosti, dokončené lekcie, informácie o škole a prezeranie zoznamu registrovaných zariadení</string>
-    <string name="login_advanced_warning_scraper">Tento režim zobrazuje rovnaké dáta, ktoré sa zobrazujú na webových stránkach denníka</string>
-    <string name="login_advanced_warning_hybrid">Kombinácia najlepších vlastností ostatných dvoch režimov. Funguje rýchlejšie ako scraper a poskytuje funkcie, ktoré nie sú k dispozícii v režime Mobilne API. Je to v experimentálnej fáze</string>
-    <string name="login_privacy_policy">Zásady ochrany osobných údajov</string>
-    <string name="login_contact_header">Problémy s prihlásením? Napíšte nám!</string>
-    <string name="login_contact_email">Email</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Poslať e-mail</string>
-    <string name="login_email_details">Opíšte podrobnosti problému:</string>
-    <string name="login_recover_warning">Uistite sa, že ste vybrali správny variant denníka UONET+!</string>
-    <string name="login_recover_button">Zabudol som heslo</string>
-    <string name="login_recover_title">Obnovte svoj účet</string>
-    <string name="login_recover">Obnoviť</string>
-    <string name="login_signed_in">Žiak je už prihlásený</string>
-    <!--Main-->
-    <string name="main_account_picker">Manažér účtov</string>
-    <string name="main_log_in">Prihlásiť sa</string>
-    <string name="main_session_expired">Relácia vypršala</string>
-    <string name="main_session_relogin">Relácia vypršala. Prihláste sa prosím znovu</string>
-    <!--Grade-->
-    <string name="grade_header">Známka</string>
-    <string name="grade_semester">Semester %d</string>
-    <string name="grade_switch_semester">Zmeniť semester</string>
-    <string name="grade_no_items">Žiadne známky</string>
-    <string name="grade_weight">Váha</string>
-    <string name="grade_weight_value">Váha: %s</string>
-    <string name="grade_comment">Komentár</string>
-    <string name="grade_no_new_items">Žiadne nové známky</string>
-    <string name="grade_number_new_items">Počet nových známok %1$d</string>
-    <string name="grade_average">Priemer: %1$.2f</string>
-    <string name="grade_points_sum">Body: %s</string>
-    <string name="grade_no_average">Bez priemeru</string>
-    <string name="grade_predicted">Predpokladaná: %1$s</string>
-    <string name="grade_final">Konečná: %1$s</string>
-    <string name="grade_summary_points">Súčet bodov</string>
-    <string name="grade_summary_final_grade">Konečná známka</string>
-    <string name="grade_summary_predicted_grade">Predpokladaná známka</string>
-    <string name="grade_summary_calculated_average">Vypočítaný priemer</string>
-    <string name="grade_summary_final_average">Konečný priemer</string>
-    <string name="grade_menu_summary">Zhrnutie</string>
-    <string name="grade_menu_statistics">Trieda</string>
-    <string name="grade_menu_read">Označiť ako prečítané</string>
-    <string name="grade_statistics_partial">Čiastočné</string>
-    <string name="grade_statistics_semester">Semester</string>
-    <string name="grade_statistics_points">Body</string>
-    <string name="grade_statistics_legend">Vysvetlivky</string>
-    <string name="grade_statistics_average">Priemer: %1$s</string>
-    <string name="grade_statistics_average_class">Trieda</string>
-    <string name="grade_statistics_average_student">Žiák</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ámok</item>
-        <item quantity="other">%d známok</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á predpokladaná známka</item>
-        <item quantity="few">Nové predpokladané známky</item>
-        <item quantity="many">Nové predpokladané známky</item>
-        <item quantity="other">Nové predpokladané 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 novú známku</item>
-        <item quantity="few">Máte %1$d nové známky</item>
-        <item quantity="many">Máte %1$d nových známok</item>
-        <item quantity="other">Máte %1$d nových známok</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Máte %1$d novú predpokladanú známku</item>
-        <item quantity="few">Máte %1$d nové predpokladané známky</item>
-        <item quantity="many">Máte %1$d nových predpokladaných známok</item>
-        <item quantity="other">Máte %1$d nových predpokladaných známok</item>
-    </plurals>
-    <plurals name="grade_notify_new_items_final">
-        <item quantity="one">Máte %1$d novú konečnú známku</item>
-        <item quantity="few">Máte %1$d nové konečnej známky</item>
-        <item quantity="many">Máte %1$d nových konečných známok</item>
-        <item quantity="other">Máte %1$d nových konečných známok</item>
-    </plurals>
-    <!--Timetable-->
-    <string name="timetable_lesson">Lekcia</string>
-    <string name="timetable_room">Učebňa</string>
-    <string name="timetable_group">Skupina</string>
-    <string name="timetable_time">Hodiny</string>
-    <string name="timetable_changes">Zmeny</string>
-    <string name="timetable_no_items">Žiadne lekcie tento deň</string>
-    <string name="timetable_minutes">%s min</string>
-    <string name="timetable_seconds">%s sek</string>
-    <string name="timetable_time_left">ešte %1$s</string>
-    <string name="timetable_time_until">za %1$s</string>
-    <string name="timetable_finished">Ukončila</string>
-    <string name="timetable_now">Teraz: %s</string>
-    <string name="timetable_next">Za chvíľu: %s</string>
-    <string name="timetable_later">Neskôr: %s</string>
-    <!--Completed lessons-->
-    <string name="completed_lessons_title">Dokončené lekcie</string>
-    <string name="completed_lessons_button">Zobraziť dokončené lekcie</string>
-    <string name="completed_lessons_no_items">Žiadne informácie o dokončených lekciách</string>
-    <string name="completed_lessons_topic">Téma</string>
-    <string name="completed_lessons_absence">Neprítomnosť</string>
-    <string name="completed_lessons_resources">Zdroje</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Ďalší lekcie</string>
-    <string name="additional_lessons_button">Zobraziť ďalšie lekcie</string>
-    <string name="additional_lessons_no_items">Žiadne informácie o ďalších lekciách</string>
-    <!--Attendance-->
-    <string name="attendance_summary_button">Zhrnutie dochádzky</string>
-    <string name="attendance_absence_school">Neprítomnosť zo školských dôvodov</string>
-    <string name="attendance_absence_excused">Ospravedlnená neprítomnosť</string>
-    <string name="attendance_absence_unexcused">Neospravedlnená neprítomnosť</string>
-    <string name="attendance_exemption">Oslobodenie</string>
-    <string name="attendance_excused_lateness">Ospravedlnenie meškanie</string>
-    <string name="attendance_unexcused_lateness">Neospravedlnenie meškanie</string>
-    <string name="attendance_present">Prítomnosť</string>
-    <string name="attendance_deleted">Odstránené</string>
-    <string name="attendance_unknown">Neznámy</string>
-    <string name="attendance_number">Číslo lekcie</string>
-    <string name="attendance_no_items">Žiadne položky</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d neprítomnosť</item>
-        <item quantity="few">%1$d neprítomnosti</item>
-        <item quantity="many">%1$d neprítomnosti</item>
-        <item quantity="other">%1$d neprítomnosti</item>
-    </plurals>
-    <string name="attendance_excuse_dialog_reason">Dôvod neprítomnosti (voliteľný)</string>
-    <string name="attendance_excuse_dialog_submit">Poslať</string>
-    <string name="attendance_excuse_success">Žiadosť o ospravedlnenie neprítomnosti bola úspešne odoslaná!</string>
-    <string name="attendance_excuse_no_selection">Musíte vybrať aspoň jednu neprítomnosť!</string>
-    <string name="attendance_excuse_title">Ospravedlniť</string>
-    <!--Attendance summary-->
-    <string name="attendance_summary_final">Dochádzka</string>
-    <string name="attendance_summary_total">Spoločne</string>
-    <!--Exam-->
-    <string name="exam_no_items">Tento týždeň žiadne testy</string>
-    <string name="exam_type">Typ</string>
-    <string name="exam_entry_date">Dátum vstupu</string>
-    <!--Message-->
-    <string name="message_inbox">Doručená pošta</string>
-    <string name="message_sent">Odoslané</string>
-    <string name="message_trash">Kôš</string>
-    <string name="message_no_subject">(žiadny predmet)</string>
-    <string name="message_no_items">Žiadne správy</string>
-    <string name="message_preview_error">Pri sťahovaní obsahu správy došlo k chybe</string>
-    <string name="message_from">Od:</string>
-    <string name="message_to">Komu:</string>
-    <string name="message_date">Dátum: %s</string>
-    <string name="message_reply">Odpoveď</string>
-    <string name="message_forward">Poslať ďalej</string>
-    <string name="message_delete">Odstrániť</string>
-    <string name="message_move_to_bin">Presunúť do koša</string>
-    <string name="message_delete_forever">Odstrániť natrvalo</string>
-    <string name="message_delete_success">Správa bola úspešne odstránená</string>
-    <string name="message_share">Zdieľať</string>
-    <string name="message_print">Vytlačiť</string>
-    <string name="message_subject">Predmet</string>
-    <string name="message_content">Obsah</string>
-    <string name="message_send_successful">Správa úspešne odoslaná</string>
-    <string name="message_not_exists">Správa neexistuje</string>
-    <string name="message_required_recipients">Musíte vybrať aspoň 1 príjemca</string>
-    <string name="message_content_min_length">Obsah správy musí mať aspoň 3 znaky</string>
-    <plurals name="message_number_item">
-        <item quantity="one">%d správa</item>
-        <item quantity="few">%d správy</item>
-        <item quantity="many">%d správ</item>
-        <item quantity="other">%d správ</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">Nová správa</item>
-        <item quantity="few">Nové správy</item>
-        <item quantity="many">Nové správy</item>
-        <item quantity="other">Nové správy</item>
-    </plurals>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">Máte %1$d novú správu</item>
-        <item quantity="few">Máte %1$d nové správy</item>
-        <item quantity="many">Máte %1$d nových správ</item>
-        <item quantity="other">Máte %1$d nových správ</item>
-    </plurals>
-    <!--Note-->
-    <string name="note_no_items">Žiadne informácie o poznámkach</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ámok</item>
-        <item quantity="other">%d poznámok</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 novú poznámku</item>
-        <item quantity="few">Máte %1$d nové poznámky</item>
-        <item quantity="many">Máte %1$d nových poznámok</item>
-        <item quantity="other">Máte %1$d nových poznámok</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ál</item>
-        <item quantity="other">%d chvál</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 novú chválu</item>
-        <item quantity="few">Máte %1$d nové chvály</item>
-        <item quantity="many">Máte %1$d nových chvál</item>
-        <item quantity="other">Máte %1$d nových chvál</item>
-    </plurals>
-    <!--Neutral notes-->
-    <plurals name="neutral_note_number_item">
-        <item quantity="one">%d neutrálny poznámka</item>
-        <item quantity="few">%d neutrálne poznámky</item>
-        <item quantity="many">%d neutrálne poznámky</item>
-        <item quantity="other">%d neutrálne poznámky</item>
-    </plurals>
-    <plurals name="neutral_note_new_items">
-        <item quantity="one">Nová neutrálny poznámka</item>
-        <item quantity="few">Nové neutrálne poznámky</item>
-        <item quantity="many">Nové neutrálne poznámky</item>
-        <item quantity="other">Nové neutrálne poznámky</item>
-    </plurals>
-    <plurals name="neutral_note_notify_new_items">
-        <item quantity="one">Máte %1$d novú neutrálny poznámku</item>
-        <item quantity="few">Máte %1$d nové neutrálne poznámky</item>
-        <item quantity="many">Máte %1$d nových neutrálne poznámok</item>
-        <item quantity="other">Máte %1$d nových neutrálne poznámok</item>
-    </plurals>
-    <!--Homework-->
-    <string name="homework_no_items">Žiadne informácie o domácich úlohách</string>
-    <string name="homework_mark_as_done">Označiť ako hotové</string>
-    <string name="homework_mark_as_undone">Nevyrobené</string>
-    <string name="homework_attachments">Prí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">Žiadne informácie o šťastnom čísle</string>
-    <string name="lucky_number_notify_new_item_title">Šťastné číslo pre dnešok</string>
-    <string name="lucky_number_notify_new_item">Dnes je šťastným číslom: %d</string>
-    <string name="lucky_number_history_button">Zobraziť históriu</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">História šťastných čísel</string>
-    <string name="lucky_number_history_empty">Žiadne informácie o šťastných číslach</string>
-    <!--Mobile devices-->
-    <string name="mobile_devices_title">Mobilný prístup</string>
-    <string name="mobile_devices_no_items">Žiadne zariadenia</string>
-    <string name="mobile_devices_unregister">Zrušiť registráciu</string>
-    <string name="mobile_device_removed">Zariadenie odstránenie</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čitelia</string>
-    <!--School-->
-    <string name="school_title">Škola</string>
-    <string name="school_no_info">Žiadne informácie o škole</string>
-    <string name="school_name">Názov školy</string>
-    <string name="school_address">Adresa školy</string>
-    <string name="school_telephone">Telefón</string>
-    <string name="school_headmaster">Meno riaditeľa</string>
-    <string name="school_pedagogue">Meno pedagóga</string>
-    <string name="school_address_button">Zobraziť na mape</string>
-    <string name="school_telephone_button">Volať</string>
-    <!--Teacher-->
-    <string name="teachers_title">Učitelia</string>
-    <string name="teacher_no_items">Žiadne informácie o učiteľoch</string>
-    <string name="teacher_no_subject">Žiadny predmet</string>
-    <!--Conference-->
-    <string name="conferences_title">Stretnutie</string>
-    <string name="conference_no_items">Žiadne informácie o stretnutiach</string>
-    <!--Account-->
-    <string name="account_add_new">Pridať účet</string>
-    <string name="account_logout">Odhlásiť</string>
-    <string name="account_confirm">Chcete sa odhlásiť z aktívneho žiaka?</string>
-    <string name="account_logout_student">Odhlásenie žiakov</string>
-    <string name="account_type_student">Zakov účet</string>
-    <string name="account_type_parent">Rodičovský účet</string>
-    <string name="account_login_mobile_api">Režim Mobilného API</string>
-    <string name="account_login_hybrid">Hybridný režim</string>
-    <string name="account_details_edit">Upraviť dáta</string>
-    <string name="account_quick_manager">Manažér účtov</string>
-    <string name="account_select_student">Vyberte žiaka</string>
-    <string name="account_family">Rodina</string>
-    <string name="account_contact">Kontakt</string>
-    <string name="account_address">Údaje o adresách</string>
-    <string name="account_personal_data">Osobné údaje</string>
-    <!--About-->
-    <string name="about_version">Verzia aplikácie</string>
-    <string name="about_contributor">Prispievatelia</string>
-    <string name="about_contributor_summary">Zoznam vývojárov Wulkanového</string>
-    <string name="about_feedback">Nahlásiť chybu</string>
-    <string name="about_feedback_summary">Odoslať správu o chybe e-mailom</string>
-    <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Prečítajte si často kladené otázky</string>
-    <string name="about_discord">Server Discord</string>
-    <string name="about_discord_summary">Pripojte sa ku komunite Wulkanového</string>
-    <string name="about_facebook">Facebooková fanpage</string>
-    <string name="about_facebook_summary">Rovnako ako naše facebooková fanpage</string>
-    <string name="about_privacy">Zásady ochrany osobných údajov</string>
-    <string name="about_privacy_summary">Pravidlá pre zhromažďovanie osobných údajov</string>
-    <string name="about_homepage">Domovská stránka</string>
-    <string name="about_homepage_summary">Navštívte stránku a pomôžte s vývojom aplikácie</string>
-    <string name="about_licenses">Licencie</string>
-    <string name="about_licenses_summary">Licencia knižníc použitých v aplikácii</string>
-    <!--Licenses-->
-    <string name="license_dialog_title">Licencia</string>
-    <!--Contributor-->
-    <string name="contributor_avatar_description">Avatar</string>
-    <string name="contributor_see_more">Zobraziť viac na GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">Žiadne informácie o žiakov alebo rodine žiaka</string>
-    <string name="student_info_first_name">Meno</string>
-    <string name="student_info_second_name">Druhé meno</string>
-    <string name="student_info_gender">Pohlavie</string>
-    <string name="student_info_polish_citizenship">Poľské občianstvo</string>
-    <string name="student_info_family_name">Rodinné meno</string>
-    <string name="student_info_parents_name">Mená matky a otca</string>
-    <string name="student_info_phone">Telefón</string>
-    <string name="student_info_cellphone">Mobilný telefón</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Adresa bydliska</string>
-    <string name="student_info_registered_address">Registrovaná adresa</string>
-    <string name="student_info_correspondence_address">Korešpondenčná adresa</string>
-    <string name="student_info_full_name">Priezvisko a meno</string>
-    <string name="student_info_kinship">Stupeň príbuznosti</string>
-    <string name="student_info_guardian_address">Adresa</string>
-    <string name="student_info_phones">Telefóny</string>
-    <string name="student_info_male">Muž</string>
-    <string name="student_info_female">Žena</string>
-    <string name="student_info_last_name">Priezvisko</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Prezývka</string>
-    <string name="account_edit_header">Pridať prezývku</string>
-    <string name="account_edit_avatar_title">Vybrať farbu avataru</string>
-    <!--Log viewer-->
-    <string name="logviewer_share">Zdieľať protokoly</string>
-    <string name="logviewer_refresh">Obnoviť</string>
-    <!--Error dialog-->
-    <string name="dialog_error_check_update">Skontrolovať aktualizácie</string>
-    <string name="dialog_error_check_update_message">Pred hlásením chyby skontrolujte, či je k dispozícii aktualizácia s opravou chýb</string>
-    <!--Generic-->
-    <string name="all_content">Obsah</string>
-    <string name="all_retry">Skúsiť znova</string>
-    <string name="all_description">Popis</string>
-    <string name="all_no_description">Žiadny popis</string>
-    <string name="all_teacher">Učiteľ</string>
-    <string name="all_date">Dátum</string>
-    <string name="all_entry_date">Dátum vstupu</string>
-    <string name="all_color">Farba</string>
-    <string name="all_details">Podrobnosti</string>
-    <string name="all_category">Kategória</string>
-    <string name="all_close">Zavrieť</string>
-    <string name="all_no_data">Žiadne údaje</string>
-    <string name="all_subject">Predmet</string>
-    <string name="all_prev">Vráť</string>
-    <string name="all_next">Ďalej</string>
-    <string name="all_search">Hľadať</string>
-    <string name="all_search_hint">Hledať…</string>
-    <string name="all_yes">Áno</string>
-    <string name="all_no">Nie</string>
-    <string name="all_save">Uložiť</string>
-    <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">Žiadne lekcie</string>
-    <string name="widget_timetable_theme_title">Vybrať motív</string>
-    <string name="widget_timetable_theme_light">Svetlý</string>
-    <string name="widget_timetable_theme_dark">Tmavý</string>
-    <string name="widget_timetable_theme_system">Motív systému</string>
-    <!--Preferences-->
-    <string name="pref_view_header">Vzhľad a správanie aplikácií</string>
-    <string name="pref_view_list">Predvolené zobrazenie</string>
-    <string name="pref_view_grade_average_mode">Výpočet koncoročního priemeru</string>
-    <string name="pref_view_grade_average_force_calc">Vynútiť priemerný výpočet podľa aplikácie</string>
-    <string name="pref_view_present">Zobraziť prítomnosť</string>
-    <string name="pref_view_app_theme">Motív</string>
-    <string name="pref_view_expand_grade">Rozbaliť známky</string>
-    <string name="pref_view_timetable_show_timers">Označiť aktuálne lekciu</string>
-    <string name="pref_view_timetable_show_groups">Zobraziť skupiny vedľa predmetov</string>
-    <string name="pref_view_grade_statistics_list">Zobraziť zoznam grafov v známkach triedy</string>
-    <string name="pref_view_timetable_show_whole_class">Zobraziť lekcie pre celú triedu</string>
-    <string name="pref_view_subjects_without_grades">Zobraziť predmety bez známok</string>
-    <string name="pref_view_grade_color_scheme">Známky farebnú schému</string>
-    <string name="pref_view_grade_sorting_mode">Triedenie predmetov</string>
-    <string name="pref_view_app_language">Jazyk</string>
-    <string name="pref_notify_header">Upozornenia</string>
-    <string name="pref_notify_switch">Zobraziť upozornenia</string>
-    <string name="pref_notify_upcoming_lessons_switch">Zobraziť upozornenia o nadchádzajúcej lekciu</string>
-    <string name="pref_notify_fix_sync_issues">Opravte problémy so synchronizáciou a upozornením</string>
-    <string name="pref_notify_fix_sync_issues_message">Vaše zariadenie môže mať problémy so synchronizáciou dát as upozorneniami.\n\nAk ich chcete opraviť, pridajte Wulkanového do funkcie Autostart a vypnite optimalizáciu/úsporu batérie v nastavení systému telefóne.</string>
-    <string name="pref_notify_fix_sync_issues_settings_button">Prejsť do nastavení</string>
-    <string name="pref_notify_debug_switch">Zobraziť upozornenia o ladení</string>
-    <string name="pref_notify_disabled_summary">Synchronizácia je vypnutá</string>
-    <string name="pref_services_header">Synchronizácia</string>
-    <string name="pref_services_switch">Automatická aktualizácia</string>
-    <string name="pref_services_suspended">Pozastavený počas dovolenky</string>
-    <string name="pref_services_interval">Interval aktualizácií</string>
-    <string name="pref_services_wifi">Iba Wi-Fi</string>
-    <string name="pref_services_force_sync">Synchronizovať teraz</string>
-    <string name="pref_services_message_sync_success">Synchronizovano!</string>
-    <string name="pref_services_message_sync_failed">Synchronizácia zlyhala</string>
-    <string name="pref_services_sync_in_progress">Prebieha synchronizácia</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">Odpovedať s históriou správ</string>
-    <string name="pref_settings_advanced_title">Pokročilé</string>
-    <string name="pref_settings_appearance_title">Vzhľad a správanie</string>
-    <string name="pref_settings_notifications_title">Upozornenia</string>
-    <string name="pref_settings_sync_title">Synchronizácia</string>
-    <string name="pref_grades_appearance_header">Známky</string>
-    <string name="pref_attendance_appearance_view">Dochádzka</string>
-    <string name="pref_timetable_appearance_view">Plán lekcie</string>
-    <string name="pref_grades_advanced_header">Známky</string>
-    <string name="pref_messages_advanced_header">Správy</string>
-    <string name="pref_appearance_category">Vzhľad a správanie</string>
-    <string name="pref_appearance_category_summary">Jazyky, motívy, triedenie predmetov</string>
-    <string name="pref_notifications_category_summary">Upozornenia aplikácie, oprava problémov</string>
-    <string name="pref_notifications_category">Upozornenia</string>
-    <string name="pref_sync_category">Synchronizácia</string>
-    <string name="pref_sync_category_summary">Automatická aktualizácia, interval aktualizácií</string>
-    <string name="pref_advanced_category_summary">Hodnota plusu a mínusu, výpočet priemeru</string>
-    <string name="pref_advanced_category">Pokročilé</string>
-    <string name="pref_about_category_summary">Verzia aplikácie, prispievatelia, sociálne portály, licencie</string>
-    <!--Notification Channels-->
-    <string name="channel_new_entries">Nové položky v denníku</string>
-    <string name="channel_new_grades">Nové známky</string>
-    <string name="channel_lucky_number">Šťastné číslo</string>
-    <string name="channel_new_message">Nové správy</string>
-    <string name="channel_new_notes">Nové poznámky</string>
-    <string name="channel_push">Push upozornenia</string>
-    <string name="channel_upcoming_lessons">Nadchádzajúce lekcie</string>
-    <string name="channel_debug">Ladenie</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Koniec podpory</string>
-    <string name="drop_kitkat_content">Ukončujeme podporu pre vaše zariadenie. V Wulkanovým už pre neho nebudú žiadne nové funkcie. Kritické opravy však budeme vydávať až do konca roka 2021, aby ste mali čas prejsť na novší model</string>
-    <string name="drop_kitkat_again">Nezobrazovať znovu</string>
-    <!--Colors-->
-    <string name="all_black">Čierny</string>
-    <string name="all_red">Červený</string>
-    <string name="all_blue">Modrý</string>
-    <string name="all_green">Zelený</string>
-    <string name="all_purple">Fialový</string>
-    <string name="all_empty_color">Žiadna farba</string>
-    <!--Others-->
-    <string name="all_copied">Skopírované</string>
-    <string name="all_undo">Vrátiť</string>
-    <!--Update helper-->
-    <string name="update_download_started">Sťahovanie aktualizácií začalo…</string>
-    <string name="update_download_success">Aktualizácia bola stiahnutá.</string>
-    <string name="update_download_success_button">Reštartovať</string>
-    <string name="update_failed">Aktualizácia zlyhala! Wulkanowy nemusí fungovať správne. Zvážte aktualizáciu</string>
-    <!--Errors-->
-    <string name="error_no_internet">Žiadne internetové pripojenie</string>
-    <string name="error_timeout">Nedá sa pripojiť ku denníku. Servery môžu byť preťažené. Prosím skúste to znova neskôr</string>
-    <string name="error_login_failed">Načítanie údajov zlyhalo. Skúste neskôr prosím</string>
-    <string name="error_password_change_required">Je vyžadovaná zmena hesla pre denník</string>
-    <string name="error_service_unavailable">Prebieha údržba UONET+ denník. Skúste to neskôr znova</string>
-    <string name="error_unknown_uonet">Neznáma chyba dennika UONET+. Prosím skúste to znova neskôr</string>
-    <string name="error_unknown_app">Neznáma chyba aplikácie. Prosím skúste to znova neskôr</string>
-    <string name="error_unknown">Vyskytla sa neočakávaná chyba</string>
-    <string name="error_feature_disabled">Funkcia je deaktivovaná cez vašou školou</string>
-    <string name="error_feature_not_available">Funkcia nie je k dispozícii. Prihláste sa v inom režime než Mobile API</string>
-</resources>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index d0891925d..be2179c3e 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -12,8 +12,6 @@
         <item>Pусский</item>
         <item>Українська</item>
         <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
     </string-array>
     <string-array name="services_interval_entries">
         <item>15 хвилин</item>
@@ -31,10 +29,6 @@
         <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>
@@ -42,8 +36,8 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Середня оцінка з 2 семестру</item>
-        <item>Середнє оцінювання за обидва семестри</item>
-        <item>Середнє оцінювання за весь рік</item>
+        <item>Average of grades from both semesters</item>
+        <item>Середня оцінка за весь рік</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показувати</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2e0b89da6..ec4dbc155 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -17,20 +17,17 @@
     <string name="send_message_title">Нове повідомлення</string>
     <string name="note_title">Нотатки та досягнення</string>
     <string name="homework_title">Домашні завдання</string>
-    <string name="account_title">Менеджер аккаунтів</string>
-    <string name="account_quick_title">Виберіть обліковий запис</string>
-    <string name="account_details_title">Деталі облікового запису</string>
-    <string name="student_info_title">Інформація про учня</string>
+    <string name="account_title">Оберіть аккаунт</string>
     <!--Subtitles-->
-    <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
+    <string name="grade_subtitle">%d семестр, %d/%d</string>
     <!--Login-->
-    <string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батьків</string>
-    <string name="login_header_symbol">Введіть символ зі сторінки реєстру</string>
+    <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">UONET + варіант реєстрації</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>
@@ -40,18 +37,17 @@
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Увійти</string>
     <string name="login_invalid_password">Занадто короткий пароль</string>
-    <string name="login_incorrect_password">Дані для входу неправильні. Переконайтеся, що у полі нижче вказано правильний варіант реєстрації UONET+</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_custom_email">Використовуйте призначений логін або електронну адресу в @%1$s</string>
-    <string name="login_invalid_symbol">Неправильний симбвол</string>
-    <string name="login_incorrect_symbol">Студента не знайдено Перевірте символ та обраний варіант реєстру UONET+</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">Символ можна знайти на сторінці реєстру в &#160; <b> Учень </b> → &#160; <b> Мобільний доступ </b> → &#160; <b> Додайте мобільне приладдя </b>.\n\nПереконайтесь, що ви встановили відповідний варіант реєстру в полі <b> UONET + варіант реєстрації </b> на попередньому екрані. На даний момент Wulkanowy не виявляє учнів дошкільних закладів</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>
@@ -63,9 +59,9 @@
     <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">Переконайтеся, що ви вибрали правильний варіант реєстрації UONET+!</string>
+    <string name="login_recover_warning">Переконайтесь, що обрано потрібний щоденник!</string>
     <string name="login_recover_button">Забули пароль?</string>
-    <string name="login_recover_title">Відновіть свій обліковий запис</string>
+    <string name="login_recover_title">Відновіть свій аккаунт</string>
     <string name="login_recover">Відновити</string>
     <string name="login_signed_in">Учень вже увійшов до системи</string>
     <!--Main-->
@@ -77,15 +73,15 @@
     <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_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_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_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>
@@ -99,10 +95,6 @@
     <string name="grade_statistics_partial">Поточні</string>
     <string name="grade_statistics_semester">Семестрові</string>
     <string name="grade_statistics_points">Бали</string>
-    <string name="grade_statistics_legend">Умовні позначення</string>
-    <string name="grade_statistics_average">Середня оцінка: %1$s</string>
-    <string name="grade_statistics_average_class">Клас</string>
-    <string name="grade_statistics_average_student">Учень</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d оцінка</item>
         <item quantity="few">%d оцінки</item>
@@ -115,36 +107,12 @@
         <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>
@@ -167,10 +135,6 @@
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Відсутність</string>
     <string name="completed_lessons_resources">Ресурси</string>
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Додаткові уроки</string>
-    <string name="additional_lessons_button">Показати додаткові уроки</string>
-    <string name="additional_lessons_no_items">Немає інформації про додаткових уроків</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Підсумок відвідуваності</string>
     <string name="attendance_absence_school">Відсутність зі шкільних причин</string>
@@ -180,8 +144,6 @@
     <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">
@@ -192,7 +154,7 @@
     </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_success">Змінено статус відсутності</string>
     <string name="attendance_excuse_no_selection">Оберіть хоча б одну відсутність</string>
     <string name="attendance_excuse_title">Змінити статус</string>
     <!--Attendance summary-->
@@ -218,12 +180,9 @@
     <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>
-    <string name="message_not_exists">Такого повідомлення не існує</string>
     <string name="message_required_recipients">Необхідно обрати принаймні 1 адресата</string>
     <string name="message_content_min_length">Зміст повідомлення мусить складатися принаймні з 3 знаків</string>
     <plurals name="message_number_item">
@@ -265,44 +224,6 @@
         <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>
@@ -314,10 +235,6 @@
     <string name="lucky_number_empty">Брак інформації о щасливому номері</string>
     <string name="lucky_number_notify_new_item_title">Сьогоднішній щасливий номер</string>
     <string name="lucky_number_notify_new_item">Сьогоднішнім щасливим номером є %d</string>
-    <string name="lucky_number_history_button">Показати історію</string>
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Історія щасливих чисел</string>
-    <string name="lucky_number_history_empty">Немає інформації про щасливі номери</string>
     <!--Mobile devices-->
     <string name="mobile_devices_title">Мобільні пристрої</string>
     <string name="mobile_devices_no_items">Брак пристроїв</string>
@@ -343,25 +260,11 @@
     <string name="teachers_title">Вчителі</string>
     <string name="teacher_no_items">Брак інформації про вчителів</string>
     <string name="teacher_no_subject">Брак предмету</string>
-    <!--Conference-->
-    <string name="conferences_title">Зустрічі</string>
-    <string name="conference_no_items">Немає інформації про зустрічі</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">Режим мобільного API</string>
-    <string name="account_login_hybrid">Гібридний режим</string>
-    <string name="account_details_edit">Редагувати дані</string>
-    <string name="account_quick_manager">Менеджер аккаунтів</string>
-    <string name="account_select_student">Виберіть учня</string>
-    <string name="account_family">Сім\'я</string>
-    <string name="account_contact">Контакт</string>
-    <string name="account_address">Деталі проживання</string>
-    <string name="account_personal_data">Особиста інформація</string>
     <!--About-->
     <string name="about_version">Версія додатка</string>
     <string name="about_contributor">Розробники</string>
@@ -372,8 +275,6 @@
     <string name="about_faq_summary">Запитання, які часто задають</string>
     <string name="about_discord">Сервер Discord</string>
     <string name="about_discord_summary">Приєднатися до спільноти додатка</string>
-    <string name="about_facebook">Фен-сторінка Facebook</string>
-    <string name="about_facebook_summary">Вподобати нашу фансторінку у Facebook</string>
     <string name="about_privacy">Політика конфіденційності</string>
     <string name="about_privacy_summary">Правила зберігання особистих даних</string>
     <string name="about_homepage">Домашня сторінка</string>
@@ -385,31 +286,6 @@
     <!--Contributor-->
     <string name="contributor_avatar_description">Аватар</string>
     <string name="contributor_see_more">Сторінка проекту на GitHub</string>
-    <!--Student info-->
-    <string name="student_info_empty">Немає інформації про учня або сім\'ю учня</string>
-    <string name="student_info_first_name">Ім\'я</string>
-    <string name="student_info_second_name">Друге ім\'я</string>
-    <string name="student_info_gender">Стать</string>
-    <string name="student_info_polish_citizenship">Польське громадянство</string>
-    <string name="student_info_family_name">Прізвище</string>
-    <string name="student_info_parents_name">Імена батька і матері</string>
-    <string name="student_info_phone">Номер телефону</string>
-    <string name="student_info_cellphone">Мобільний телефон</string>
-    <string name="student_info_email">Електронна пошта</string>
-    <string name="student_info_address">Місця проживання</string>
-    <string name="student_info_registered_address">Адреса реєстрації</string>
-    <string name="student_info_correspondence_address">Адреса для кореспонденції</string>
-    <string name="student_info_full_name">Прізвище та ім\'я</string>
-    <string name="student_info_kinship">Ступінь спорідненості</string>
-    <string name="student_info_guardian_address">Адреса</string>
-    <string name="student_info_phones">Телефони</string>
-    <string name="student_info_male">Чоловіча</string>
-    <string name="student_info_female">Жінка</string>
-    <string name="student_info_last_name">Прізвище</string>
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Псевдонім</string>
-    <string name="account_edit_header">Додати псевдонім</string>
-    <string name="account_edit_avatar_title">Оберіть колір аватара</string>
     <!--Log viewer-->
     <string name="logviewer_share">Поділитися логами</string>
     <string name="logviewer_refresh">Оновити</string>
@@ -433,10 +309,7 @@
     <string name="all_prev">Попередній</string>
     <string name="all_next">Наступний</string>
     <string name="all_search">Пошук</string>
-    <string name="all_search_hint">Пошук…</string>
-    <string name="all_yes">Так</string>
-    <string name="all_no">Ні</string>
-    <string name="all_save">Зберегти</string>
+    <string name="all_search_hint">Пошук...</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Брак уроків</string>
     <string name="widget_timetable_theme_title">Увібрати тему</string>
@@ -444,21 +317,18 @@
     <string name="widget_timetable_theme_dark">Темна</string>
     <string name="widget_timetable_theme_system">Тема системи</string>
     <!--Preferences-->
-    <string name="pref_view_header">Поява додатка &amp; amp; поведінки</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_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">Показувати групи поруч з темами</string>
+    <string name="pref_view_timetable_show_timers">Позначити поточний урок у розкладі</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_view_app_language">Мова додатку</string>
     <string name="pref_notify_header">Повідомлення</string>
     <string name="pref_notify_switch">Показувати повідомлення</string>
     <string name="pref_notify_upcoming_lessons_switch">Показувати повідомлення о наступних уроках</string>
@@ -466,7 +336,6 @@
     <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_notify_disabled_summary">Синхронізація вимкнена</string>
     <string name="pref_services_header">Синхронізація</string>
     <string name="pref_services_switch">Автоматична синхронізація</string>
     <string name="pref_services_suspended">Призупинено на час канікул</string>
@@ -476,27 +345,14 @@
     <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_settings_advanced_title">Додатково</string>
-    <string name="pref_settings_appearance_title">Вигляд &amp; Поведінка</string>
-    <string name="pref_settings_notifications_title">Повідомлення</string>
-    <string name="pref_settings_sync_title">Синхронізація</string>
-    <string name="pref_grades_appearance_header">Оцінки</string>
-    <string name="pref_attendance_appearance_view">Відвідуваність</string>
-    <string name="pref_timetable_appearance_view">Розклад</string>
-    <string name="pref_grades_advanced_header">Класи</string>
-    <string name="pref_messages_advanced_header">Повідомлення</string>
-    <string name="pref_appearance_category">Вигляд &amp; Поведінка</string>
-    <string name="pref_appearance_category_summary">Мови, теми, тема сортування</string>
-    <string name="pref_notifications_category_summary">Сповіщення додатку, виправляти проблеми</string>
-    <string name="pref_notifications_category">Повідомлення</string>
-    <string name="pref_sync_category">Синхронізація</string>
-    <string name="pref_sync_category_summary">Автоматичне оновлення, інтервал синхронізації</string>
-    <string name="pref_advanced_category_summary">Плюс і мінус значення, середні обчислення</string>
-    <string name="pref_advanced_category">Додатково</string>
-    <string name="pref_about_category_summary">Версія програми, учасники, соціальні портали, ліцензії</string>
     <!--Notification Channels-->
     <string name="channel_new_entries">Нові дані в щоденнику</string>
     <string name="channel_new_grades">Нові оцінки</string>
@@ -506,10 +362,6 @@
     <string name="channel_push">Показувати push-повідомлення</string>
     <string name="channel_upcoming_lessons">Наступні уроки</string>
     <string name="channel_debug">Дебаг</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Кінець підтримки</string>
-    <string name="drop_kitkat_content">Ми завершуємо підтримку вашого пристрою. Більше нових функцій не з\'явиться у Wulkanowy. Однак ми виробляємо критичні патчі до кінця 2021, тому у вас буде час перейти на новішу модель</string>
-    <string name="drop_kitkat_again">Не показувати знову</string>
     <!--Colors-->
     <string name="all_black">Чорний</string>
     <string name="all_red">Червоний</string>
@@ -520,19 +372,12 @@
     <!--Others-->
     <string name="all_copied">Скопійовано</string>
     <string name="all_undo">Відмінити</string>
-    <!--Update helper-->
-    <string name="update_download_started">Завантаження оновлень розпочато…</string>
-    <string name="update_download_success">Щойно завантажено оновлення.</string>
-    <string name="update_download_success_button">Перезапустити</string>
-    <string name="update_failed">Помилка оновлення! Wulkanowy може не працювати належним чином. Подумайте про оновлення</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_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_uonet">Невідома помилка реєстру UONET+. Спробуйте ще раз пізніше</string>
-    <string name="error_unknown_app">Невідома помилка програми. Будь-ласка спробуйте пізніше</string>
     <string name="error_unknown">Відбулася несподівана помилка</string>
     <string name="error_feature_disabled">Функція вимкнена школою</string>
     <string name="error_feature_not_available">Функція не доступна в цьому режимі</string>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
deleted file mode 100644
index 574e8488d..000000000
--- a/app/src/main/res/values-v23/styles.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-    </style>
-
-    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:windowBackground">@drawable/layer_splash_background</item>
-        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v26/styles.xml b/app/src/main/res/values-v26/styles.xml
deleted file mode 100644
index 55413c053..000000000
--- a/app/src/main/res/values-v26/styles.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resources>
-
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:statusBarColor">@android:color/darker_gray</item>
-    </style>
-
-    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:windowBackground">@drawable/layer_splash_background</item>
-        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-v28/styles.xml b/app/src/main/res/values-v27/styles.xml
similarity index 75%
rename from app/src/main/res/values-v28/styles.xml
rename to app/src/main/res/values-v27/styles.xml
index ee77091d3..d33f64228 100644
--- a/app/src/main/res/values-v28/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,10 +1,9 @@
 <resources>
 
     <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:statusBarColor">@android:color/darker_gray</item>
         <item name="android:navigationBarColor">@android:color/white</item>
         <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
     </style>
 
     <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
@@ -12,6 +11,5 @@
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
         <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
         <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowLightStatusBar">false</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-v29/styles.xml b/app/src/main/res/values-v29/styles.xml
deleted file mode 100644
index ee77091d3..000000000
--- a/app/src/main/res/values-v29/styles.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<resources>
-
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-    </style>
-
-    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:windowBackground">@drawable/layer_splash_background</item>
-        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 158490471..f661b88c5 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -7,14 +7,12 @@
         <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 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>
@@ -22,25 +20,23 @@
         <item>Fakelog</item>
     </string-array>
     <string-array name="hosts_values">
-        <item>https://vulcan.net.pl/?email</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>https://eduportal.koszalin.pl</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>https://vulcan.net.pl/?login</item>
-        <item>http://fakelog.cf/?email</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>
@@ -49,11 +45,9 @@
         <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>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 49ef39ab3..49cdd5b7e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="colorDivider" format="color" />
-    <attr name="colorSwipeRefresh" format="color" />
     <attr name="colorTimetableChange" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b2e0dcef1..36dee1812 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,21 +6,12 @@
     <color name="colorError">#ff5722</color>
     <color name="colorErrorLight">#e84853</color>
 
-    <color name="colorNavigationBarLight">#2D2D2D</color>
-    <color name="colorNavigationBarBlack">#1E1E1E</color>
-
-    <color name="colorStatusBarLight">#1C1C1C</color>
-    <color name="colorStatusBarBlack">#0D0D0D</color>
-
     <color name="timetable_change_light">#ffd54f</color>
     <color name="timetable_change_dark">#ff8f00</color>
 
     <color name="colorDivider">#1f000000</color>
     <color name="colorDividerInverse">#1fffffff</color>
 
-    <color name="colorSwipeRefreshDark">#ff383838</color>
-    <color name="colorSwipeRefresh">#ffffffff</color>
-
     <color name="note_positive">#a0c431</color>
     <color name="note_negative">#d43f3f</color>
 
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index fb82e0ed6..a82b14eb7 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -18,10 +18,6 @@
     <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 0cfa485e3..6cb877ec2 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -20,10 +20,6 @@
     <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 44f54c170..5824658c4 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -31,8 +31,6 @@
         <item>Pусский</item>
         <item>Українська</item>
         <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
     </string-array>
     <string-array name="app_language_values" translatable="false">
         <item>system</item>
@@ -41,8 +39,6 @@
         <item>ru</item>
         <item>uk</item>
         <item>de</item>
-        <item>cs</item>
-        <item>sk</item>
     </string-array>
 
     <string-array name="services_interval_entries">
@@ -79,15 +75,6 @@
         <item>0.75</item>
     </string-array>
 
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4109d2b8..7793cd9c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,24 +17,21 @@
     <string name="send_message_title">New message</string>
     <string name="note_title">Notes and achievements</string>
     <string name="homework_title">Homework</string>
-    <string name="account_title">Accounts manager</string>
-    <string name="account_quick_title">Select account</string>
-    <string name="account_details_title">Account details</string>
-    <string name="student_info_title">Student info</string>
+    <string name="account_title">Choose account</string>
 
 
     <!--Subtitles-->
-    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+    <string name="grade_subtitle">Semester %d, %d/%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 from the register page</string>
+    <string name="login_header_symbol">Enter the symbol</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">UONET+ register variant</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>
@@ -44,18 +41,17 @@
     <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. Make sure the correct UONET+ register variation is selected in the field below</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">Use the assigned login instead of email</string>
-    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</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. Validate the symbol and the chosen variation of the UONET+ register</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&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the previous screen. Wulkanowy does not detect pre-school students at the moment</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>
@@ -69,7 +65,7 @@
     <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\nDodatkowe informacje: %4$s\nOstatni błąd: %5$s\n\nOpis problemu: </string>
-    <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</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>
@@ -109,10 +105,6 @@
     <string name="grade_statistics_partial">Partial</string>
     <string name="grade_statistics_semester">Semester</string>
     <string name="grade_statistics_points">Points</string>
-    <string name="grade_statistics_legend">Legend</string>
-    <string name="grade_statistics_average">Average: %1$s</string>
-    <string name="grade_statistics_average_class">Class</string>
-    <string name="grade_statistics_average_student">Student</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d grade</item>
         <item quantity="other">%d grades</item>
@@ -121,26 +113,10 @@
         <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-->
@@ -169,12 +145,6 @@
     <string name="completed_lessons_resources">Resources</string>
 
 
-    <!--Additional lessons-->
-    <string name="additional_lessons_title">Additional lessons</string>
-    <string name="additional_lessons_button">Show additional lessons</string>
-    <string name="additional_lessons_no_items">No info about additional lessons</string>
-
-
     <!--Attendance-->
     <string name="attendance_summary_button">Attendance summary</string>
     <string name="attendance_absence_school">Absent for school reasons</string>
@@ -184,8 +154,6 @@
     <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">
@@ -194,7 +162,7 @@
     </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 excuse request sent successfully!</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>
 
@@ -226,12 +194,9 @@
     <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>
-    <string name="message_not_exists">Message does not exist</string>
     <string name="message_required_recipients">You need to choose at least 1 recipient</string>
     <string name="message_content_min_length">The message content must be at least 3 characters</string>
     <plurals name="message_number_item">
@@ -264,34 +229,6 @@
         <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>
@@ -306,11 +243,6 @@
     <string name="lucky_number_empty">No info about the lucky number</string>
     <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
     <string name="lucky_number_notify_new_item">Today\'s lucky number is: %d</string>
-    <string name="lucky_number_history_button">Show history</string>
-
-    <!--Lucky number history-->
-    <string name="lucky_number_history_title">Lucky number history</string>
-    <string name="lucky_number_history_empty">No info about lucky numbers</string>
 
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile devices</string>
@@ -345,27 +277,11 @@
     <string name="teacher_no_subject">No subject</string>
 
 
-    <!--Conference-->
-    <string name="conferences_title">Conferences</string>
-    <string name="conference_no_items">No info about conferences</string>
-
-
     <!--Account-->
     <string name="account_add_new">Add account</string>
     <string name="account_logout">Logout</string>
-    <string name="account_confirm">Do you want to log out this student?</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>
-    <string name="account_details_edit">Edit data</string>
-    <string name="account_quick_manager">Accounts manager</string>
-    <string name="account_select_student">Select student</string>
-    <string name="account_family">Family</string>
-    <string name="account_contact">Contact</string>
-    <string name="account_address">Residence details</string>
-    <string name="account_personal_data">Personal information</string>
 
 
     <!--About-->
@@ -378,8 +294,6 @@
     <string name="about_faq_summary">Read Frequently Asked Questions</string>
     <string name="about_discord">Discord server</string>
     <string name="about_discord_summary">Join the Wulkanowy community</string>
-    <string name="about_facebook">Facebook fanpage</string>
-    <string name="about_facebook_summary">Like our facebook fanpage</string>
     <string name="about_privacy">Privacy policy</string>
     <string name="about_privacy_summary">Rules for collecting personal data</string>
     <string name="about_homepage">Homepage</string>
@@ -398,35 +312,6 @@
     <string name="contributor_see_more">See more on GitHub</string>
 
 
-    <!--Student info-->
-    <string name="student_info_empty">No info about student or student family</string>
-    <string name="student_info_first_name">Name</string>
-    <string name="student_info_second_name">Second name</string>
-    <string name="student_info_gender">Gender</string>
-    <string name="student_info_polish_citizenship">Polish citizenship</string>
-    <string name="student_info_family_name">Family name</string>
-    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
-    <string name="student_info_phone">Phone</string>
-    <string name="student_info_cellphone">Cellphone</string>
-    <string name="student_info_email">E-mail</string>
-    <string name="student_info_address">Address of residence</string>
-    <string name="student_info_registered_address">Address of registration</string>
-    <string name="student_info_correspondence_address">Correspondence address</string>
-    <string name="student_info_full_name">Surname and first name</string>
-    <string name="student_info_kinship">Degree of kinship</string>
-    <string name="student_info_guardian_address">Address</string>
-    <string name="student_info_phones">Phones</string>
-    <string name="student_info_male">Male</string>
-    <string name="student_info_female">Female</string>
-    <string name="student_info_last_name">Last name</string>
-
-
-    <!--Account edit-->
-    <string name="account_edit_nick_hint">Nick</string>
-    <string name="account_edit_header">Add nick</string>
-    <string name="account_edit_avatar_title">Choose avatar color</string>
-
-
     <!--Log viewer-->
     <string name="logviewer_share">Share logs</string>
     <string name="logviewer_refresh">Refresh</string>
@@ -454,10 +339,7 @@
     <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>
-    <string name="all_yes">Yes</string>
-    <string name="all_no">No</string>
-    <string name="all_save">Save</string>
+    <string name="all_search_hint">Search...</string>
 
 
     <!--Timetable Widget-->
@@ -469,21 +351,18 @@
 
 
     <!--Preferences-->
-    <string name="pref_view_header">App appearance &amp; behavior</string>
+    <string name="pref_view_header">Appearance</string>
     <string name="pref_view_list">Default view</string>
     <string name="pref_view_grade_average_mode">Calculation of the end-of-year average</string>
     <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
-    <string name="pref_view_present">Show presence</string>
-    <string name="pref_view_app_theme">Theme</string>
+    <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</string>
-    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_timers">Mark current lesson 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</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
-    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
-    <string name="pref_view_app_language">Language</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>
@@ -492,7 +371,6 @@
     <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_notify_disabled_summary">Synchronization is disabled</string>
 
     <string name="pref_services_header">Synchronization</string>
     <string name="pref_services_switch">Automatic update</string>
@@ -503,32 +381,17 @@
     <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>
     <string name="pref_other_grade_modifier_minus">Value of the minus</string>
     <string name="pref_other_fill_message_content">Reply with message history</string>
 
-    <string name="pref_settings_advanced_title">Advanced</string>
-    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
-    <string name="pref_settings_notifications_title">Notifications</string>
-    <string name="pref_settings_sync_title">Synchronization</string>
-
-    <string name="pref_grades_appearance_header">Grades</string>
-    <string name="pref_attendance_appearance_view">Attendance</string>
-    <string name="pref_timetable_appearance_view">Timetable</string>
-    <string name="pref_grades_advanced_header">Grades</string>
-    <string name="pref_messages_advanced_header">Messages</string>
-
-    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
-    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
-    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
-    <string name="pref_notifications_category">Notifications</string>
-    <string name="pref_sync_category">Synchronization</string>
-    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
-    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
-    <string name="pref_advanced_category">Advanced</string>
-    <string name="pref_about_category_summary">App version, contributors, social portals, licenses</string>
-
 
     <!--Notification Channels-->
     <string name="channel_new_entries">New entries in register</string>
@@ -541,12 +404,6 @@
     <string name="channel_debug">Debug</string>
 
 
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">End of support</string>
-    <string name="drop_kitkat_content">We are ending support for your device. No more new features will appear for it in Wulkanowy. However, we will be releasing critical patches until the end of 2021 so you have time to switch to a newer model</string>
-    <string name="drop_kitkat_again">Don\'t show again</string>
-
-
     <!--Colors-->
     <string name="all_black">Black</string>
     <string name="all_red">Red</string>
@@ -561,21 +418,12 @@
     <string name="all_undo">Undo</string>
 
 
-    <!--Update helper-->
-    <string name="update_download_started">Download of updates has started…</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 register failed. Servers can be overloaded. Please try again later</string>
-    <string name="error_login_failed">Loading data failed. Please try again later</string>
-    <string name="error_password_change_required">Register password change required</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_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. Please try again later</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. Login in a mode other than Mobile API</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 297a4f288..8f30e3457 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,19 +1,16 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
 
     <style name="BaseWulkanowyTheme" parent="@style/Theme.MaterialComponents.Light">
-        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorSecondary">@color/colorPrimary</item>
         <item name="colorOnSecondary">@android:color/white</item>
         <item name="colorTimetableChange">@color/timetable_change_dark</item>
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
-        <item name="colorSwipeRefresh">@color/colorSwipeRefresh</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
-        <item name="mdtp_theme_dark">false</item>
     </style>
 
     <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
@@ -34,9 +31,5 @@
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
-    <style name="mdtp_ActionButton.Text" parent="Widget.MaterialComponents.Button.TextButton.Dialog" />
-
-    <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar" />
-
-    <style name="WulkanowyTheme.MessageSend" parent="WulkanowyTheme.NoActionBar" />
+    <style name="mdtp_ActionButton.Text" parent="Widget.MaterialComponents.Button.TextButton.Dialog"/>
 </resources>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index 086214923..4cdb989c7 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -1,33 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <Preference
-        app:key="appearance"
-        app:icon="@drawable/ic_settings_appearance"
-        app:summary="@string/pref_appearance_category_summary"
-        app:title="@string/pref_appearance_category"
-        app:fragment="io.github.wulkanowy.ui.modules.settings.appearance.AppearanceFragment" />
-    <Preference
-        app:key="notifications"
-        app:icon="@drawable/ic_settings_notifications"
-        app:summary="@string/pref_notifications_category_summary"
-        app:title="@string/pref_notifications_category"
-        app:fragment="io.github.wulkanowy.ui.modules.settings.notifications.NotificationsFragment" />
-    <Preference
-        app:key="sync"
-        app:icon="@drawable/ic_settings_sync"
-        app:summary="@string/pref_sync_category_summary"
-        app:title="@string/pref_sync_category"
-        app:fragment="io.github.wulkanowy.ui.modules.settings.sync.SyncFragment" />
-    <Preference
-        app:key="advanced"
-        app:icon="@drawable/ic_settings_advanced"
-        app:summary="@string/pref_advanced_category_summary"
-        app:title="@string/pref_advanced_category"
-        app:fragment="io.github.wulkanowy.ui.modules.settings.advanced.AdvancedFragment" />
-    <Preference
-        app:key="about"
-        app:icon="@drawable/ic_all_about"
-        app:summary="@string/pref_about_category_summary"
-        app:title="@string/about_title"
-        app:fragment="io.github.wulkanowy.ui.modules.about.AboutFragment" />
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_view_header">
+        <ListPreference
+            app:defaultValue="@string/pref_default_startup"
+            app:entries="@array/startup_tab_entries"
+            app:entryValues="@array/startup_tab_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_start_menu"
+            app:title="@string/pref_view_list"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_app_theme"
+            app:entries="@array/app_theme_entries"
+            app:entryValues="@array/app_theme_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_app_theme"
+            app:title="@string/pref_view_app_theme"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_attendance_present"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_attendance_present"
+            app:title="@string/pref_view_present" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_expand_grade"
+            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" />
+        <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"
+            app:entryValues="@array/grade_color_scheme_values"
+            app:iconSpaceReserved="false"
+            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_app_language"
+            app:entries="@array/app_language_entries"
+            app:entryValues="@array/app_language_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_app_language"
+            app:title="@string/pref_view_app_language"
+            app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_services_header">
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_services_enable"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_enable"
+            app:title="@string/pref_services_switch" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_services_interval"
+            app:dependency="services_enable"
+            app:entries="@array/services_interval_entries"
+            app:entryValues="@array/services_interval_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_interval"
+            app:title="@string/pref_services_interval"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_services_wifi_only"
+            app:dependency="services_enable"
+            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
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_other_header">
+        <ListPreference
+            app:defaultValue="@string/pref_default_grade_modifier_plus"
+            app:entries="@array/grade_modifier_entries"
+            app:entryValues="@array/grade_modifier_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_modifier_plus"
+            app:title="@string/pref_other_grade_modifier_plus"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_grade_modifier_minus"
+            app:entries="@array/grade_modifier_entries"
+            app:entryValues="@array/grade_modifier_value"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_modifier_minus"
+            app:title="@string/pref_other_grade_modifier_minus"
+            app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_grade_average_mode"
+            app:entries="@array/grade_average_mode_entries"
+            app:entryValues="@array/grade_average_mode_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_average_mode"
+            app:title="@string/pref_view_grade_average_mode"
+            app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            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/main/res/xml/scheme_preferences_advanced.xml b/app/src/main/res/xml/scheme_preferences_advanced.xml
deleted file mode 100644
index 1d7e9b832..000000000
--- a/app/src/main/res/xml/scheme_preferences_advanced.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_grades_advanced_header">
-        <ListPreference
-            app:defaultValue="@string/pref_default_grade_modifier_plus"
-            app:entries="@array/grade_modifier_entries"
-            app:entryValues="@array/grade_modifier_value"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_grade_modifier_plus"
-            app:title="@string/pref_other_grade_modifier_plus"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            app:defaultValue="@string/pref_default_grade_modifier_minus"
-            app:entries="@array/grade_modifier_entries"
-            app:entryValues="@array/grade_modifier_value"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_grade_modifier_minus"
-            app:title="@string/pref_other_grade_modifier_minus"
-            app:useSimpleSummaryProvider="true" />
-        <SwitchPreferenceCompat
-            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" />
-        <ListPreference
-            app:defaultValue="@string/pref_default_grade_average_mode"
-            app:entries="@array/grade_average_mode_entries"
-            app:entryValues="@array/grade_average_mode_values"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_grade_average_mode"
-            app:title="@string/pref_view_grade_average_mode"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_messages_advanced_header">
-        <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/main/res/xml/scheme_preferences_appearance.xml b/app/src/main/res/xml/scheme_preferences_appearance.xml
deleted file mode 100644
index 095c5070b..000000000
--- a/app/src/main/res/xml/scheme_preferences_appearance.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_view_header">
-        <ListPreference
-            app:defaultValue="@string/pref_default_app_language"
-            app:entries="@array/app_language_entries"
-            app:entryValues="@array/app_language_values"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_app_language"
-            app:title="@string/pref_view_app_language"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            app:defaultValue="@string/pref_default_app_theme"
-            app:entries="@array/app_theme_entries"
-            app:entryValues="@array/app_theme_values"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_app_theme"
-            app:title="@string/pref_view_app_theme"
-            app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            app:defaultValue="@string/pref_default_startup"
-            app:entries="@array/startup_tab_entries"
-            app:entryValues="@array/startup_tab_value"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_start_menu"
-            app:title="@string/pref_view_list"
-            app:useSimpleSummaryProvider="true" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_grades_appearance_header">
-        <ListPreference
-            app:defaultValue="@string/pref_default_grade_color_scheme"
-            app:entries="@array/grade_color_scheme_entries"
-            app:entryValues="@array/grade_color_scheme_values"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_grade_color_scheme"
-            app:title="@string/pref_view_grade_color_scheme"
-            app:useSimpleSummaryProvider="true" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_expand_grade"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_expand_grade"
-            app:title="@string/pref_view_expand_grade" />
-        <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_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" />
-        <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" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_attendance_appearance_view">
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_attendance_present"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_attendance_present"
-            app:title="@string/pref_view_present" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:layout_height="wrap_content"
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_timetable_appearance_view">
-        <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_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" />
- <!--Hidden due to not functional hybrid/mobile api modes
-        <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" />
- -->
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/scheme_preferences_notifications.xml b/app/src/main/res/xml/scheme_preferences_notifications.xml
deleted file mode 100644
index 3d435ca8f..000000000
--- a/app/src/main/res/xml/scheme_preferences_notifications.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_notify_header">
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_notifications_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" />
-        <Preference
-            app:iconSpaceReserved="false"
-            app:isPreferenceVisible="false"
-            app:key="@string/pref_key_notifications_fix_issues"
-            app:title="@string/pref_notify_fix_sync_issues" />
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/scheme_preferences_sync.xml b/app/src/main/res/xml/scheme_preferences_sync.xml
deleted file mode 100644
index b6c3c2a8b..000000000
--- a/app/src/main/res/xml/scheme_preferences_sync.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:title="@string/pref_services_header">
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_services_enable"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_services_enable"
-            app:title="@string/pref_services_switch" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_services_wifi_only"
-            app:dependency="services_enable"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_services_wifi_only"
-            app:title="@string/pref_services_wifi" />
-        <ListPreference
-            app:defaultValue="@string/pref_default_services_interval"
-            app:dependency="services_enable"
-            app:entries="@array/services_interval_entries"
-            app:entryValues="@array/services_interval_value"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_services_interval"
-            app:title="@string/pref_services_interval"
-            app:useSimpleSummaryProvider="true" />
-        <Preference
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_services_force_sync"
-            app:title="@string/pref_services_force_sync" />
-    </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 b26f4f6ba..e87177c1d 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -4,13 +4,13 @@ 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.FeatureDisabledException
 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
 
-class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
+class CrashlyticsTree : FormatterPriorityTree(Log.VERBOSE) {
 
     private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
 
@@ -21,7 +21,7 @@ class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
     }
 }
 
-class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) {
+class CrashlyticsExceptionTree : FormatterPriorityTree(Log.ERROR) {
 
     private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
 
diff --git a/app/src/play/java/io/github/wulkanowy/utils/AnalyticsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
similarity index 64%
rename from app/src/play/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
rename to app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index b65325790..b0b2fda4d 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -4,14 +4,11 @@ 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 AnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context
-) {
+class FirebaseAnalyticsHelper @Inject constructor(private val context: Context) {
 
     private val analytics by lazy { FirebaseAnalytics.getInstance(context) }
 
@@ -20,7 +17,7 @@ class AnalyticsHelper @Inject constructor(
             params.forEach {
                 if (it.second == null) return@forEach
                 when (it.second) {
-                    is String, is String? -> putString(it.first, it.second.toString())
+                    is String, is String? -> putString(it.first, it.second as String)
                     is Int, is Int? -> putInt(it.first, it.second as Int)
                     is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
                 }
@@ -30,13 +27,6 @@ class AnalyticsHelper @Inject constructor(
     }
 
     fun setCurrentScreen(activity: Activity, name: String?) {
-        analytics.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW, Bundle().apply {
-            putString(FirebaseAnalytics.Param.SCREEN_NAME, name)
-            putString(FirebaseAnalytics.Param.SCREEN_CLASS, activity::class.simpleName)
-        })
-    }
-
-    @Suppress("UNUSED_PARAMETER")
-    fun popCurrentScreen(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
deleted file mode 100644
index 6772237e2..000000000
--- a/app/src/play/java/io/github/wulkanowy/utils/UpdateHelper.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.app.Activity
-import android.app.Activity.RESULT_OK
-import android.content.Context
-import android.content.IntentSender
-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 com.google.android.play.core.ktx.updatePriority
-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,
-    private val analyticsHelper: AnalyticsHelper,
-) {
-
-    lateinit var messageContainer: View
-
-    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() {
-            val days = clientVersionStalenessDays() ?: 0
-            val isUpdatePriorityAllowUpdate = when (updatePriority) {
-                5 -> true
-                4 -> days > 7
-                3 -> days > 30
-                else -> false
-            }
-
-            return updateAvailability() == UPDATE_AVAILABLE && isImmediateUpdateAllowed && isUpdatePriorityAllowUpdate
-        }
-
-    private inline val AppUpdateInfo.isFlexibleUpdateAvailable: Boolean
-        get() {
-            val days = clientVersionStalenessDays() ?: 0
-            val isUpdatePriorityAllowUpdate = when (updatePriority) {
-                4, 3, 2 -> true
-                1 -> days >= 7
-                0 -> false
-                else -> false
-            }
-
-            return updateAvailability() == UPDATE_AVAILABLE && isFlexibleUpdateAllowed && isUpdatePriorityAllowUpdate
-        }
-
-    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) {
-        Timber.d("Start update ($updateType): $appUpdateInfo")
-        try {
-            appUpdateManager.startUpdateFlowForResult(
-                appUpdateInfo, updateType, activity, IN_APP_UPDATE_REQUEST_CODE
-            )
-        } catch (e: IntentSender.SendIntentException) {
-            Timber.i("Update failed! Duplicated PendingIntent")
-        }
-    }
-
-    fun onActivityResult(requestCode: Int, resultCode: Int) {
-        if (requestCode == IN_APP_UPDATE_REQUEST_CODE) {
-            if (resultCode != RESULT_OK) {
-                Timber.i("Update failed! Result code: $resultCode")
-                Toast.makeText(context, R.string.update_failed, Toast.LENGTH_LONG).show()
-            }
-
-            analyticsHelper.logEvent("inapp_update", "code" to resultCode)
-        }
-    }
-
-    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 = activity,
-                        appUpdateInfo = info,
-                        updateType = if (info.isImmediateUpdateAvailable) IMMEDIATE else FLEXIBLE
-                    )
-                }
-            }
-        }
-    }
-
-    private fun popupSnackBarForCompleteUpdate() {
-        Timber.d("Show snackbar with update complete")
-        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()
-        }
-    }
-
-    private companion object {
-
-        private const val IN_APP_UPDATE_REQUEST_CODE = 1721
-    }
-}
diff --git a/app/src/release/agconnect-services.json.gpg b/app/src/release/agconnect-services.json.gpg
deleted file mode 100644
index 484d8bc72..000000000
Binary files a/app/src/release/agconnect-services.json.gpg and /dev/null differ
diff --git a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt b/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
deleted file mode 100644
index 10724868a..000000000
--- a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index e60b1d7a2..000000000
--- a/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-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
index a0fa209fd..5d003f273 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -2,58 +2,73 @@ package io.github.wulkanowy
 
 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.now
-import io.github.wulkanowy.sdk.pojo.Semester as SdkSemester
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
 
-fun getSemesterEntity(diaryId: Int = 1, semesterId: Int = 1, start: LocalDate = LocalDate.now(), end: LocalDate = LocalDate.now(), semesterName: Int = 1) = Semester(
-    studentId = 1,
-    diaryId = diaryId,
-    semesterId = semesterId,
-    diaryName = "$semesterId",
-    schoolYear = 1970,
-    classId = 0,
-    semesterName = semesterName,
-    unitId = 1,
-    start = start,
-    end = end
-)
-
-fun getSemesterPojo(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1) = SdkSemester(
-    diaryId = diaryId,
-    semesterId = semesterId,
-    diaryName = "$semesterId",
-    schoolYear = 1970,
-    classId = 0,
-    semesterNumber = semesterName,
-    unitId = 1,
-    start = start,
-    end = end,
-)
-
-fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API) = 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 = 1,
-    studentName = "",
-    symbol = "",
-    userLoginId = 1,
-    userName = "",
-).apply {
-    id = 1
+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
+    )
+}
+
+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 = ""
+)
diff --git a/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
new file mode 100644
index 000000000..8c52d7b37
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
@@ -0,0 +1,15 @@
+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
deleted file mode 100644
index 3b0d7c841..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-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/db/migrations/Migration27Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
deleted file mode 100644
index 8e744f27a..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
+++ /dev/null
@@ -1,133 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase
-import android.os.Build
-import androidx.sqlite.db.SupportSQLiteDatabase
-import dagger.hilt.android.testing.HiltAndroidTest
-import dagger.hilt.android.testing.HiltTestApplication
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import kotlin.random.Random
-
-@HiltAndroidTest
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
-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/test/java/io/github/wulkanowy/data/db/migrations/Migration35Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration35Test.kt
deleted file mode 100644
index 883cdb81c..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration35Test.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import android.content.ContentValues
-import android.database.sqlite.SQLiteDatabase
-import android.os.Build
-import androidx.sqlite.db.SupportSQLiteDatabase
-import dagger.hilt.android.testing.HiltAndroidTest
-import dagger.hilt.android.testing.HiltTestApplication
-import io.github.wulkanowy.utils.AppInfo
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import kotlin.random.Random
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-@HiltAndroidTest
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
-class Migration35Test : AbstractMigrationTest() {
-
-    @Test
-    fun addRandomAvatarColorsForStudents() {
-        with(helper.createDatabase(dbName, 34)) {
-            createStudent(this, 1)
-            createStudent(this, 2)
-            close()
-        }
-
-        helper.runMigrationsAndValidate(dbName, 35, true, Migration35(AppInfo()))
-
-        val db = getMigratedRoomDatabase()
-        val students = runBlocking { db.studentDao.loadAll() }
-
-        assertEquals(2, students.size)
-
-        assertTrue { students[0].avatarColor in AppInfo().defaultColorsForAvatar }
-        assertTrue { students[1].avatarColor in AppInfo().defaultColorsForAvatar }
-    }
-
-    private fun createStudent(db: SupportSQLiteDatabase, id: Long) {
-        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", Random.nextInt())
-            put("student_name", "")
-            put("user_name", "")
-            put("nick", "")
-        })
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
deleted file mode 100644
index 1c592c09f..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.AttendanceDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
-import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
-
-class AttendanceRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var attendanceDb: AttendanceDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val semester = getSemesterEntity()
-
-    private val student = getStudentEntity()
-
-    private lateinit var attendanceRepository: AttendanceRepository
-
-    private val remoteList = listOf(
-        getAttendanceRemote(of(2021, 1, 4)),
-        getAttendanceRemote(of(2021, 1, 7))
-    )
-
-    private val startDate = of(2021, 1, 4)
-
-    private val endDate = of(2021, 1, 10)
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        attendanceRepository = AttendanceRepository(attendanceDb, sdk, refreshHelper)
-    }
-
-    @Test
-    fun `force refresh without difference`() {
-        // prepare
-        coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList
-        coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { attendanceDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { attendanceRepository.getAttendance(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.size)
-        coVerify { sdk.getAttendance(startDate, endDate, 1) }
-        coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { attendanceDb.insertAll(match { it.isEmpty() }) }
-        coVerify { attendanceDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in remote`() {
-        // prepare
-        coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList
-        coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { attendanceDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { attendanceRepository.getAttendance(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.size)
-        coVerify { sdk.getAttendance(startDate, endDate, 1) }
-        coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
-        coVerify {
-            attendanceDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-        coVerify { attendanceDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in local`() {
-        // prepare
-        coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList.dropLast(1)
-        coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.dropLast(1).mapToEntities(semester))
-        )
-        coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { attendanceDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { attendanceRepository.getAttendance(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(1, res.data?.size)
-        coVerify { sdk.getAttendance(startDate, endDate, 1) }
-        coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { attendanceDb.insertAll(match { it.isEmpty() }) }
-        coVerify {
-            attendanceDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-    }
-
-    private fun getAttendanceRemote(date: LocalDate) = SdkAttendance(
-        subject = "Fizyka",
-        name = "Obecność",
-        date = date,
-        timeId = 0,
-        number = 0,
-        deleted = false,
-        excusable = false,
-        excused = false,
-        exemption = false,
-        lateness = false,
-        presence = false,
-        categoryId = 1,
-        absence = false,
-        excuseStatus = null
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepositoryTest.kt
deleted file mode 100644
index b116a623d..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/CompletedLessonsRepositoryTest.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
-import io.github.wulkanowy.sdk.pojo.CompletedLesson as SdkCompletedLesson
-
-class CompletedLessonsRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var completedLessonDb: CompletedLessonsDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val semester = getSemesterEntity()
-
-    private val student = getStudentEntity()
-
-    private lateinit var completedLessonRepository: CompletedLessonsRepository
-
-    private val remoteList = listOf(
-        getCompletedLesson(of(2021, 1, 4)),
-        getCompletedLesson(of(2021, 1, 7))
-    )
-
-    private val startDate = of(2021, 1, 4)
-
-    private val endDate = of(2021, 1, 10)
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        completedLessonRepository = CompletedLessonsRepository(completedLessonDb, sdk, refreshHelper)
-    }
-
-    @Test
-    fun `force refresh without difference`() {
-        // prepare
-        coEvery { sdk.getCompletedLessons(startDate, endDate) } returns remoteList
-        coEvery { completedLessonDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { completedLessonDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { completedLessonDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { completedLessonRepository.getCompletedLessons(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.size)
-        coVerify { sdk.getCompletedLessons(startDate, endDate) }
-        coVerify { completedLessonDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { completedLessonDb.insertAll(match { it.isEmpty() }) }
-        coVerify { completedLessonDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in remote`() {
-        // prepare
-        coEvery { sdk.getCompletedLessons(startDate, endDate) } returns remoteList
-        coEvery { completedLessonDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { completedLessonDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { completedLessonDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { completedLessonRepository.getCompletedLessons(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.size)
-        coVerify { sdk.getCompletedLessons(startDate, endDate) }
-        coVerify { completedLessonDb.loadAll(1, 1, startDate, endDate) }
-        coVerify {
-            completedLessonDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-        coVerify { completedLessonDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in local`() {
-        // prepare
-        coEvery { sdk.getCompletedLessons(startDate, endDate) } returns remoteList.dropLast(1)
-        coEvery { completedLessonDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.dropLast(1).mapToEntities(semester))
-        )
-        coEvery { completedLessonDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { completedLessonDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { completedLessonRepository.getCompletedLessons(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(1, res.data?.size)
-        coVerify { sdk.getCompletedLessons(startDate, endDate) }
-        coVerify { completedLessonDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { completedLessonDb.insertAll(match { it.isEmpty() }) }
-        coVerify {
-            completedLessonDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-    }
-
-    private fun getCompletedLesson(date: LocalDate) = SdkCompletedLesson(
-        date = date,
-        subject = "",
-        absence = "",
-        resources = "",
-        substitution = "",
-        teacherSymbol = "",
-        teacher = "",
-        topic = "",
-        number = 1
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
deleted file mode 100644
index ead6dc5d1..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.ExamDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import java.time.LocalDate
-import io.github.wulkanowy.sdk.pojo.Exam as SdkExam
-
-class ExamRemoteTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var examDb: ExamDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val semester = getSemesterEntity()
-
-    private val student = getStudentEntity()
-
-    private lateinit var examRepository: ExamRepository
-
-    private val remoteList = listOf(
-        getExam(LocalDate.of(2021, 1, 4)),
-        getExam(LocalDate.of(2021, 1, 7))
-    )
-
-    private val startDate = LocalDate.of(2021, 1, 4)
-
-    private val endDate = LocalDate.of(2021, 1, 10)
-
-    private val realEndDate = LocalDate.of(2021, 1, 31)
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        examRepository = ExamRepository(examDb, sdk, refreshHelper)
-    }
-
-    @Test
-    fun `force refresh without difference`() {
-        // prepare
-        coEvery { sdk.getExams(startDate, realEndDate, 1) } returns remoteList
-        coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { examDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { examDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { examRepository.getExams(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.size)
-        coVerify { sdk.getExams(startDate, realEndDate, 1) }
-        coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
-        coVerify { examDb.insertAll(match { it.isEmpty() }) }
-        coVerify { examDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in remote`() {
-        // prepare
-        coEvery { sdk.getExams(startDate, realEndDate, 1) } returns remoteList
-        coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { examDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { examDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { examRepository.getExams(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.size)
-        coVerify { sdk.getExams(startDate, realEndDate, 1) }
-        coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
-        coVerify {
-            examDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-        coVerify { examDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in local`() {
-        // prepare
-        coEvery { sdk.getExams(startDate, realEndDate, 1) } returns remoteList.dropLast(1)
-        coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.dropLast(1).mapToEntities(semester))
-        )
-        coEvery { examDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { examDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { examRepository.getExams(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(1, res.data?.size)
-        coVerify { sdk.getExams(startDate, realEndDate, 1) }
-        coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
-        coVerify { examDb.insertAll(match { it.isEmpty() }) }
-        coVerify {
-            examDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-    }
-
-    private fun getExam(date: LocalDate) = SdkExam(
-        subject = "",
-        group = "",
-        type = "",
-        description = "",
-        teacher = "",
-        teacherSymbol = "",
-        date = date,
-        entryDate = date
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
deleted file mode 100644
index 8a19d6337..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
+++ /dev/null
@@ -1,265 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.GradeDao
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDate.of
-import io.github.wulkanowy.sdk.pojo.Grade as SdkGrade
-
-class GradeRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var gradeDb: GradeDao
-
-    @MockK
-    private lateinit var gradeSummaryDb: GradeSummaryDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val semester = getSemesterEntity()
-
-    private val student = getStudentEntity()
-
-    private lateinit var gradeRepository: GradeRepository
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        gradeRepository = GradeRepository(gradeDb, gradeSummaryDb, sdk, refreshHelper)
-
-        coEvery { gradeDb.deleteAll(any()) } just Runs
-        coEvery { gradeDb.insertAll(any()) } returns listOf()
-
-        coEvery { gradeSummaryDb.loadAll(1, 1) } returnsMany listOf(flowOf(listOf()), flowOf(listOf()), flowOf(listOf()))
-        coEvery { gradeSummaryDb.deleteAll(any()) } just Runs
-        coEvery { gradeSummaryDb.insertAll(any()) } returns listOf()
-    }
-
-    @Test
-    fun `mark grades older than registration date as read`() {
-        // prepare
-        val boundaryDate = of(2019, 2, 27).atStartOfDay()
-        val remoteList = 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 { sdk.getGrades(1) } returns (remoteList to emptyList())
-
-        coEvery { gradeDb.loadAll(1, 1) } returnsMany listOf(
-            flowOf(listOf()), // empty because it is new user
-            flowOf(listOf()), // empty again, after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester)),
-        )
-
-        // execute
-        val res = runBlocking { gradeRepository.getGrades(student.copy(registrationDate = boundaryDate), semester, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(4, res.data?.first?.size)
-        coVerify {
-            gradeDb.insertAll(withArg {
-                assertEquals(4, it.size)
-                assertTrue(it[0].isRead)
-                assertTrue(it[1].isRead)
-                assertFalse(it[2].isRead)
-                assertFalse(it[3].isRead)
-            })
-        }
-    }
-
-    @Test
-    fun `mitigate mark grades as unread when old grades changed`() {
-        // prepare
-        val remoteList = 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 { sdk.getGrades(1) } returns (remoteList to emptyList())
-
-        val localList = listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
-            createGradeApi(4, 4.0, of(2019, 2, 26), "Druga"),
-            createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie")
-        )
-        coEvery { gradeDb.loadAll(1, 1) } returnsMany listOf(
-            flowOf(localList.mapToEntities(semester)),
-            flowOf(localList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-
-        // execute
-        val res = runBlocking { gradeRepository.getGrades(student, semester, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(4, res.data?.first?.size)
-        coVerify {
-            gradeDb.insertAll(withArg {
-                assertEquals(3, it.size)
-                assertTrue(it[0].isRead)
-                assertTrue(it[1].isRead)
-                assertFalse(it[2].isRead)
-                assertEquals(remoteList.mapToEntities(semester).last(), it[2])
-            })
-        }
-        coVerify {
-            gradeDb.deleteAll(withArg {
-                assertEquals(2, it.size)
-            })
-        }
-    }
-
-    @Test
-    fun `force refresh when local contains duplicated grades`() {
-        // prepare
-        val remoteList = listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        coEvery { sdk.getGrades(1) } returns (remoteList to emptyList())
-
-        val localList = listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"), // will be removed...
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        coEvery { gradeDb.loadAll(1, 1) } returnsMany listOf(
-            flowOf(localList.mapToEntities(semester)),
-            flowOf(localList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-
-        // execute
-        val res = runBlocking { gradeRepository.getGrades(student, semester, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.first?.size)
-        coVerify { gradeDb.insertAll(match { it.isEmpty() }) }
-        coVerify { gradeDb.deleteAll(match { it.size == 1 }) } // ... here
-    }
-
-    @Test
-    fun `force refresh when remote contains duplicated grades`() {
-        // prepare
-        val remoteList = listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"), // will be added...
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        coEvery { sdk.getGrades(1) } returns (remoteList to emptyList())
-
-        val localList = listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        coEvery { gradeDb.loadAll(1, 1) } returnsMany listOf(
-            flowOf(localList.mapToEntities(semester)),
-            flowOf(localList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-
-        // execute
-        val res = runBlocking { gradeRepository.getGrades(student, semester, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(3, res.data?.first?.size)
-        coVerify { gradeDb.insertAll(match { it.size == 1 }) } // ... here
-        coVerify { gradeDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh when local is empty`() {
-        // prepare
-        val remoteList = 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 { sdk.getGrades(1) } returns (remoteList to emptyList())
-
-        coEvery { gradeDb.loadAll(1, 1) } returnsMany listOf(
-            flowOf(listOf()),
-            flowOf(listOf()), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-
-        // execute
-        val res = runBlocking { gradeRepository.getGrades(student, semester, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(3, res.data?.first?.size)
-    }
-
-    @Test
-    fun `force refresh when remote is empty`() {
-        // prepare
-        val remoteList = emptyList<SdkGrade>()
-        coEvery { sdk.getGrades(semester.semesterId) } returns (remoteList to emptyList())
-
-        val localList = listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        )
-        coEvery { gradeDb.loadAll(semester.semesterId, student.studentId) } returnsMany listOf(
-            flowOf(localList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester)),
-        )
-
-        // execute
-        val res = runBlocking { gradeRepository.getGrades(student, semester, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(0, res.data?.first?.size)
-    }
-
-    private fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String) = SdkGrade(
-        subject = "",
-        color = "",
-        comment = "",
-        date = date,
-        description = desc,
-        entry = "",
-        modifier = .0,
-        symbol = "",
-        teacher = "",
-        value = value.toDouble(),
-        weight = weight.toString(),
-        weightValue = weight
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepositoryTest.kt
deleted file mode 100644
index 73dd4cfaa..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeStatisticsRepositoryTest.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
-import io.github.wulkanowy.data.db.dao.GradeSemesterStatisticsDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.GradeStatisticsItem
-import io.github.wulkanowy.sdk.pojo.GradeStatisticsSubject
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-
-class GradeStatisticsRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var gradePartialStatisticsDb: GradePartialStatisticsDao
-
-    @MockK
-    private lateinit var gradePointsStatisticsDb: GradePointsStatisticsDao
-
-    @MockK
-    private lateinit var gradeSemesterStatisticsDb: GradeSemesterStatisticsDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val semester = getSemesterEntity()
-
-    private val student = getStudentEntity()
-
-    private lateinit var gradeStatisticsRepository: GradeStatisticsRepository
-
-    private val remotePartialList = listOf(
-        getGradeStatisticsPartialSubject("Fizyka"),
-        getGradeStatisticsPartialSubject("Matematyka")
-    )
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        gradeStatisticsRepository = GradeStatisticsRepository(gradePartialStatisticsDb, gradePointsStatisticsDb, gradeSemesterStatisticsDb, sdk, refreshHelper)
-    }
-
-    @Test
-    fun `force refresh without difference`() {
-        // prepare
-        coEvery { sdk.getGradesPartialStatistics(1) } returns remotePartialList
-        coEvery { gradePartialStatisticsDb.loadAll(1, 1) } returnsMany listOf(
-            flowOf(remotePartialList.mapToEntities(semester)),
-            flowOf(remotePartialList.mapToEntities(semester))
-        )
-        coEvery { gradePartialStatisticsDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { gradePartialStatisticsDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { gradeStatisticsRepository.getGradesPartialStatistics(student, semester, "Wszystkie", true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2 + 1, res.data?.size)
-        coVerify { sdk.getGradesPartialStatistics(1) }
-        coVerify { gradePartialStatisticsDb.loadAll(1, 1) }
-        coVerify { gradePartialStatisticsDb.insertAll(match { it.isEmpty() }) }
-        coVerify { gradePartialStatisticsDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    private fun getGradeStatisticsPartialSubject(subjectName: String) = GradeStatisticsSubject(
-        subject = subjectName,
-        studentAverage = "",
-        classAverage = "",
-        classItems = listOf(
-            GradeStatisticsItem(
-                subject = subjectName,
-                grade = 0,
-                amount = 0
-            )
-        ),
-        studentItems = listOf()
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/LuckyNumberRemoteTest.kt
deleted file mode 100644
index a89aad35c..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/LuckyNumberRemoteTest.kt
+++ /dev/null
@@ -1,126 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.LuckyNumberDao
-import io.github.wulkanowy.data.mappers.mapToEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import java.time.LocalDate
-import io.github.wulkanowy.sdk.pojo.LuckyNumber as SdkLuckyNumber
-
-class LuckyNumberRemoteTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var luckyNumberDb: LuckyNumberDao
-
-    private val student = getStudentEntity()
-
-    private lateinit var luckyNumberRepository: LuckyNumberRepository
-
-    private val luckyNumber = SdkLuckyNumber("", "", 14)
-
-    private val date = LocalDate.now()
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-
-        luckyNumberRepository = LuckyNumberRepository(luckyNumberDb, sdk)
-    }
-
-    @Test
-    fun `force refresh without difference`() {
-        // prepare
-        coEvery { sdk.getLuckyNumber(student.schoolShortName) } returns luckyNumber
-        coEvery { luckyNumberDb.load(1, date) } returnsMany listOf(
-            flowOf(luckyNumber.mapToEntity(student)),
-            flowOf(luckyNumber.mapToEntity(student))
-        )
-        coEvery { luckyNumberDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { luckyNumberDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(luckyNumber.number, res.data?.luckyNumber)
-        coVerify { sdk.getLuckyNumber(student.schoolShortName) }
-        coVerify { luckyNumberDb.load(1, date) }
-        coVerify(exactly = 0) { luckyNumberDb.insertAll(any()) }
-        coVerify(exactly = 0) { luckyNumberDb.deleteAll(any()) }
-    }
-
-    @Test
-    fun `force refresh with different item on remote`() {
-        // prepare
-        coEvery { sdk.getLuckyNumber(student.schoolShortName) } returns luckyNumber
-        coEvery { luckyNumberDb.load(1, date) } returnsMany listOf(
-            flowOf(luckyNumber.mapToEntity(student).copy(luckyNumber = 6666)),
-            flowOf(luckyNumber.mapToEntity(student).copy(luckyNumber = 6666)), // after fetch end before save result
-            flowOf(luckyNumber.mapToEntity(student))
-        )
-        coEvery { luckyNumberDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { luckyNumberDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(luckyNumber.number, res.data?.luckyNumber)
-        coVerify { sdk.getLuckyNumber(student.schoolShortName) }
-        coVerify { luckyNumberDb.load(1, date) }
-        coVerify {
-            luckyNumberDb.insertAll(match {
-                it.size == 1 && it[0] == luckyNumber.mapToEntity(student)
-            })
-        }
-        coVerify { luckyNumberDb.deleteAll(match {
-            it.size == 1 && it[0] == luckyNumber.mapToEntity(student).copy(luckyNumber = 6666)
-        }) }
-    }
-
-    @Test
-    fun `force refresh no local item`() {
-        // prepare
-        coEvery { sdk.getLuckyNumber(student.schoolShortName) } returns luckyNumber
-        coEvery { luckyNumberDb.load(1, date) } returnsMany listOf(
-            flowOf(null),
-            flowOf(null), // after fetch end before save result
-            flowOf(luckyNumber.mapToEntity(student))
-        )
-        coEvery { luckyNumberDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { luckyNumberDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { luckyNumberRepository.getLuckyNumber(student, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(luckyNumber.number, res.data?.luckyNumber)
-        coVerify { sdk.getLuckyNumber(student.schoolShortName) }
-        coVerify { luckyNumberDb.load(1, date) }
-        coVerify {
-            luckyNumberDb.insertAll(match {
-                it.size == 1 && it[0] == luckyNumber.mapToEntity(student)
-            })
-        }
-        coVerify(exactly = 0) { luckyNumberDb.deleteAll(any()) }
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
deleted file mode 100644
index 2fc899b34..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.Status
-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.MessageWithAttachment
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.MessageDetails
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-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
-import java.time.LocalDateTime
-
-class MessageRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var messageDb: MessagesDao
-
-    @MockK
-    private lateinit var messageAttachmentDao: MessageAttachmentDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val student = getStudentEntity()
-
-    private lateinit var messageRepository: MessageRepository
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        messageRepository = MessageRepository(messageDb, messageAttachmentDao, sdk, refreshHelper)
-    }
-
-    @Test(expected = NoSuchElementException::class)
-    fun `throw error when message is not in the db`() {
-        val testMessage = getMessageEntity(1, "", false)
-        coEvery { messageDb.loadMessageWithAttachment(1, 1) } throws NoSuchElementException("No message in database")
-
-        runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
-    }
-
-    @Test
-    fun `get message when content already in db`() {
-        val testMessage = getMessageEntity(123, "Test", false)
-        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
-
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returns flowOf(messageWithAttachment)
-
-        val res = runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
-
-        assertEquals(null, res.error)
-        assertEquals(Status.SUCCESS, res.status)
-        assertEquals("Test", res.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 { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
-        coEvery { sdk.getMessageDetails(testMessage.messageId, 1, false, testMessage.realId) } returns MessageDetails("Test", emptyList())
-        coEvery { messageDb.updateAll(any()) } just Runs
-        coEvery { messageAttachmentDao.insertAttachments(any()) } returns listOf(1)
-
-        val res = runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
-
-        assertEquals(null, res.error)
-        assertEquals(Status.SUCCESS, res.status)
-        assertEquals("Test", res.data!!.message.content)
-        coVerify { messageDb.updateAll(listOf(testMessageWithContent)) }
-    }
-
-    @Test(expected = UnknownHostException::class)
-    fun `get message when content in db is empty and there is no internet connection`() {
-        val testMessage = getMessageEntity(123, "", false)
-
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } throws UnknownHostException()
-
-        runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
-    }
-
-    @Test(expected = UnknownHostException::class)
-    fun `get message when content in db is empty, unread and there is no internet connection`() {
-        val testMessage = getMessageEntity(123, "", true)
-
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } throws UnknownHostException()
-
-        runBlocking { messageRepository.getMessage(student, testMessage).toList()[1] }
-    }
-
-    private fun getMessageEntity(
-        messageId: Int,
-        content: String,
-        unread: Boolean
-    ) = Message(
-        studentId = 1,
-        realId = 1,
-        messageId = messageId,
-        sender = "",
-        senderId = 1,
-        recipient = "",
-        subject = "",
-        date = LocalDateTime.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/data/repositories/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
deleted file mode 100644
index e5b3d1015..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.MobileDeviceDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.Device
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import java.time.LocalDateTime.of
-
-class MobileDeviceRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var mobileDeviceDb: MobileDeviceDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val semester = getSemesterEntity()
-
-    private val student = getStudentEntity()
-
-    private lateinit var mobileDeviceRepository: MobileDeviceRepository
-
-    private val remoteList = listOf(
-        getDevicePojo(1),
-        getDevicePojo(2)
-    )
-
-    @Before
-    fun initTest() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        mobileDeviceRepository = MobileDeviceRepository(mobileDeviceDb, sdk, refreshHelper)
-    }
-
-    @Test
-    fun `force refresh without difference`() {
-        // prepare
-        coEvery { sdk.getRegisteredDevices() } returns remoteList
-        coEvery { mobileDeviceDb.loadAll(student.studentId) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toFirstResult() }
-
-        // verify
-        Assert.assertEquals(null, res.error)
-        Assert.assertEquals(2, res.data?.size)
-        coVerify { sdk.getRegisteredDevices() }
-        coVerify { mobileDeviceDb.loadAll(1) }
-        coVerify { mobileDeviceDb.insertAll(match { it.isEmpty() }) }
-        coVerify { mobileDeviceDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in remote`() {
-        // prepare
-        coEvery { sdk.getRegisteredDevices() } returns remoteList
-        coEvery { mobileDeviceDb.loadAll(1) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toFirstResult() }
-
-        // verify
-        Assert.assertEquals(null, res.error)
-        Assert.assertEquals(2, res.data?.size)
-        coVerify { sdk.getRegisteredDevices() }
-        coVerify { mobileDeviceDb.loadAll(1) }
-        coVerify {
-            mobileDeviceDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-        coVerify { mobileDeviceDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    @Test
-    fun `force refresh with more items in local`() {
-        // prepare
-        coEvery { sdk.getRegisteredDevices() } returns remoteList.dropLast(1)
-        coEvery { mobileDeviceDb.loadAll(1) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.dropLast(1).mapToEntities(semester))
-        )
-        coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toFirstResult() }
-
-        // verify
-        Assert.assertEquals(null, res.error)
-        Assert.assertEquals(1, res.data?.size)
-        coVerify { sdk.getRegisteredDevices() }
-        coVerify { mobileDeviceDb.loadAll(1) }
-        coVerify { mobileDeviceDb.insertAll(match { it.isEmpty() }) }
-        coVerify {
-            mobileDeviceDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
-            })
-        }
-    }
-
-    private fun getDevicePojo(day: Int) = Device(
-        id = 0,
-        name = "",
-        deviceId = "",
-        createDate = of(2019, 5, day, 0, 0, 0),
-        modificationDate = of(2019, 5, day, 0, 0, 0)
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
deleted file mode 100644
index 82406ef46..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
-
-class RecipientLocalTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var recipientDb: RecipientDao
-
-    private val student = getStudentEntity()
-
-    private lateinit var recipientRepository: RecipientRepository
-
-    private val remoteList = listOf(
-        SdkRecipient("2rPracownik", "Kowalski Jan", 3, 4, 2, "hash", "Kowalski Jan [KJ] - Pracownik (Fake123456)"),
-        SdkRecipient("3rPracownik", "Kowalska Karolina", 4, 4, 2, "hash", "Kowalska Karolina [KK] - Pracownik (Fake123456)"),
-        SdkRecipient("4rPracownik", "Krupa Stanisław", 5, 4, 1, "hash", "Krupa Stanisław [KS] - Uczeń (Fake123456)")
-    )
-
-    @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-
-        recipientRepository = RecipientRepository(recipientDb, sdk)
-    }
-
-    @Test
-    fun `load recipients when items already in database`() {
-        // prepare
-        coEvery { recipientDb.loadAll(4, 123, 7) } returnsMany listOf(
-            remoteList.mapToEntities(4),
-            remoteList.mapToEntities(4)
-        )
-        coEvery { recipientDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { recipientDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(4, 123, "", 4, "", listOf()), 7) }
-
-        // verify
-        assertEquals(3, res.size)
-        coVerify { recipientDb.loadAll(4, 123, 7) }
-    }
-
-    @Test
-    fun `load recipients when database is empty`() {
-        // prepare
-        coEvery { sdk.getRecipients(123, 7) } returns remoteList
-        coEvery { recipientDb.loadAll(4, 123, 7) } returnsMany listOf(
-            emptyList(),
-            remoteList.mapToEntities(4)
-        )
-        coEvery { recipientDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { recipientDb.deleteAll(any()) } just Runs
-
-        // execute
-        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(4, 123, "", 4, "", listOf()), 7) }
-
-        // verify
-        assertEquals(3, res.size)
-        coVerify { sdk.getRecipients(123, 7) }
-        coVerify { recipientDb.loadAll(4, 123, 7) }
-        coVerify { recipientDb.insertAll(match { it.isEmpty() }) }
-        coVerify { recipientDb.deleteAll(match { it.isEmpty() }) }
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
deleted file mode 100644
index 0ed008851..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.TestDispatchersProvider
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getSemesterPojo
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-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.impl.annotations.SpyK
-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 java.time.LocalDate.now
-
-class SemesterRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var semesterDb: SemesterDao
-
-    private val student = getStudentEntity()
-
-    private lateinit var semesterRepository: SemesterRepository
-
-    @Before
-    fun initTest() {
-        MockKAnnotations.init(this)
-
-        semesterRepository = SemesterRepository(semesterDb, sdk, TestDispatchersProvider())
-    }
-
-    @Test
-    fun getSemesters_noSemesters() {
-        val semesters = listOf(
-            getSemesterPojo(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(1, 2, now().minusMonths(3), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns emptyList()
-        coEvery { sdk.getSemesters() } returns semesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns emptyList()
-
-        runBlocking { semesterRepository.getSemesters(student) }
-
-        coVerify { semesterDb.insertSemesters(semesters.mapToEntities(student.studentId)) }
-        coVerify { semesterDb.deleteAll(emptyList()) }
-    }
-
-    @Test
-    fun getSemesters_invalidDiary_api() {
-        val badSemesters = listOf(
-            getSemesterPojo(0, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(0, 2, now().minusMonths(3), now())
-        )
-
-        val goodSemesters = listOf(
-            getSemesterPojo(122, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(123, 2, now().minusMonths(3), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns badSemesters.mapToEntities(student.studentId)
-        coEvery { sdk.getSemesters() } returns goodSemesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
-
-        val items = runBlocking { semesterRepository.getSemesters(student.copy(loginMode = Sdk.Mode.API.name)) }
-        assertEquals(2, items.size)
-        assertEquals(0, items[0].diaryId)
-    }
-
-    @Test
-    fun getSemesters_invalidDiary_scrapper() {
-        val badSemesters = listOf(
-            getSemesterPojo(0, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(0, 2, now().minusMonths(3), now())
-        )
-
-        val goodSemesters = listOf(
-            getSemesterPojo(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(1, 2, now().minusMonths(3), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returnsMany listOf(
-            badSemesters.mapToEntities(student.studentId),
-            badSemesters.mapToEntities(student.studentId),
-            goodSemesters.mapToEntities(student.studentId)
-        )
-        coEvery { sdk.getSemesters() } returns goodSemesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
-
-        val items = runBlocking { semesterRepository.getSemesters(student.copy(loginMode = Sdk.Mode.SCRAPPER.name)) }
-        assertEquals(2, items.size)
-        assertNotEquals(0, items[0].diaryId)
-    }
-
-    @Test
-    fun getSemesters_noCurrent() {
-        val semesters = listOf(
-            getSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
-            getSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semesters
-
-        val items = runBlocking { semesterRepository.getSemesters(student) }
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_oneCurrent() {
-        val semesters = listOf(
-            getSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterEntity(1, 2, now().minusMonths(3), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semesters
-
-        val items = runBlocking { semesterRepository.getSemesters(student) }
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_doubleCurrent() {
-        val semesters = listOf(
-            getSemesterEntity(1, 1, now(), now()),
-            getSemesterEntity(1, 2, now(), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semesters
-
-        val items = runBlocking { semesterRepository.getSemesters(student) }
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_noSemesters_refreshOnNoCurrent() {
-        val semesters = listOf(
-            getSemesterPojo(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(1, 2, now().minusMonths(3), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns emptyList()
-        coEvery { sdk.getSemesters() } returns semesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
-
-        runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
-
-        coVerify { semesterDb.deleteAll(emptyList()) }
-        coVerify { semesterDb.insertSemesters(semesters.mapToEntities(student.studentId)) }
-    }
-
-    @Test
-    fun getSemesters_noCurrent_refreshOnNoCurrent() {
-        val semestersWithNoCurrent = listOf(
-            getSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
-            getSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
-        )
-
-        val newSemesters = listOf(
-            getSemesterPojo(1, 1, now().minusMonths(12), now().minusMonths(6)),
-            getSemesterPojo(1, 2, now().minusMonths(6), now().minusMonths(1)),
-
-            getSemesterPojo(2, 1, now().minusMonths(1), now().plusMonths(5)),
-            getSemesterPojo(2, 2, now().plusMonths(5), now().plusMonths(11)),
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semestersWithNoCurrent
-        coEvery { sdk.getSemesters() } returns newSemesters
-        coEvery { semesterDb.deleteAll(any()) } just Runs
-        coEvery { semesterDb.insertSemesters(any()) } returns listOf()
-
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
-        assertEquals(2, items.size)
-    }
-
-    @Test
-    fun getSemesters_doubleCurrent_refreshOnNoCurrent() {
-        val semesters = listOf(
-            getSemesterEntity(1, 1, now(), now()),
-            getSemesterEntity(1, 2, now(), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semesters
-
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
-        assertEquals(2, items.size)
-    }
-
-    @Test(expected = IllegalArgumentException::class)
-    fun getCurrentSemester_doubleCurrent() {
-        val semesters = listOf(
-            getSemesterEntity(1, 1, now(), now()),
-            getSemesterEntity(1, 1, now(), now())
-        )
-
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semesters
-
-        runBlocking { semesterRepository.getCurrentSemester(student) }
-    }
-
-    @Test(expected = RuntimeException::class)
-    fun getCurrentSemester_emptyList() {
-        coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns emptyList()
-
-        runBlocking { semesterRepository.getCurrentSemester(student) }
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt
deleted file mode 100644
index 402b22723..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.TestDispatchersProvider
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.Student
-import io.github.wulkanowy.utils.AppInfo
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-
-class StudentTest {
-
-    @MockK
-    private lateinit var mockSdk: Sdk
-
-    @MockK
-    private lateinit var studentDb: StudentDao
-
-    @MockK
-    private lateinit var semesterDb: SemesterDao
-
-    private lateinit var studentRepository: StudentRepository
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        studentRepository = StudentRepository(
-            mockk(),
-            TestDispatchersProvider(),
-            studentDb,
-            semesterDb,
-            mockSdk,
-            AppInfo()
-        )
-    }
-
-    @Test
-    fun testRemoteAll() {
-        coEvery { mockSdk.getStudentsFromScrapper(any(), any(), any(), any()) } returns listOf(
-            getStudent("test")
-        )
-
-        val students = runBlocking { studentRepository.getStudentsScrapper("", "", "http://fakelog.cf", "") }
-        assertEquals(1, students.size)
-        assertEquals("test Kowalski", students.first().student.studentName)
-    }
-
-    private fun getStudent(name: String): Student {
-        return Student(
-            email = "",
-            symbol = "",
-            studentId = 0,
-            userLoginId = 0,
-            userLogin = "",
-            userName = "",
-            studentName = name,
-            studentSurname = "Kowalski",
-            schoolSymbol = "",
-            schoolShortName = "",
-            schoolName = "",
-            className = "",
-            classId = 0,
-            certificateKey = "",
-            privateKey = "",
-            loginMode = Sdk.Mode.SCRAPPER,
-            mobileBaseUrl = "",
-            loginType = Sdk.ScrapperLoginType.STANDARD,
-            scrapperBaseUrl = "",
-            isParent = false,
-            semesters = emptyList()
-        )
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
deleted file mode 100644
index 1e000e848..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
+++ /dev/null
@@ -1,231 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
-import io.github.wulkanowy.data.db.dao.TimetableDao
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.getSemesterEntity
-import io.github.wulkanowy.getStudentEntity
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.toFirstResult
-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.impl.annotations.SpyK
-import io.mockk.just
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalDateTime.of
-import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
-
-class TimetableRepositoryTest {
-
-    @MockK(relaxed = true)
-    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
-
-    @SpyK
-    private var sdk = Sdk()
-
-    @MockK
-    private lateinit var timetableDb: TimetableDao
-
-    @MockK
-    private lateinit var timetableAdditionalDao: TimetableAdditionalDao
-
-    @MockK(relaxUnitFun = true)
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private val student = getStudentEntity()
-
-    private val semester = getSemesterEntity()
-
-    private lateinit var timetableRepository: TimetableRepository
-
-    private val startDate = LocalDate.of(2021, 1, 4)
-
-    private val endDate = LocalDate.of(2021, 1, 10)
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        every { refreshHelper.isShouldBeRefreshed(any()) } returns false
-
-        timetableRepository = TimetableRepository(timetableDb, timetableAdditionalDao, sdk, timetableNotificationSchedulerHelper, refreshHelper)
-    }
-
-    @Test
-    fun copyRoomToCompletedFromPrevious() {
-        // prepare
-        val remoteList = listOf(
-            createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "", "Przyroda"),
-            createTimetableRemote(of(2021, 1, 4, 8, 50), 2, "", "Religia"),
-            createTimetableRemote(of(2021, 1, 4, 9, 40), 3, "", "W-F"),
-            createTimetableRemote(of(2021, 1, 4, 10, 30), 4, "", "W-F")
-        )
-        coEvery { sdk.getTimetable(any(), any()) } returns (remoteList to emptyList())
-
-        val localList = listOf(
-            createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "123", "Przyroda"),
-            createTimetableRemote(of(2021, 1, 4, 8, 50), 2, "321", "Religia"),
-            createTimetableRemote(of(2021, 1, 4, 9, 40), 3, "213", "W-F"),
-            createTimetableRemote(of(2021, 1, 4, 10, 30), 3, "213", "W-F", "Jan Kowalski")
-        )
-        coEvery { timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate) } returns flowOf(localList.mapToEntities(semester))
-        coEvery { timetableDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { timetableDb.deleteAll(any()) } just Runs
-
-        coEvery { timetableAdditionalDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
-        coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
-        coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
-
-        // execute
-        val res = runBlocking {
-            timetableRepository.getTimetable(student, semester, startDate, endDate, true).toFirstResult()
-        }
-
-        // verify
-        assertEquals(4, res.data?.first.orEmpty().size)
-        coVerify {
-            timetableDb.insertAll(withArg {
-                assertEquals(4, it.size)
-                assertEquals("123", it[0].room)
-                assertEquals("321", it[1].room)
-                assertEquals("213", it[2].room)
-            })
-        }
-        coVerify { timetableDb.deleteAll(match { it.size == 4 }) }
-    }
-
-    @Test
-    fun copyTeacherToCompletedFromPrevious() {
-        // prepare
-        val remoteList = listOf(
-            createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false), // skip
-            createTimetableRemote(of(2021, 1, 4, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
-            createTimetableRemote(of(2021, 1, 4, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
-            createTimetableRemote(of(2021, 1, 4, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true), // skip
-
-            createTimetableRemote(of(2021, 1, 5, 8, 0), 1, "123", "Język polski", "", false),
-            createTimetableRemote(of(2021, 1, 5, 8, 50), 2, "124", "Język polski", "", true),
-            createTimetableRemote(of(2021, 1, 5, 9, 40), 3, "125", "Język polski", "", false),
-            createTimetableRemote(of(2021, 1, 5, 10, 40), 4, "126", "Język polski", "", true),
-
-            createTimetableRemote(of(2021, 1, 6, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
-            createTimetableRemote(of(2021, 1, 6, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
-            createTimetableRemote(of(2021, 1, 6, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
-            createTimetableRemote(of(2021, 1, 6, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
-        )
-        coEvery { sdk.getTimetable(startDate, endDate) } returns (remoteList to emptyList())
-
-        val localList = listOf(
-            createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
-            createTimetableRemote(of(2021, 1, 4, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
-            createTimetableRemote(of(2021, 1, 4, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
-            createTimetableRemote(of(2021, 1, 4, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
-
-            createTimetableRemote(of(2021, 1, 5, 8, 0), 1, "123", "Język polski", "Joanna Wtorkowska", false),
-            createTimetableRemote(of(2021, 1, 5, 8, 50), 2, "124", "Język polski", "Joanna Wtorkowska", false),
-            createTimetableRemote(of(2021, 1, 5, 9, 40), 3, "125", "Język polski", "Joanna Środowska", true),
-            createTimetableRemote(of(2021, 1, 5, 10, 40), 4, "126", "Język polski", "Joanna Środowska", true),
-
-            createTimetableRemote(of(2021, 1, 6, 8, 0), 1, "123", "Matematyka", "", false),
-            createTimetableRemote(of(2021, 1, 6, 8, 50), 2, "124", "Matematyka", "", false),
-            createTimetableRemote(of(2021, 1, 6, 9, 40), 3, "125", "Matematyka", "", true),
-            createTimetableRemote(of(2021, 1, 6, 10, 40), 4, "126", "Matematyka", "", true)
-        )
-        coEvery { timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate) } returns flowOf(localList.mapToEntities(semester))
-        coEvery { timetableDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { timetableDb.deleteAll(any()) } just Runs
-
-        coEvery { timetableAdditionalDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
-        coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
-        coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
-
-        // execute
-        val res = runBlocking { timetableRepository.getTimetable(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(12, res.data!!.first.size)
-
-        coVerify {
-            timetableDb.insertAll(withArg {
-                assertEquals(10, it.size)
-//                assertEquals("Paweł Poniedziałkowski", it[0].teacher) // skip
-                assertEquals("Jakub Wtorkowski", it[0].teacher)
-                assertEquals("Joanna Poniedziałkowska", it[1].teacher)
-//                assertEquals("Joanna Wtorkowska", it[3].teacher) // skip
-
-                assertEquals("Joanna Wtorkowska", it[2].teacher)
-                assertEquals("", it[3].teacher)
-                assertEquals("", it[4].teacher)
-                assertEquals("", it[5].teacher)
-
-                assertEquals("Paweł Środowski", it[6].teacher)
-                assertEquals("Paweł Czwartkowski", it[7].teacher)
-                assertEquals("Paweł Środowski", it[8].teacher)
-                assertEquals("Paweł Czwartkowski", it[9].teacher)
-            })
-        }
-        coVerify { timetableDb.deleteAll(match { it.size == 10 }) }
-    }
-
-    @Test
-    fun `force refresh without difference`() {
-        val remoteList = listOf(
-            createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "123", "Język polski", "", false),
-            createTimetableRemote(of(2021, 1, 4, 8, 50), 2, "124", "Język polski", "", true)
-        )
-
-        // prepare
-        coEvery { sdk.getTimetable(startDate, endDate) } returns (remoteList to emptyList())
-        coEvery { timetableDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester))
-        )
-        coEvery { timetableDb.insertAll(any()) } returns listOf(1, 2, 3)
-        coEvery { timetableDb.deleteAll(any()) } just Runs
-
-        coEvery { timetableAdditionalDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
-        coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
-        coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
-
-        // execute
-        val res = runBlocking { timetableRepository.getTimetable(student, semester, startDate, endDate, true).toFirstResult() }
-
-        // verify
-        assertEquals(null, res.error)
-        assertEquals(2, res.data?.first?.size)
-        coVerify { sdk.getTimetable(startDate, endDate) }
-        coVerify { timetableDb.loadAll(1, 1, startDate, endDate) }
-        coVerify { timetableDb.insertAll(match { it.isEmpty() }) }
-        coVerify { timetableDb.deleteAll(match { it.isEmpty() }) }
-    }
-
-    private fun createTimetableRemote(start: LocalDateTime, number: Int = 1, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false) = SdkTimetable(
-        number = number,
-        start = start,
-        end = start.plusMinutes(45),
-        date = start.toLocalDate(),
-        subject = subject,
-        group = "",
-        room = room,
-        teacher = teacher,
-        info = "",
-        changes = changes,
-        canceled = false,
-        roomOld = "",
-        subjectOld = "",
-        teacherOld = "",
-        studentPlan = true
-    )
-}
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
new file mode 100644
index 000000000..954c191ce
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
@@ -0,0 +1,19 @@
+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(var isInternetConnection: Boolean = true) : InternetObservingStrategy {
+
+    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
+        return Single.just(isInternetConnection)
+    }
+
+    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
+        return Observable.just(isInternetConnection)
+    }
+
+    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
new file mode 100644
index 000000000..a5b79cfdd
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
@@ -0,0 +1,79 @@
+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.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
+
+class AttendanceRemoteTest {
+
+    @SpyK
+    private var mockSdk = Sdk()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    private var student = getStudentEntity()
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getAttendanceTest() {
+        every { mockSdk.init(student) } returns mockSdk
+        every {
+            mockSdk.getAttendance(
+                of(2018, 9, 10),
+                of(2018, 9, 15),
+                1
+            )
+        } returns Single.just(listOf(
+            getAttendance(of(2018, 9, 10)),
+            getAttendance(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 attendance = AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
+        assertEquals(2, attendance.size)
+    }
+
+    private fun getAttendance(date: LocalDate): Attendance {
+        return Attendance(
+            subject = "Fizyka",
+            name = "Obecność",
+            date = date,
+            timeId = 0,
+            number = 0,
+            deleted = false,
+            excusable = false,
+            excused = false,
+            exemption = false,
+            lateness = false,
+            presence = false,
+            categoryId = 1,
+            absence = false,
+            excuseStatus = null
+        )
+    }
+}
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
new file mode 100644
index 000000000..10307feee
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
@@ -0,0 +1,73 @@
+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.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
+
+class CompletedLessonsRemoteTest {
+
+    @SpyK
+    private var mockSdk = Sdk()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    private val student = getStudentEntity()
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getCompletedLessonsTest() {
+        every { mockSdk.init(student) } returns mockSdk
+        every {
+            mockSdk.getCompletedLessons(
+                of(2018, 9, 10),
+                of(2018, 9, 15)
+            )
+        } returns Single.just(listOf(
+            getCompletedLesson(of(2018, 9, 10)),
+            getCompletedLesson(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 completed = CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
+        Assert.assertEquals(2, completed.size)
+    }
+
+    private fun getCompletedLesson(date: LocalDate): CompletedLesson {
+        return CompletedLesson(
+            date = date,
+            subject = "",
+            absence = "",
+            resources = "",
+            substitution = "",
+            teacherSymbol = "",
+            teacher = "",
+            topic = "",
+            number = 1
+        )
+    }
+}
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
new file mode 100644
index 000000000..aecef4728
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
@@ -0,0 +1,74 @@
+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.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
+
+class ExamRemoteTest {
+
+    @SpyK
+    private var mockSdk = Sdk()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    private val student = getStudentEntity()
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getExamsTest() {
+        every { mockSdk.init(student) } returns mockSdk
+        every { mockSdk.switchDiary(1, 2019) } returns mockSdk
+
+        every {
+            mockSdk.getExams(
+                of(2018, 9, 10),
+                of(2018, 9, 15),
+                1
+            )
+        } returns Single.just(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
+
+        val exams = ExamRemote(mockSdk).getExams(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
+        assertEquals(2, exams.size)
+    }
+
+    private fun getExam(date: LocalDate): Exam {
+        return Exam(
+            subject = "",
+            group = "",
+            type = "",
+            description = "",
+            teacher = "",
+            teacherSymbol = "",
+            date = date,
+            entryDate = date
+        )
+    }
+}
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
new file mode 100644
index 000000000..77c87025d
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
@@ -0,0 +1,86 @@
+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.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class GradeStatisticsRemoteTest {
+
+    @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(
+            getGradeStatistics("Fizyka"),
+            getGradeStatistics("Matematyka")
+        ))
+
+        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 stats = GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false).blockingGet()
+        assertEquals(2, stats.size)
+    }
+
+    @Test
+    fun getGradePointsStatisticsTest() {
+        every { mockSdk.getGradesPointsStatistics(1) } returns Single.just(listOf(
+            getGradePointsStatistics("Fizyka"),
+            getGradePointsStatistics("Matematyka")
+        ))
+
+        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 stats = GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock).blockingGet()
+        assertEquals(2, stats.size)
+    }
+
+    private fun getGradeStatistics(subjectName: String): GradeStatistics {
+        return GradeStatistics(
+            subject = subjectName,
+            gradeValue = 5,
+            amount = 10,
+            grade = "",
+            semesterId = 1
+        )
+    }
+
+    private fun getGradePointsStatistics(subjectName: String): GradePointsStatistics {
+        return GradePointsStatistics(
+            semesterId = 1,
+            subject = subjectName,
+            student = 0.80,
+            others = 0.40
+        )
+    }
+}
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
new file mode 100644
index 000000000..cbdf34fa8
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.data.repositories.luckynumber
+
+import io.github.wulkanowy.getStudentEntity
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Maybe
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.threeten.bp.LocalDate
+
+class LuckyNumberRemoteTest {
+
+    @SpyK
+    private var mockSdk = Sdk()
+
+    private val student = getStudentEntity(Sdk.Mode.SCRAPPER)
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getLuckyNumberTest() {
+        every { mockSdk.init(student) } returns mockSdk
+        every { mockSdk.getLuckyNumber("test") } returns Maybe.just(14)
+
+        every { mockSdk.diaryId } returns 1
+
+        val luckyNumber = LuckyNumberRemote(mockSdk)
+            .getLuckyNumber(student)
+            .blockingGet()
+
+        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..b7963d430
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
@@ -0,0 +1,114 @@
+package io.github.wulkanowy.data.repositories.message
+
+import androidx.room.EmptyResultSetException
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.reactivex.Single
+import io.reactivex.observers.TestObserver
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDateTime.now
+import java.net.UnknownHostException
+
+class MessageRepositoryTest {
+
+    @Mock
+    lateinit var local: MessageLocal
+
+    @Mock
+    lateinit var remote: MessageRemote
+
+    @Mock
+    lateinit var student: Student
+
+    private val testObservingStrategy = UnitTestInternetObservingStrategy()
+
+    private lateinit var repo: MessageRepository
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.initMocks(this)
+
+        repo = MessageRepository(InternetObservingSettings.builder()
+            .strategy(testObservingStrategy)
+            .build(), local, remote)
+    }
+
+    @Test
+    fun `throw error when message is not in the db`() {
+        val testMessage = Message(1, 1, 1, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.error(EmptyResultSetException("No message in database")))
+
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(EmptyResultSetException::class.java)
+    }
+
+    @Test
+    fun `get message when content already in db`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "Test", now(), 1, false, 1, 1, false, false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
+
+        val message = repo.getMessage(student, testMessage).blockingGet()
+
+        assertEquals("Test", message.message.content)
+    }
+
+    @Test
+    fun `get message when content in db is empty`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+        val testMessageWithContent = testMessage.copy(content = "Test")
+
+        val mWa = MessageWithAttachment(testMessage, emptyList())
+        val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
+
+        `when`(local.getMessageWithAttachment(student, testMessage))
+            .thenReturn(Single.just(mWa))
+            .thenReturn(Single.just(mWaWithContent))
+        `when`(remote.getMessagesContentDetails(student, testMessageWithContent)).thenReturn(Single.just("Test" to emptyList()))
+
+        val message = repo.getMessage(student, testMessage).blockingGet()
+
+        assertEquals("Test", message.message.content)
+        verify(local).updateMessages(listOf(testMessageWithContent))
+    }
+
+    @Test
+    fun `get message when content in db is empty and there is no internet connection`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, false, 1, 1, false, false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
+
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
+    }
+
+    @Test
+    fun `get message when content in db is empty, unread and there is no internet connection`() {
+        val testMessage = Message(1, 1, 123, "", 1, "", "", "", now(), 1, true, 1, 1, false, false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        testObservingStrategy.isInternetConnection = false
+        `when`(local.getMessageWithAttachment(student, testMessage)).thenReturn(Single.just(messageWithAttachment))
+
+        val message = repo.getMessage(student, testMessage)
+        val messageObserver = TestObserver<MessageWithAttachment>()
+        message.subscribe(messageObserver)
+        messageObserver.assertError(UnknownHostException::class.java)
+    }
+}
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
new file mode 100644
index 000000000..c586572f6
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
@@ -0,0 +1,67 @@
+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.github.wulkanowy.getStudentEntity
+import io.reactivex.Maybe
+import io.reactivex.Single
+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
+
+class MobileDeviceRepositoryTest {
+
+    @Mock
+    private lateinit var semester: Semester
+
+    @Mock
+    private lateinit var mobileDeviceRemote: MobileDeviceRemote
+
+    @Mock
+    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)
+    }
+
+    @Test
+    fun getDevices() {
+        val devices = listOf(
+            getDeviceEntity(1),
+            getDeviceEntity(2)
+        )
+
+        doReturn(Maybe.empty<MobileDevice>()).`when`(mobileDeviceLocal).getDevices(semester)
+        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(student, semester)
+
+        mobileDeviceRepository.getDevices(student, semester).blockingGet()
+
+        verify(mobileDeviceLocal).deleteDevices(emptyList())
+        verify(mobileDeviceLocal).saveDevices(devices)
+    }
+
+    private fun getDeviceEntity(day: Int): MobileDevice {
+        return MobileDevice(
+            studentId = 1,
+            deviceId = 1,
+            name = "",
+            date = of(2019, 5, day, 0, 0, 0)
+        )
+    }
+}
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
new file mode 100644
index 000000000..c00a771cc
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
@@ -0,0 +1,196 @@
+package io.github.wulkanowy.data.repositories.semester
+
+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.Student
+import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
+import io.github.wulkanowy.createSemesterEntity
+import io.reactivex.Maybe
+import io.reactivex.Single
+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.doReturn
+import org.mockito.Mockito.verify
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
+
+class SemesterRepositoryTest {
+
+    @Mock
+    private lateinit var semesterRemote: SemesterRemote
+
+    @Mock
+    private lateinit var semesterLocal: SemesterLocal
+
+    @Mock
+    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)
+        doReturn("SCRAPPER").`when`(student).loginMode
+    }
+
+    @Test
+    fun getSemesters_noSemesters() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
+        )
+
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+
+        semesterRepository.getSemesters(student).blockingGet()
+
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
+    }
+
+    @Test
+    fun getSemesters_invalidDiary_api() {
+        doReturn("API").`when`(student).loginMode
+        val badSemesters = listOf(
+            createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(0, 2, now().minusMonths(3), now())
+        )
+
+        doReturn(Maybe.just(badSemesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        assertEquals(2, items.size)
+        assertEquals(0, items[0].diaryId)
+    }
+
+    @Test
+    fun getSemesters_invalidDiary_scrapper() {
+        doReturn("SCRAPPER").`when`(student).loginMode
+        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())
+        )
+
+        doReturn(Maybe.just(badSemesters), Maybe.just(badSemesters), Maybe.just(goodSemesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(goodSemesters)).`when`(semesterRemote).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        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))
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        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())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_doubleCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 2, now(), now())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student).blockingGet()
+        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())
+        )
+
+        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+
+        semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
+
+        verify(semesterLocal).deleteSemesters(emptyList())
+        verify(semesterLocal).saveSemesters(semesters)
+    }
+
+    @Test
+    fun getSemesters_noCurrent_refreshOnNoCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
+            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_doubleCurrent_refreshOnNoCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 2, now(), now())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true).blockingGet()
+        assertEquals(2, items.size)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun getCurrentSemester_doubleCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 1, now(), now())
+        )
+
+        doReturn(Maybe.just(semesters)).`when`(semesterLocal).getSemesters(student)
+
+        semesterRepository.getCurrentSemester(student).blockingGet()
+    }
+
+    @Test(expected = RuntimeException::class)
+    fun getCurrentSemester_emptyList() {
+        doReturn(Maybe.just(emptyList<Semester>())).`when`(semesterLocal).getSemesters(student)
+
+        semesterRepository.getCurrentSemester(student).blockingGet()
+    }
+}
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
new file mode 100644
index 000000000..b6b195c91
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.data.repositories.student
+
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Student
+import io.reactivex.Single
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.anyString
+import org.mockito.Mockito.doReturn
+import org.mockito.MockitoAnnotations
+
+class StudentRemoteTest {
+
+    @Mock
+    private lateinit var mockSdk: Sdk
+
+    @Before
+    fun initApi() {
+        MockitoAnnotations.initMocks(this)
+    }
+
+    @Test
+    fun testRemoteAll() {
+        doReturn(Single.just(listOf(getStudent("test")))).`when`(mockSdk).getStudentsFromScrapper(anyString(), anyString(), anyString(), anyString())
+
+        val students = StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "").blockingGet()
+        assertEquals(1, students.size)
+        assertEquals("test", students.first().studentName)
+    }
+
+    private fun getStudent(name: String): Student {
+        return Student(
+            email = "",
+            symbol = "",
+            studentId = 0,
+            userLoginId = 0,
+            studentName = name,
+            schoolSymbol = "",
+            schoolShortName = "",
+            schoolName = "",
+            className = "",
+            classId = 0,
+            certificateKey = "",
+            privateKey = "",
+            loginMode = Sdk.Mode.SCRAPPER,
+            mobileBaseUrl = "",
+            loginType = Sdk.ScrapperLoginType.STANDARD,
+            scrapperBaseUrl = "",
+            isParent = false
+        )
+    }
+}
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
new file mode 100644
index 000000000..d2b4a6670
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
@@ -0,0 +1,78 @@
+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.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.reactivex.Single
+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
+
+class TimetableRemoteTest {
+
+    @SpyK
+    private var mockSdk = Sdk()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    private val student = getStudentEntity()
+
+    @Before
+    fun initApi() {
+        MockKAnnotations.init(this)
+    }
+
+    @Test
+    fun getTimetableTest() {
+        every {
+            mockSdk.getTimetable(
+                of(2018, 9, 10),
+                of(2018, 9, 15)
+            )
+        } returns Single.just(listOf(
+            getTimetable(of(2018, 9, 10)),
+            getTimetable(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 timetable = TimetableRemote(mockSdk).getTimetable(student, semesterMock,
+            of(2018, 9, 10),
+            of(2018, 9, 15)
+        ).blockingGet()
+        assertEquals(2, timetable.size)
+    }
+
+    private fun getTimetable(date: LocalDate): Timetable {
+        return Timetable(
+            date = date,
+            number = 0,
+            teacherOld = "",
+            subjectOld = "",
+            roomOld = "",
+            subject = "",
+            teacher = "",
+            group = "",
+            canceled = false,
+            changes = false,
+            info = "",
+            room = "",
+            end = now(),
+            start = now(),
+            studentPlan = true
+        )
+    }
+}
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 3878503aa..984bbbcf8 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,75 +1,43 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.createSemesterEntity
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.GradeRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.getSemesterEntity
+import io.github.wulkanowy.data.repositories.grade.GradeRepository
+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.utils.flowWithResource
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.runBlocking
+import io.reactivex.Single
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDate.now
-import java.time.LocalDate.of
-import java.time.LocalDateTime
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate.now
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
 
 class GradeAverageProviderTest {
 
-    private suspend fun <T> Flow<Resource<T>>.getResult() = toList()[1].data!!
-
-    @MockK
+    @Mock
     lateinit var preferencesRepository: PreferencesRepository
 
-    @MockK
+    @Mock
     lateinit var semesterRepository: SemesterRepository
 
-    @MockK
+    @Mock
     lateinit var gradeRepository: GradeRepository
 
     private lateinit var gradeAverageProvider: GradeAverageProvider
 
-    private val student = Student(
-        scrapperBaseUrl = "",
-        mobileBaseUrl = "",
-        loginType = "",
-        loginMode = "SCRAPPER",
-        certificateKey = "",
-        privateKey = "",
-        isParent = false,
-        email = "",
-        password = "",
-        symbol = "",
-        studentId = 101,
-        userLoginId = 0,
-        userName = "",
-        studentName = "",
-        schoolSymbol = "",
-        schoolShortName = "",
-        schoolName = "",
-        className = "",
-        classId = 1,
-        isCurrent = true,
-        registrationDate = LocalDateTime.now()
-    )
+    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", 1, true, LocalDateTime.now())
 
     private val semesters = mutableListOf(
-        getSemesterEntity(10, 21, of(2019, 1, 31), of(2019, 6, 23)),
-        getSemesterEntity(11, 22, of(2019, 9, 1), of(2020, 1, 31)),
-        getSemesterEntity(11, 23, of(2020, 2, 1), now(), semesterName = 2)
+        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(
@@ -114,124 +82,24 @@ class GradeAverageProviderTest {
 
     @Before
     fun setUp() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
 
         gradeAverageProvider = GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
     }
 
-    @Test
-    fun `calc current semester average with load from cache sequence`() {
-        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 flow {
-            emit(Resource.loading())
-            emit(Resource.loading(secondGradeWithModifier to secondSummariesWithModifier))
-            emit(Resource.success(secondGradeWithModifier to secondSummariesWithModifier))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).toList() }
-
-        with(items[0]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(null, data)
-        }
-        with(items[1]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(1, data!!.size)
-        }
-        with(items[2]) {
-            assertEquals(Status.SUCCESS, status)
-            assertEquals(1, data!!.size)
-        }
-
-        assertEquals(3.5, items[1].data?.single { it.subject == "Język polski" }!!.average, .0) // from details and after set custom plus/minus
-    }
-
-    @Test
-    fun `calc all year semester average with delayed emit`(){
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        coEvery { gradeRepository.getGrades(student, semesters[2], false) } returns flow {
-            emit(Resource.loading())
-            delay(1000)
-            emit(Resource.success(secondGradeWithModifier to secondSummariesWithModifier))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[1], false) } returns flow {
-            emit(Resource.loading())
-            emit(Resource.success(secondGradeWithModifier to secondSummariesWithModifier))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, false).toList() }
-
-        with(items[0]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(null, data)
-        }
-        with(items[1]) {
-            assertEquals(Status.SUCCESS, status)
-            assertEquals(1, data!!.size)
-        }
-
-        assertEquals(3.5, items[1].data?.single { it.subject == "Język polski" }!!.average, .0) // from details and after set custom plus/minus
-    }
-
-    @Test
-    fun `calc both semesters average with grade without grade in second semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], false) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
-        coEvery { gradeRepository.getGrades(student, semesters[2], false) } returns flowWithResource {
-            listOf(getGrade(semesters[2].semesterId, "Język polski", .0, .0, .0)) to listOf(getSummary(semesters[2].semesterId, "Język polski", 2.5))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, false).getResult() }
-
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0)
-    }
-
-    @Test
-    fun `calc both semesters average with no grade in second semester but with average in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], false) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
-        coEvery { gradeRepository.getGrades(student, semesters[2], false) } returns flowWithResource { emptyList<Grade>() to listOf(getSummary(24, "Język polski", .0))}
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, false).getResult() }
-
-        assertEquals(3.49, items.single { it.subject == "Język polski" }.average, .0)
-    }
-
-    @Test
-    fun `force calc average on no grades`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { emptyList<Grade>() to emptyList() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { emptyList<Grade>() to emptyList() }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(0, items.size)
-    }
-
     @Test
     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 }
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ONE_SEMESTER)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
     }
@@ -240,15 +108,15 @@ class GradeAverageProviderTest {
     fun `force calc current semester average with custom modifiers in scraper mode`() {
         val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
 
-        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 }
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ONE_SEMESTER)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
     }
@@ -257,15 +125,15 @@ class GradeAverageProviderTest {
     fun `force calc current semester average with custom modifiers in api mode`() {
         val student = student.copy(loginMode = Sdk.Mode.API.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33  // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33) // useless in this mode
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
 
-        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 }
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ONE_SEMESTER)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
     }
@@ -274,26 +142,26 @@ class GradeAverageProviderTest {
     fun `force calc current semester average with custom modifiers in hybrid mode`() {
         val student = student.copy(loginMode = Sdk.Mode.HYBRID.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeMinusModifier } returns .33 // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33) // useless in this mode
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.33)
 
-        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 }
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ONE_SEMESTER)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(semesters))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGradeWithModifier to secondSummariesWithModifier))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
     }
 
     @Test
     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 }
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ONE_SEMESTER)
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
         assertEquals(2.9, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 2,9
@@ -302,11 +170,11 @@ class GradeAverageProviderTest {
 
     @Test
     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 }
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ONE_SEMESTER)
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
         assertEquals(2.5, items.single { it.subject == "Matematyka" }.average, .0) // from details: 2,5
@@ -315,282 +183,78 @@ class GradeAverageProviderTest {
 
     @Test
     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 }
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ALL_YEAR)
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId).blockingGet()
 
         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 `calc full year average when current is first with load from cache sequence`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
-            emit(Resource.loading())
-            emit(Resource.loading(firstGrades to firstSummaries))
-            emit(Resource.success(firstGrades to firstSummaries))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId, true).toList() }
-
-        with(items[0]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(null, data)
-        }
-        with(items[1]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(2, data!!.size)
-        }
-        with(items[2]) {
-            assertEquals(Status.SUCCESS, status)
-            assertEquals(2, data!!.size)
-        }
-
-        assertEquals(2, items[2].data!!.size)
-        assertEquals(3.5, items[2].data!!.single { it.subject == "Matematyka" }.average, .0) // (from summary): 3,5
-        assertEquals(3.5, items[2].data!!.single { it.subject == "Fizyka" }.average, .0) // (from summary): 3,5
-    }
-
     @Test
     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)
-            )
-        }
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.BOTH_SEMESTERS)
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to listOf(
+            getSummary(22, "Matematyka", 3.0),
+            getSummary(22, "Fizyka", 3.5)
+        )))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
+            getSummary(22, "Matematyka", 3.5),
+            getSummary(22, "Fizyka", 4.0)
+        )))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         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
     }
 
-    @Test
-    fun `calc both semesters average when current is second with load from cache sequence`() {
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
-            emit(Resource.loading())
-            emit(Resource.loading(firstGrades to listOf(
-                getSummary(22, "Matematyka", 3.0),
-                getSummary(22, "Fizyka", 3.5)
-            )))
-            emit(Resource.success(firstGrades to listOf(
-                getSummary(22, "Matematyka", 3.0),
-                getSummary(22, "Fizyka", 3.5)
-            )))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flow {
-            emit(Resource.loading())
-            emit(Resource.loading(secondGrades to listOf(
-                getSummary(22, "Matematyka", 3.5),
-                getSummary(22, "Fizyka", 4.0)
-            )))
-            emit(Resource.success(secondGrades to listOf(
-                getSummary(22, "Matematyka", 3.5),
-                getSummary(22, "Fizyka", 4.0)
-            )))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).toList() }
-
-        with(items[0]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(null, data)
-        }
-        with(items[1]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(2, data!!.size)
-        }
-        with(items[2]) {
-            assertEquals(Status.SUCCESS, status)
-            assertEquals(2, data!!.size)
-        }
-
-        assertEquals(2, items[2].data!!.size)
-        assertEquals(3.25, items[2].data!!.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 3,0 + 3,5 → 3,25
-        assertEquals(3.75, items[2].data!!.single { it.subject == "Fizyka" }.average, .0) // (from summaries ↑): 3,5 + 4,0 → 3,75
-    }
-
     @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)
-            )
-        }
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ALL_YEAR)
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
+            getSummary(22, "Matematyka", 1.1),
+            getSummary(22, "Fizyka", 7.26)
+        )))
 
-        val items = runBlocking {
-            gradeAverageProvider.getGradesDetailsWithAverage(
-                student,
-                semesters[2].semesterId,
-                true
-            ).getResult()
-        }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         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
+        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 all year average`() {
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        coEvery {
-            gradeRepository.getGrades(
-                student,
-                semesters[1],
-                true
-            )
-        } returns flowWithResource {
-            firstGrades to listOf(
-                getSummary(22, "Matematyka", .0),
-                getSummary(22, "Fizyka", .0)
-            )
-        }
-        coEvery {
-            gradeRepository.getGrades(
-                student,
-                semesters[2],
-                true
-            )
-        } returns flowWithResource {
-            secondGrades to listOf(
-                getSummary(22, "Matematyka", .0),
-                getSummary(22, "Fizyka", .0)
-            )
-        }
+    fun `calc both semesters average when no summaries`() {
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.BOTH_SEMESTERS)
 
-        val items = runBlocking {
-            gradeAverageProvider.getGradesDetailsWithAverage(
-                student,
-                semesters[2].semesterId,
-                true
-            ).getResult()
-        }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to emptyList()))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to emptyList()))
+
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0)
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0)
-    }
-
-    @Test
-    fun `force calc full year average when current is second with load from cache sequence`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
-            emit(Resource.loading())
-            emit(Resource.loading(firstGrades to firstSummaries))
-            emit(Resource.success(firstGrades to firstSummaries))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flow {
-            emit(Resource.loading())
-            emit(Resource.loading(secondGrades to listOf(
-                getSummary(22, "Matematyka", 1.1),
-                getSummary(22, "Fizyka", 7.26)
-            )))
-            emit(Resource.success(secondGrades to listOf(
-                getSummary(22, "Matematyka", 1.1),
-                getSummary(22, "Fizyka", 7.26)
-            )))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).toList() }
-
-        with(items[0]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(null, data)
-        }
-        with(items[1]) {
-            assertEquals(Status.LOADING, status)
-            assertEquals(2, data!!.size)
-        }
-        with(items[2]) {
-            assertEquals(Status.SUCCESS, status)
-            assertEquals(2, data!!.size)
-        }
-
-        assertEquals(2, items[2].data!!.size)
-        assertEquals(3.0, items[2].data!!.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items[2].data!!.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
-    }
-
-    @Test
-    fun `force 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() }
-        coEvery {
-            gradeRepository.getGrades(
-                student,
-                semesters[2],
-                true
-            )
-        } returns flowWithResource { secondGrades to emptyList() }
-
-        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.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
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ALL_YEAR)
 
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList() }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList() }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to emptyList()))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to emptyList()))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
         assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
@@ -599,21 +263,17 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc both semesters average when missing summaries in both semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(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)
-            )
-        }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to listOf(
+            getSummary(22, "Matematyka", 4.0)
+        )))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to listOf(
+            getSummary(23, "Matematyka", 3.0)
+        )))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
         assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 4,0 + 3,0 → 3,5
@@ -622,13 +282,13 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc both semesters average when missing summary in second semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(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) }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries.dropLast(1)))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
         assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
@@ -637,13 +297,13 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc both semesters average when missing summary in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(false)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(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 }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries.dropLast(1)))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
         assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
@@ -652,13 +312,13 @@ class GradeAverageProviderTest {
 
     @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
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(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 }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(firstGrades to firstSummaries.dropLast(1)))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(secondGrades to secondSummaries))
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(2, items.size)
         assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
@@ -667,60 +327,52 @@ class GradeAverageProviderTest {
 
     @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
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(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))
-        }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(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))))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(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() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         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
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(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))
-        }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(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))))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(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() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(5.5429, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → .average()
     }
@@ -729,34 +381,30 @@ class GradeAverageProviderTest {
     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
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.5)
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.BOTH_SEMESTERS)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(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))
-        }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(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))))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(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() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(5.2636, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,8 → 5.26363636
     }
@@ -765,34 +413,30 @@ class GradeAverageProviderTest {
     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
+        `when`(preferencesRepository.gradeAverageForceCalc).thenReturn(true)
+        `when`(preferencesRepository.gradeMinusModifier).thenReturn(.33)
+        `when`(preferencesRepository.gradePlusModifier).thenReturn(.5)
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
+        `when`(preferencesRepository.gradeAverageMode).thenReturn(GradeAverageMode.ALL_YEAR)
+        `when`(semesterRepository.getSemesters(student)).thenReturn(Single.just(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))
-        }
+        `when`(gradeRepository.getGrades(student, semesters[1])).thenReturn(Single.just(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))))
+        `when`(gradeRepository.getGrades(student, semesters[2])).thenReturn(Single.just(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() }
+        val items = gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId).blockingGet()
 
         assertEquals(5.5555, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272  + 4,8 → .average()
     }
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 35cda35bd..4ef5904fb 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,55 +1,56 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.mockk.MockKAnnotations
-import io.mockk.clearMocks
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
+import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 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 {
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginView: LoginView
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
     private lateinit var presenter: LoginPresenter
 
     @Before
     fun initPresenter() {
-        MockKAnnotations.init(this)
-        clearMocks(loginView)
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(loginView)
 
-        presenter = LoginPresenter(errorHandler, studentRepository)
+        presenter = LoginPresenter(TestSchedulersProvider(), 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() {
-        clearMocks(loginView)
-        every { loginView.currentViewIndex } returns 1
+        clearInvocations(loginView)
+        doReturn(1).`when`(loginView).currentViewIndex
         presenter.onBackPressed { }
-        verify { loginView.switchView(0) }
+        verify(loginView).switchView(0)
     }
 
     @Test
     fun onBackPressedDefaultTest() {
         var i = 0
-        every { loginView.currentViewIndex } returns 0
+        doReturn(0).`when`(loginView).currentViewIndex
         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 67d3e6266..9d226dac9 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,203 +1,157 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-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 io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import java.io.IOException
-import java.time.LocalDateTime.now
+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
 
 class LoginFormPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginFormView: LoginFormView
 
-    @MockK
+    @Mock
     lateinit var repository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK(relaxed = true)
-    lateinit var analytics: AnalyticsHelper
+    @Mock
+    lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: LoginFormPresenter
 
     @Before
-    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)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(repository, loginFormView)
+        presenter = LoginFormPresenter(TestSchedulersProvider(), repository, errorHandler, analytics)
         presenter.onAttachView(loginFormView)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginFormView.initView() }
+        verify(loginFormView).initView()
     }
 
     @Test
     fun emptyNicknameLoginTest() {
-        every { loginFormView.formUsernameValue } returns ""
-        every { loginFormView.formPassValue } returns "test123"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?email"
+        `when`(loginFormView.formUsernameValue).thenReturn("")
+        `when`(loginFormView.formPassValue).thenReturn("test123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify { loginFormView.setErrorUsernameRequired() }
-        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
-        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
-    }
-
-    @Test
-    fun invalidEmailLoginTest() {
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/"
-        presenter.onSignInClick()
-
-        verify { loginFormView.setErrorEmailInvalid("fakelog.cf") }
+        verify(loginFormView).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorPassRequired(false)
+        verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun emptyPassLoginTest() {
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns ""
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?email"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
-        verify { loginFormView.setErrorPassRequired(true) }
-        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
+        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView).setErrorPassRequired(true)
+        verify(loginFormView, never()).setErrorPassInvalid(false)
     }
 
     @Test
     fun invalidPassLoginTest() {
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?email"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
         presenter.onSignInClick()
 
-        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
-        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
-        verify { loginFormView.setErrorPassInvalid(true) }
+        verify(loginFormView, never()).setErrorUsernameRequired()
+        verify(loginFormView, never()).setErrorPassRequired(true)
+        verify(loginFormView).setErrorPassInvalid(true)
     }
 
     @Test
     fun loginTest() {
-        val studentTest = Student(
-            email = "test@",
-            password = "123",
-            scrapperBaseUrl = "https://fakelog.cf/?email",
-            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())
-        )
+        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)
+        doReturn(Single.just(listOf(studentTest))).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
 
-        every { loginFormView.formUsernameValue } returns "@"
-        every { loginFormView.formPassValue } returns "123456"
-        every { loginFormView.formHostValue } returns "https://fakelog.cf/?email"
-        every { loginFormView.formHostSymbol } returns "Default"
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("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() {
-        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/?email"
-        every { loginFormView.formHostSymbol } returns "Default"
+        doReturn(Single.just(emptyList<Student>()))
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.showContent(false) }
-        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 loginEmptyTwiceTest() {
-        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/?email"
-        every { loginFormView.formHostSymbol } returns "Default"
+        doReturn(Single.just(emptyList<Student>()))
+            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
         presenter.onSignInClick()
 
-        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) }
+        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)
     }
 
     @Test
     fun loginErrorTest() {
-        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/?email"
-        every { loginFormView.formHostSymbol } returns "Default"
-        every { loginFormView.showProgress(any()) } just Runs
-        every { loginFormView.showProgress(any()) } just Runs
+        val testException = RuntimeException("test")
+        doReturn(Single.error<List<Student>>(testException)).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        `when`(loginFormView.formUsernameValue).thenReturn("@")
+        `when`(loginFormView.formPassValue).thenReturn("123456")
+        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf/?standard")
+        `when`(loginFormView.formHostSymbol).thenReturn("Default")
         presenter.onSignInClick()
 
-        verify { loginFormView.hideSoftKeyboard() }
-        verify { loginFormView.showProgress(false) }
-        verify { loginFormView.showContent(false) }
-        verify { loginFormView.showContent(true) }
-        verify { errorHandler.dispatch(match { it.message == testException.message }) }
+        verify(loginFormView).hideSoftKeyboard()
+        verify(loginFormView).showProgress(true)
+        verify(loginFormView).showProgress(false)
+        verify(loginFormView).showContent(false)
+        verify(loginFormView).showContent(true)
+        verify(errorHandler).dispatch(testException)
     }
 }
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 9e34235e7..121391dee 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,137 +1,73 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-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 io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.reactivex.Completable
+import io.reactivex.Single
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import java.time.LocalDateTime.now
+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
 
 class LoginStudentSelectPresenterTest {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var loginStudentSelectView: LoginStudentSelectView
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
-    lateinit var analytics: AnalyticsHelper
+    @Mock
+    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 = "",
-            schoolShortName = "",
-            userLoginId = 1,
-            isParent = false,
-            userName = ""
-        )
-    }
+    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) }
 
     private val testException by lazy { RuntimeException("Problem") }
 
     @Before
-    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)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(studentRepository, loginStudentSelectView)
+        presenter = LoginStudentSelectPresenter(TestSchedulersProvider(), studentRepository, errorHandler, analytics)
         presenter.onAttachView(loginStudentSelectView, null)
     }
 
     @Test
     fun initViewTest() {
-        verify { loginStudentSelectView.initView() }
+        verify(loginStudentSelectView).initView()
     }
 
     @Test
     fun onSelectedStudentTest() {
-        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)
+        doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
+        presenter.onItemSelected(testStudent, 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() {
-        coEvery {
-            studentRepository.saveStudents(
-                listOf(
-                    StudentWithSemesters(
-                        testStudent,
-                        emptyList()
-                    )
-                )
-            )
-        } throws testException
-        coEvery { studentRepository.logoutStudent(testStudent) } just Runs
-        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
+        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
+        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
+        presenter.onItemSelected(testStudent, false)
         presenter.onSignIn()
-        verify { loginStudentSelectView.showContent(false) }
-        verify { loginStudentSelectView.showProgress(true) }
-        verify { errorHandler.dispatch(match { testException.message == it.message }) }
+        verify(loginStudentSelectView).showContent(false)
+        verify(loginStudentSelectView).showProgress(true)
+        verify(errorHandler).dispatch(testException)
     }
 }
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 2c44e9fad..936098970 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,67 +1,58 @@
 package io.github.wulkanowy.ui.modules.main
 
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+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.AnalyticsHelper
-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 io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 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 {
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: ErrorHandler
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var prefRepository: PreferencesRepository
 
-    @MockK(relaxed = true)
+    @Mock
     lateinit var syncManager: SyncManager
 
-    @MockK
+    @Mock
     lateinit var mainView: MainView
 
-    @MockK(relaxed = true)
-    lateinit var analytics: AnalyticsHelper
+    @Mock
+    lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: MainPresenter
 
     @Before
     fun initPresenter() {
-        MockKAnnotations.init(this)
-        clearMocks(mainView)
+        MockitoAnnotations.initMocks(this)
+        clearInvocations(mainView)
 
-        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 = MainPresenter(TestSchedulersProvider(), 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 48c2aa9c3..34d0ce5cb 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,64 +1,46 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.MainCoroutineRule
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AppInfo
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.impl.annotations.MockK
-import io.mockk.verify
+import io.reactivex.Single
 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 {
 
-    @get:Rule
-    val coroutineRule = MainCoroutineRule()
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var splashView: SplashView
 
-    @MockK
+    @Mock
     lateinit var studentRepository: StudentRepository
 
-    @MockK
-    lateinit var preferencesRepository: PreferencesRepository
-
-    @MockK
-    lateinit var appInfo: AppInfo
-
-    @MockK(relaxed = true)
+    @Mock
     lateinit var errorHandler: ErrorHandler
 
     private lateinit var presenter: SplashPresenter
 
     @Before
-    fun setUp() {
-        MockKAnnotations.init(this)
-        presenter = SplashPresenter(errorHandler, studentRepository, preferencesRepository, appInfo)
+    fun initPresenter() {
+        MockitoAnnotations.initMocks(this)
+        presenter = SplashPresenter(TestSchedulersProvider(), errorHandler, studentRepository)
     }
 
     @Test
     fun testOpenLoginView() {
-        every { appInfo.systemVersion } returns 30
-        every { preferencesRepository.isKitkatDialogDisabled } returns true
-        coEvery { studentRepository.isCurrentStudentSet() } returns false
-
-        presenter.onAttachView(splashView, null)
-        verify { splashView.openLoginView() }
+        doReturn(Single.just(false)).`when`(studentRepository).isCurrentStudentSet()
+        presenter.onAttachView(splashView)
+        verify(splashView).openLoginView()
     }
 
     @Test
     fun testMainMainView() {
-        every { appInfo.systemVersion } returns 30
-        every { preferencesRepository.isKitkatDialogDisabled } returns true
-        coEvery { studentRepository.isCurrentStudentSet() } returns true
-
-        presenter.onAttachView(splashView, null)
-        verify { splashView.openMainView() }
+        doReturn(Single.just(true)).`when`(studentRepository).isCurrentStudentSet()
+        presenter.onAttachView(splashView)
+        verify(splashView).openMainView()
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/FlowUtilsKtTest.kt b/app/src/test/java/io/github/wulkanowy/utils/FlowUtilsKtTest.kt
deleted file mode 100644
index 375a24038..000000000
--- a/app/src/test/java/io/github/wulkanowy/utils/FlowUtilsKtTest.kt
+++ /dev/null
@@ -1,192 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerifyOrder
-import io.mockk.just
-import io.mockk.mockk
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.test.TestCoroutineScope
-import org.junit.Test
-import kotlin.test.assertEquals
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class FlowUtilsKtTest {
-
-    private val testScope = TestCoroutineScope()
-
-    @Test
-    fun `fetch from two places with same remote data`() {
-        val repo = mockk<TestRepo>()
-        coEvery { repo.query() } returnsMany listOf(
-            // initial data
-            flowOf(listOf(1, 2, 3)),
-            flowOf(listOf(1, 2, 3)),
-
-            // for first
-            flowOf(listOf(1, 2, 3)), // before save
-            flowOf(listOf(2, 3, 4)), // after save
-
-            // for second
-            flowOf(listOf(2, 3, 4)), // before save
-            flowOf(listOf(2, 3, 4)), // after save
-        )
-        coEvery { repo.fetch() } returnsMany listOf(
-            listOf(2, 3, 4),
-            listOf(2, 3, 4),
-        )
-        coEvery { repo.save(any(), any()) } just Runs
-
-        // first
-        networkBoundResource(
-            showSavedOnLoading = false,
-            query = { repo.query() },
-            fetch = {
-                val data = repo.fetch()
-                delay(2_000)
-                data
-            },
-            saveFetchResult = { old, new -> repo.save(old, new) }
-        ).launchIn(testScope)
-
-        testScope.advanceTimeBy(1_000)
-
-        // second
-        networkBoundResource(
-            showSavedOnLoading = false,
-            query = { repo.query() },
-            fetch = {
-                val data = repo.fetch()
-                delay(2_000)
-                data
-            },
-            saveFetchResult = { old, new -> repo.save(old, new) }
-        ).launchIn(testScope)
-
-        testScope.advanceTimeBy(3_000)
-
-        coVerifyOrder {
-            // from first
-            repo.query()
-            repo.fetch() // hang for 2 sec
-
-            // wait 1 sec
-
-            // from second
-            repo.query()
-            repo.fetch() // hang for 2 sec
-
-            // from first
-            repo.query()
-            repo.save(withArg {
-                assertEquals(listOf(1, 2, 3), it)
-            }, any())
-            repo.query()
-
-            // from second
-            repo.query()
-            repo.save(withArg {
-                assertEquals(listOf(2, 3, 4), it)
-            }, any())
-            repo.query()
-        }
-    }
-
-    @Test
-    fun `fetch from two places with same remote data and save at the same moment`() {
-        val repo = mockk<TestRepo>()
-        coEvery { repo.query() } returnsMany listOf(
-            // initial data
-            flowOf(listOf(1, 2, 3)),
-            flowOf(listOf(1, 2, 3)),
-
-            // for first
-            flowOf(listOf(1, 2, 3)), // before save
-            flowOf(listOf(2, 3, 4)), // after save
-
-            // for second
-            flowOf(listOf(2, 3, 4)), // before save
-            flowOf(listOf(2, 3, 4)), // after save
-        )
-        coEvery { repo.fetch() } returnsMany listOf(
-            listOf(2, 3, 4),
-            listOf(2, 3, 4),
-        )
-        coEvery { repo.save(any(), any()) } just Runs
-
-        val saveResultMutex = Mutex()
-
-        // first
-        networkBoundResource(
-            mutex = saveResultMutex,
-            showSavedOnLoading = false,
-            query = { repo.query() },
-            fetch = {
-                val data = repo.fetch()
-                delay(2_000)
-                data
-            },
-            saveFetchResult = { old, new ->
-                delay(1_500)
-                repo.save(old, new)
-            }
-        ).launchIn(testScope)
-
-        testScope.advanceTimeBy(1_000)
-
-        // second
-        networkBoundResource(
-            mutex = saveResultMutex,
-            showSavedOnLoading = false,
-            query = { repo.query() },
-            fetch = {
-                val data = repo.fetch()
-                delay(2_000)
-                data
-            },
-            saveFetchResult = { old, new ->
-                repo.save(old, new)
-            }
-        ).launchIn(testScope)
-
-        testScope.advanceTimeBy(3_000)
-
-        coVerifyOrder {
-            // from first
-            repo.query()
-            repo.fetch() // hang for 2 sec
-
-            // wait 1 sec
-
-            // from second
-            repo.query()
-            repo.fetch() // hang for 2 sec
-
-            // from first
-            repo.query()
-            repo.save(withArg {
-                assertEquals(listOf(1, 2, 3), it)
-            }, any())
-
-            // from second
-            repo.query()
-            repo.save(withArg {
-                assertEquals(listOf(2, 3, 4), it)
-            }, any())
-
-            repo.query()
-            repo.query()
-        }
-    }
-
-    @Suppress("UNUSED_PARAMETER", "RedundantSuspendModifier")
-    private class TestRepo {
-        fun query() = flowOf<List<Int>>()
-        suspend fun fetch() = listOf<Int>()
-        suspend fun save(old: List<Int>, new: List<Int>) {}
-    }
-}
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 958b9169b..ece7acf20 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 java.time.LocalDate
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.threeten.bp.LocalDate
 
 class GradeExtensionTest {
 
-    @MockK
+    @Mock
     lateinit var date: LocalDate
 
     @Before
     fun before() {
-        MockKAnnotations.init(this)
+        MockitoAnnotations.initMocks(this)
     }
 
     @Test
@@ -33,13 +33,12 @@ class GradeExtensionTest {
 
     @Test
     fun calcSummaryAverage() {
-        assertEquals(3.5, listOf(
-            createGradeSummary("4"),
-            createGradeSummary("5+"),
-            createGradeSummary("5-"),
+        assertEquals(2.5, listOf(
+            createGradeSummary("5"),
+            createGradeSummary("-5"),
             createGradeSummary("test"),
             createGradeSummary("0")
-        ).calcAverage(0.5, 0.5), 0.005)
+        ).calcAverage(), 0.005)
     }
 
     @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 0ffbf78ec..72d08c411 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 java.time.LocalDate.of
-import java.time.LocalDateTime
-import java.time.Month.JANUARY
+import org.threeten.bp.LocalDate.of
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month.JANUARY
 import java.util.Locale
 
 class TimeExtensionTest {
@@ -50,28 +50,15 @@ class TimeExtensionTest {
     fun monthNameTest() {
         Locale.setDefault(Locale.forLanguageTag("PL"))
         assertEquals("Styczeń", JANUARY.getFormattedName())
-
-        Locale.setDefault(Locale.forLanguageTag("CS"))
-        assertEquals("Leden", JANUARY.getFormattedName())
-
-        Locale.setDefault(Locale.ENGLISH)
+        Locale.setDefault(Locale.forLanguageTag("US"))
         assertEquals("January", JANUARY.getFormattedName())
-
-        Locale.setDefault(Locale.forLanguageTag("DE"))
-        assertEquals("Januar", JANUARY.getFormattedName())
-
-        Locale.setDefault(Locale.forLanguageTag("RU"))
-        assertEquals("Январь", JANUARY.getFormattedName())
-
-        Locale.setDefault(Locale.forLanguageTag("UK"))
-        assertEquals("Січень", JANUARY.getFormattedName())
     }
 
     @Test
     fun weekDayNameTest() {
         Locale.setDefault(Locale.forLanguageTag("PL"))
         assertEquals("poniedziałek", of(2018, 10, 1).weekDayName)
-        Locale.setDefault(Locale.ENGLISH)
+        Locale.setDefault(Locale.forLanguageTag("US"))
         assertEquals("Monday", of(2018, 10, 1).weekDayName)
     }
 
@@ -184,42 +171,4 @@ 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
index 84b61a904..33a798502 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
@@ -1,14 +1,12 @@
 package io.github.wulkanowy.utils
 
-import io.github.wulkanowy.data.db.entities.Timetable
+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.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
+import org.threeten.bp.LocalDateTime.now
 
 class TimetableExtensionTest {
 
@@ -42,29 +40,4 @@ class TimetableExtensionTest {
         assertTrue(getTimetableEntity(end = now().minusSeconds(1)).isJustFinished)
         assertFalse(getTimetableEntity(end = now().plusSeconds(1)).isJustFinished)
     }
-
-    private 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 = ""
-    )
 }
diff --git a/appgallery_badge.png b/appgallery_badge.png
deleted file mode 100644
index ecd154ea9..000000000
Binary files a/appgallery_badge.png and /dev/null differ
diff --git a/build.gradle b/build.gradle
index 222ea1779..7e5759d12 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,21 @@
 buildscript {
-    ext {
-        kotlin_version = '1.4.32'
-        about_libraries = '8.8.4'
-        hilt_version = "2.33-beta"
-    }
+    ext.kotlin_version = '1.3.72'
+    ext.about_libraries = '8.1.6'
     repositories {
         mavenCentral()
         google()
         jcenter()
         maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://developer.huawei.com/repo/" }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.huawei.agconnect:agcp:1.5.1.200'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
-        classpath "com.github.triplet.gradle:play-publisher:2.8.0"
-        classpath "ru.cian:huawei-publish-gradle-plugin:1.2.2"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1"
+        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
+        classpath "com.github.triplet.gradle:play-publisher:2.7.5"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
-        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${about_libraries}"
     }
 }
 
@@ -42,8 +35,7 @@ allprojects {
         mavenCentral()
         google()
         jcenter()
-        maven { url "https://jitpack.io" }
-        maven { url "https://developer.huawei.com/repo/" }
+        maven { url 'https://jitpack.io' }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 998e31957..5741ecfc4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,13 +7,10 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
 android.enableJetifier=true
 android.useAndroidX=true
-kotlin.code.style=official
+org.gradle.jvmargs=-Xmx1536m
 kapt.incremental.apt=true
-kapt.use.worker.api=true
-kapt.include.compile.classpath=false
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c02..f3d88b1c2 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 8cf6eb5ad..6623300be 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-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c8..2fe81a7d9 100755
--- a/gradlew
+++ b/gradlew
@@ -82,7 +82,6 @@ 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
@@ -130,7 +129,6 @@ 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
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..9109989e3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +64,28 @@ 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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/settings.gradle b/settings.gradle
index 058beb21e..e7b4def49 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1 @@
 include ':app'
-
-buildCache {
-    local {
-        directory = new File(rootDir, '.build-cache')
-        removeUnusedEntriesAfterDays = 30
-    }
-}