1073 changed files with 14537 additions and 109267 deletions
--- a/.bettercodehub.yml
+++ b/.bettercodehub.yml
@ -1,3 +1,3 @@
-component_depth: 10
+component_depth: 8
 languages:
 - kotlin
--- a/.editorconfig
+++ b/.editorconfig
@ -1,12 +0,0 @@
-[*]
-charset=utf-8
-end_of_line=lf
-insert_final_newline=true
-indent_style=space
-indent_size=4
-
-[*.json]
-indent_size=2
-
-[*.{kt,kts}]
-disabled_rules=import-ordering,no-wildcard-imports
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,12 +1,3 @@
---
-name: Bug report
-about: Utwórz raport błędu, aby pomóc nam ulepszyć Wulkanowego
-title: ''
-labels: ''
-assignees: ''
-
---
-
 ## Co powinno się dziać


--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,20 +0,0 @@
---
-name: Feature request
-about: Zaproponuj nowy pomysł dla Wulkanowego
-title: ''
-labels: ''
-assignees: ''
-
---
-
-** Czy Twoja prośba o funkcję jest związana z problemem? Proszę opisz.**
-Jasny i zwięzły opis problemu. Np. Zawsze jestem sfrustrowany, gdy [...]
-
-** Opisz żądane rozwiązanie **
-Jasny i zwięzły opis tego, co chcesz, aby się wydarzyło.
-
-** Opisz alternatywy, które rozważałeś **
-Jasny i zwięzły opis wszelkich rozważanych alternatywnych rozwiązań lub funkcji.
-
-** Dodatkowy kontekst **
-Dodaj inny kontekst lub zrzuty ekranu dotyczące żądania funkcji tutaj.
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,12 +0,0 @@
-version: 2
-updates:
- package-ecosystem: gradle
-  directory: "/"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-  target-branch: develop
-  ignore:
-    - dependency-name: io.github.wulkanowy:sdk
-  reviewers:
-  - Faierbel
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@ -1,76 +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/upload-key.jks.gpg
-      - name: Upload apk to google play
-        env:
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}
-          ADMOB_PROJECT_ID: ${{ secrets.ADMOB_PROJECT_ID }}
-          SINGLE_SUPPORT_AD_ID: ${{ secrets.SINGLE_SUPPORT_AD_ID }}
-          SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
-        run: ./gradlew publishPlayReleaseApps -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/upload-key.jks.gpg
-      - name: Prepare credentials
-        env:
-          AGC_CREDENTIALS: ${{ secrets.AGC_CREDENTIALS }}
-        run: echo $AGC_CREDENTIALS > ./app/src/release/agconnect-credentials.json
-      - name: Build and publish HMS version
-        env:
-          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-          SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
-        run: ./gradlew bundleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace
--- a/.github/workflows/deploy-test.yml
+++ b/.github/workflows/deploy-test.yml
@ -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
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -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 testFdroidDebugUnitTest --stacktrace
-            ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v1
-          with:
-              flags: unit
--- a/.gitignore
+++ b/.gitignore
@ -19,7 +19,6 @@ out/
 # Gradle files
 .gradle/
 build/
-.build-cache

 # Local configuration file (sdk path, etc)
 local.properties
@ -64,7 +63,6 @@ captures/
 .idea/dynamic.xml
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
-.idea/discord.xml

 # Keystore files
 *.jks
@ -114,8 +112,3 @@ Thumbs.db

 !/gradle/wrapper/gradle-wrapper.jar
 .idea/jarRepositories.xml
-
-
-app/src/release/agconnect-services.json
-app/src/release/agconnect-credentials.json
-.idea/deploymentTargetDropDown.xml
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -1,9 +1,29 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="LINE_SEPARATOR" value="&#10;" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <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" />
    </JetCodeStyleSettings>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
    <codeStyleSettings language="XML">
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
@ -117,7 +137,16 @@
      </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>
    </codeStyleSettings>
  </code_scheme>
 </component>
--- 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.2

 cache:
  directories:
@ -14,7 +14,7 @@ cache:
 branches:
  only:
    - develop
-    - 0.24.0
+    - 0.13.0

 android:
 licenses:
@ -28,40 +28,40 @@ 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 jacocoTestReport --stacktrace --daemon
+  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
+  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
+  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
+  - ./gradlew jacocoTestReport --stacktrace --daemon
+  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
+      git fetch --unshallow;
+      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
+    fi
  - |
    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;
+      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
    fi

 after_success:
--- a/2
+++ b/2
@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2022 Wulkanowy
+   Copyright 2019 Wulkanowy

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.cs.md
+++ b/README.cs.md
@ -1,78 +0,0 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Polska wersja README](README.md)
-
-[Slovenská verzia README](README.sk.md)
-
-# Wulkanowy
-
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-
-Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
-
-## Funkce
-
-* přihlášení pomocí emailu a hesla
-* funkce z webové stránky deníku:
-    * známky
-    * statistiky známek
-    * frekvence
-    * procento frekvence
-    * zkoušky
-    * plán lekce
-    * dokončené lekce
-    * zprávy
-    * domácí úkoly
-    * poznámky
-    * šťastné číslo
-    * další lekce
-    * školní setkání
-    * informace o žáku a škole
-* výpočet průměru nezávisle na preferencích školy
-* upozornění, např. o nových známkách
-* podpora více účtů s možností přejmenování žáků
-* tmavý a černý (AMOLED) motiv
-* offline režim
-* žádné reklamy
-
-## Stáhnout
-
-Aktuální verzi si můžete stáhnout z Google Play, F-Droid nebo Huawei AppGallery
-
-[<img src="https://play.google.com/intl/cs-CZ/badges/images/generic/cs_badge_web_generic.png"
-    alt="Nyní na 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="Stáhnout s F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="https://i.imgur.com/baTGiDP.png"
-    alt="Objevuj v AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-Můžete si také stáhnout [vývojovou verzi](https://wulkanowy.github.io/#download), která zahrnuje nové funkce připravované pro příští vydání
-
-## Postaveno s
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager)
-
-## Spolupráce
-
-Přispějte do projektu vytvořením PR nebo odesláním issue na GitHub.
-
-Pro zájemce o překlad aplikace do různých jazyků poskytujeme Crowdin:
-https://crowdin.com/project/wulkanowy2
-
-## Licence
-
-Tento projekt je licencován pod licencí Apache License 2.0 - podrobnosti v souboru [LICENSE](LICENSE)
--- a/README.de.md
+++ b/README.de.md
@ -1,74 +0,0 @@
-[Polska wersja README](README.md)
-
-[English version of README](README.en.md)
-
-# Wulkanowy
-
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-
-Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre Eltern
-
-## Merkmale
-
-* Einloggen mit E-Mail und Passwort
-* Funktionen von der Registerwebsite:
-    * Noten
-    * Notenstatistik
-    * Anwesenheit
-    * Prozentsatz der Anwesenheit
-    * Prüfungen
-    * Stundenplan
-    * Unterricht abgeschlossen
-    * Nachrichten
-    * Hausaufgaben
-    * Anmerkungen
-    * Glückszahl
-    * Zusätzliche Lektionen
-    * Schulkonferenzen
-    * Schüler- und Schulinformationen
-* Berechnung des Durchschnitts unabhängig von den Präferenzen der Schule
-* Benachrichtigungen, z. B. über eine neue Note
-* Unterstützung für mehrere Konten mit der Möglichkeit, den Namen des Schülers zu ändern
-* dunkles und schwarzes (AMOLED) Thema
-* Offline-Modus
-* keine Werbung
-
-## Herunterladen
-
-Die aktuelle Version können Sie von der Google Play, F-Droid oder Huawei AppGallery store herunterladen
-
-[<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)
-[<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=)
-    
-Sie können auch ein [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) das beinhaltet neue Funktionen, die für die nächste Version vorbereitet werden
-
-## Gebaut mit
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
-
-## Beitragen
-
-Bitte tragen Sie zum Projekt bei, indem Sie entweder eine PR erstellen oder ein Issue auf GitHub einreichen.
-
-Für Personen, die daran interessiert sind, die Anwendung in verschiedene Sprachen zu übersetzen, bieten wir Crowdin
-https://crowdin.com/project/wulkanowy2
-
-## Lizenz
-
-Dieses Projekt ist unter der Apache License 2.0 lizenziert - siehe die [LIZENZ](LICENSE) Datei für Details
--- a/README.en.md
+++ b/README.en.md
@ -1,20 +1,13 @@
 [Polska wersja README](README.md)

-[Deutsche Version von README](README.de.md)
-
-[Česká verze README](README.cs.md)
-
-[Slovenská verzia README](README.sk.md)
-
 # Wulkanowy
-
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/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/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)

-Unofficial android VULCAN UONET+ register client for both students and their parents
+Unofficial android VULCAN UONET+ register client for student and parent

 ## Features

@ -31,38 +24,31 @@ 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
+* calculation of the average
 * 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 from the Google Play or Fdroid 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"
+    alt="Get it on Fdroid"
    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
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features prepared for the next release

 ## Built With


-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
+* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [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) 

@ -70,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
--- a/README.md
+++ b/README.md
@ -1,14 +1,7 @@
 [English version of README](README.en.md)

-[Deutsche Version von README](README.de.md)
-
-[Česká verze README](README.cs.md)
-
-[Slovenská verzia README](README.sk.md)
-
 # Wulkanowy
-
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/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/)
@ -31,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
+* obliczanie średniej
 * 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 Fdroid

 [<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"
+    alt="Pobierz z Fdroid"
    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
@ -61,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 API](https://github.com/wulkanowy/api)
+* [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) 

@ -71,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)
+Ten projekt jest licencjonowany w ramach Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
--- a/README.sk.md
+++ b/README.sk.md
@ -1,78 +0,0 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Polska wersja README](README.md)
-
-[Česká verze README](README.cs.md)
-
-# Wulkanowy
-
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-[![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/)
-[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
-
-Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
-
-## Funkcie
-
-* prihlásenie pomocou emailu a hesla
-* funkcie z webovej stránky denníka:
-    * známky
-    * štatistiky známok
-    * frekvencia
-    * percento frekvencie
-    * skúšky
-    * plán lekcie
-    * dokončené lekcie
-    * správy
-    * domáce úlohy
-    * poznámky
-    * šťastné číslo
-    * ďalšie lekcie
-    * školské stretnutie
-    * informácie o žiakovi a škole
-* výpočet priemeru nezávisle od preferencií školy
-* upozornenia, napr. o nových známkach
-* podpora viacerých účtov s možnosťou premenovania žiakov
-* tmavý a čierny (AMOLED) motív
-* offline režim
-* žiadne reklamy
-
-## Stiahnuť
-
-Aktuálnu verziu si môžete stiahnuť z Google Play, F-Droid alebo Huawei AppGallery
-
-[<img src="https://play.google.com/intl/sk/badges/images/generic/sk_badge_web_generic.png"
-    alt="Nyní na 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="Stiahnuť s F-Droid"
-    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
-[<img src="https://i.imgur.com/sX8UyAw.png"
-    alt="Objavíte v AppGallery"
-    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
-
-Môžete si tiež stiahnuť [vývojovú verziu](https://wulkanowy.github.io/#download), ktorá zahrňuje nové funkcie pripravované pre budúce vydanie
-
-## Postavené s
-
-
-* [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
-* [Hilt](https://dagger.dev/hilt/)
-* [Room](https://developer.android.com/topic/libraries/architecture/room)
-* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager)
-
-## Spolupráca
-
-Prispejte do projektu vytvorením PR alebo odoslaním issue na GitHub.
-
-Pre záujemcov o preklad aplikácie do rôznych jazykov poskytujeme Crowdin:
-https://crowdin.com/project/wulkanowy2
-
-## Licencia
-
-Tento projekt je licencovaný pod licenciou Apache License 2.0 - podrobnosti v súbore [LICENSE](LICENSE)
--- a/app/bitrise.jks.gpg
+++ b/app/bitrise.jks.gpg
--- a/app/build.gradle
+++ b/app/build.gradle
@ -1,58 +1,43 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlinx-serialization'
-apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'ru.cian.huawei-publish'
-apply plugin: 'com.mikepenz.aboutlibraries.plugin'
-apply plugin: 'com.huawei.agconnect'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'

 android {
-    compileSdkVersion 31
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'

    defaultConfig {
        applicationId "io.github.wulkanowy"
        testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 107
-        versionName "1.6.3"
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 48
+        versionName "0.13.0"
+        multiDexEnabled true
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        resValue "string", "app_name", "Wulkanowy"
-
+        vectorDrawables.useSupportLibrary = true
        manifestPlaceholders = [
-                firebase_enabled: project.hasProperty("enableFirebase"),
-                admob_project_id: ""
+                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
+                crashlytics_enabled: project.hasProperty("enableCrashlytics")
        ]
        javaCompileOptions {
            annotationProcessorOptions {
-                arguments += [
+                arguments = [
                        "room.schemaLocation": "$projectDir/schemas".toString(),
                        "room.incremental"   : "true"
                ]
            }
        }
-
-        buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
-
-        if (System.env.SET_BUILD_TIMESTAMP) {
-            buildConfigField "long", "BUILD_TIMESTAMP", String.valueOf(System.currentTimeMillis())
-        } else {
-            buildConfigField "long", "BUILD_TIMESTAMP", "1486235849000"
-        }
    }

    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 {
@ -66,206 +51,152 @@ android {

    buildTypes {
        release {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
            minifyEnabled true
            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
            signingConfig signingConfigs.release
-            buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
        }
        debug {
-            minifyEnabled false
-            shrinkResources false
-            resValue "string", "app_name", "Wulkanowy DEV"
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
            applicationIdSuffix ".dev"
            versionNameSuffix "-dev"
-            ext.enableCrashlytics = project.hasProperty("enableFirebase")
-            buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
+            testCoverageEnabled = true
+            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
        }
    }

    flavorDimensions "platform"

    productFlavors {
-        hms {
-            dimension "platform"
-            manifestPlaceholders = [install_channel: "AppGallery"]
-        }
-
        play {
            dimension "platform"
-            manifestPlaceholders = [
-                    install_channel : "Google Play",
-                    admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
-            ]
-            buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "\"${System.getenv("SINGLE_SUPPORT_AD_ID") ?: "ca-app-pub-3940256099942544/5354046379"}\""
        }

        fdroid {
+            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
            dimension "platform"
-            manifestPlaceholders = [install_channel: "F-Droid"]
        }
    }

-    playConfigs {
-        play { enabled.set(true) }
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    bundle {
-        language {
-            enableSplit = false
-        }
-    }
-
-    testOptions.unitTests {
-        includeAndroidResources = true
+    lintOptions {
+        disable 'HardwareIds'
    }

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

    kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
+        jvmTarget = "1.8"
    }

    packagingOptions {
        exclude 'META-INF/library_release.kotlin_module'
        exclude 'META-INF/library-core_release.kotlin_module'
    }
-
-    aboutLibraries {
-        configPath = "app/src/main/res/raw"
-    }
 }

-kapt {
-    correctErrorTypes true
+androidExtensions {
+    experimental = true
 }

 play {
+    serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
+    serviceAccountCredentials = file('key.p12')
    defaultToAppBundles = false
-    track = 'production'
-    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.50d
-    updatePriority = 1
-    enabled.set(false)
-}
-
-huaweiPublish {
-    instances {
-        hmsRelease {
-            credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
-            buildFormat = "aab"
-            deployType = "draft"
-        }
-    }
+    track = 'alpha'
 }

 ext {
-    work_manager = "2.7.1"
-    android_hilt = "1.0.0"
-    room = "2.4.2"
-    chucker = "3.5.2"
-    mockk = "1.12.2"
-    coroutines = "1.6.1"
+    work_manager = "2.3.0-beta01"
+    room = "2.2.2"
+    dagger = "2.25.2"
+    chucker = "2.0.4"
+    mockk = "1.9.2"
+}
+
+configurations.all {
+    resolutionStrategy.force "androidx.constraintlayout:constraintlayout:1.1.3"
 }

 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.6.0"
+    implementation "io.github.wulkanowy:api:0.13.0"

-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "androidx.core:core-ktx:1.2.0-rc01"
+    implementation "androidx.activity:activity-ktx:1.1.0-rc03"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.appcompat:appcompat-resources:1.1.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.0-rc03"
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.multidex:multidex:2.0.1"

-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
-
-    implementation "androidx.core:core-ktx:1.7.0"
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.appcompat:appcompat:1.4.1"
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
-    implementation "androidx.annotation:annotation:1.3.0"
-
-    implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
-    implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.5.0"
-    implementation "com.github.wulkanowy:material-chips-input:2.3.1"
+    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.viewpager:viewpager:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+    implementation "com.google.android.material:material:1.1.0-beta02"
+    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
    implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.github.lopspower: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.lifecycle:lifecycle-livedata-ktx:2.4.1"
+    implementation "androidx.work:work-rxjava2:$work_manager"
+    implementation "androidx.work:work-gcm:$work_manager"

    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"
-    kapt "androidx.hilt:hilt-compiler:$android_hilt"
-    implementation "androidx.hilt:hilt-work:$android_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.github.ncapdevi:FragNav:3.3.0'
-    implementation "com.github.YarikSOffice:lingver:1.3.0"
+    implementation "eu.davidea:flexible-adapter:5.1.0"
+    implementation "eu.davidea:flexible-adapter-ui:1.0.0"
+    implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
+    implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation "com.github.YarikSOffice:lingver:1.1.0"

-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.3"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.15"

-    implementation "com.jakewharton.timber:timber:5.0.1"
+    implementation "com.google.code.gson:gson:2.8.6"
+    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.jakewharton.timber:timber:4.7.1"
    implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
-    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:1.4.0"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
-    implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-    implementation 'com.fredporciuncula:flow-preferences:1.6.0'
+    implementation "com.squareup.okhttp3:logging-interceptor:3.12.6"
+    implementation "com.mikepenz:aboutlibraries:7.0.4"
+    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'

-    playImplementation platform('com.google.firebase:firebase-bom:29.3.1')
-    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:1.10.3'
-    playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:20.6.0'
+    playImplementation "com.google.firebase:firebase-core:17.2.1"
+    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"

-    hmsImplementation 'com.huawei.hms:hianalytics:6.4.1.302'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.5.300'
+    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"

-    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
+    debugImplementation "fr.o80.chucker:library:$chucker"
+    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"

-    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
-    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6'
-    debugImplementation 'com.github.haroldadmin:WhatTheStack:1.0.0-alpha04'
-
-    testImplementation "junit:junit:4.13.2"
+    testImplementation "junit:junit:4.12"
    testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
-    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "org.threeten:threetenbp:1.4.0"
+    testImplementation "org.mockito:mockito-inline:3.2.0"

-    testImplementation 'org.robolectric:robolectric:4.7.3'
-    testImplementation "androidx.test:runner:1.4.0"
-    testImplementation "androidx.test.ext:junit:1.1.3"
-    testImplementation "androidx.test:core:1.4.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.4.0"
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    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.2.0"
 }
+
+apply plugin: 'com.google.gms.google-services'
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@ -1,13 +1,12 @@
 apply plugin: "jacoco"

 jacoco {
-    toolVersion "0.8.7"
-    reportsDirectory.set(file("$buildDir/reports"))
+    toolVersion "0.8.4"
+    reportsDir = file("$buildDir/reports")
 }

 tasks.withType(Test) {
    jacoco.includeNoLocationClasses = true
-    jacoco.excludes = ['jdk.internal.*']
 }

 task jacocoTestReport(type: JacocoReport) {
@ -16,8 +15,8 @@ task jacocoTestReport(type: JacocoReport) {
    description = "Generate Jacoco coverage reports"

    reports {
-        xml.required.set(true)
-        html.required.set(true)
+        xml.enabled = true
+        html.enabled = true
    }

    def excludes = ['**/R.class',
@ -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,
--- a/app/key.p12.gpg
+++ b/app/key.p12.gpg
--- 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
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/19.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/19.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/28.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/28.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/29.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/29.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/30.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/30.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/31.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/31.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/32.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/32.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/33.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/33.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/34.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/34.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/35.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/35.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/36.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/36.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/37.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/37.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/38.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/38.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/39.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/39.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/40.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/40.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/41.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/41.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/42.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/42.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/43.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/43.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/44.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/44.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/45.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/45.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/46.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/46.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/47.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/47.json
--- a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/48.json
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/48.json
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@ -1,23 +1,17 @@
 package io.github.wulkanowy.data.db.migrations

-import android.content.Context
-import androidx.preference.PreferenceManager
 import androidx.room.Room
 import androidx.room.testing.MigrationTestHelper
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 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 {

    val dbName = "migration-test"

-    val context: Context get() = ApplicationProvider.getApplicationContext()
-
    @get:Rule
    val helper: MigrationTestHelper = MigrationTestHelper(
        InstrumentationRegistry.getInstrumentation(),
@ -26,16 +20,10 @@ abstract class AbstractMigrationTest {
    )

    fun getMigratedRoomDatabase(): AppDatabase {
-        val database = Room.databaseBuilder(
-            ApplicationProvider.getApplicationContext(),
-            AppDatabase::class.java,
-            dbName
-        ).addMigrations(
-            *AppDatabase.getMigrations(
-                SharedPrefProvider(PreferenceManager.getDefaultSharedPreferences(context)),
-                AppInfo()
-            )
-        ).build()
+        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
+            AppDatabase::class.java, dbName)
+            .addMigrations(*AppDatabase.getMigrations())
+            .build()
        // close the database and release any stream resources when the test finishes
        helper.closeWhenFinished(database)
        return database
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@ -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)

--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@ -2,26 +2,17 @@ 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.now
+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 +27,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 +61,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)

@ -113,66 +104,64 @@ class Migration13Test : AbstractMigrationTest() {
        val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())

        val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
-        assertTrue { semesters1.single { it.second }.second }
+        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
        semesters1[0].run {
-            assertFalse(second)
-            assertEquals(1, first.semesterId)
-            assertEquals(1, first.diaryId)
+            assertFalse(isCurrent)
+            assertEquals(1, semesterId)
+            assertEquals(1, diaryId)
        }
        semesters1[2].run {
-            assertFalse(second)
-            assertEquals(3, first.semesterId)
-            assertEquals(2, first.diaryId)
+            assertFalse(isCurrent)
+            assertEquals(3, semesterId)
+            assertEquals(2, diaryId)
        }
        semesters1[3].run {
-            assertTrue(second)
-            assertEquals(4, first.semesterId)
-            assertEquals(2, first.diaryId)
+            assertTrue(isCurrent)
+            assertEquals(4, semesterId)
+            assertEquals(2, 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.isCurrent }.isCurrent }
+            assertEquals(1970, it[0].schoolYear)
+            assertEquals(of(1970, 1, 1), it[0].end)
+            assertEquals(of(1970, 1, 1), it[0].start)
+            assertFalse(it[0].isCurrent)
+            assertFalse(it[1].isCurrent)
+            assertFalse(it[2].isCurrent)
+            assertTrue(it[3].isCurrent)
        }

-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
-            assertTrue { semesters.single { it.second }.second }
-            assertFalse(semesters[0].second)
-            assertFalse(semesters[1].second)
-            assertFalse(semesters[2].second)
-            assertTrue(semesters[3].second)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
+            assertTrue { it.single { it.isCurrent }.isCurrent }
+            assertFalse(it[0].isCurrent)
+            assertFalse(it[1].isCurrent)
+            assertFalse(it[2].isCurrent)
+            assertTrue(it[3].isCurrent)
        }
    }

-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
-        val semesters = mutableListOf<Pair<Semester, Boolean>>()
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
+        val semesters = mutableListOf<Semester>()

-        db.query(query).use {
-            if (it.moveToFirst()) {
-                do {
-                    semesters.add(Semester(
-                        studentId = it.getInt(1),
-                        diaryId = it.getInt(2),
-                        kindergartenDiaryId = 0,
-                        diaryName = it.getString(3),
-                        semesterId = it.getInt(4),
-                        semesterName = it.getInt(5),
-                        classId = it.getInt(7),
-                        unitId = it.getInt(8),
-                        schoolYear = it.getInt(9),
-                        start = Converters().timestampToLocalDate(it.getLong(10))!!,
-                        end = Converters().timestampToLocalDate(it.getLong(11))!!
-                    ) to (it.getInt(6) == 1))
-                } while (it.moveToNext())
-            }
+        val cursor = db.query(query)
+        if (cursor.moveToFirst()) {
+            do {
+                semesters.add(Semester(
+                    studentId = cursor.getInt(1),
+                    diaryId = cursor.getInt(2),
+                    diaryName = cursor.getString(3),
+                    semesterId = cursor.getInt(4),
+                    semesterName = cursor.getInt(5),
+                    isCurrent = cursor.getInt(6) == 1,
+                    classId = cursor.getInt(7),
+                    unitId = cursor.getInt(8),
+                    schoolYear = cursor.getInt(9),
+                    start = Converters().timestampToDate(cursor.getLong(10))!!,
+                    end = Converters().timestampToDate(cursor.getLong(11))!!
+                ))
+            } while (cursor.moveToNext())
        }
-
        return semesters.toList()
    }

--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
+++ 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"
+}
--- 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
@ -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
+import org.threeten.bp.LocalDate.now
+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, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false),
+                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
+        ))
+
+        val attendance = attendanceLocal
+            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
+                        LocalDate.of(2018, 9, 10),
+                        LocalDate.of(2018, 9, 14)
+                )
+                .blockingGet()
+        assertEquals(2, attendance.size)
+        assertEquals(attendance[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(attendance[1].date, LocalDate.of(2018, 9, 14))
+    }
+}
--- 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
@ -0,0 +1,57 @@
+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 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(LocalDate.of(2018, 9, 10), 1),
+            getCompletedLesson(LocalDate.of(2018, 9, 14), 2),
+            getCompletedLesson(LocalDate.of(2018, 9, 17), 3)
+        ))
+
+        val completed = completedLessonsLocal
+            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                LocalDate.of(2018, 9, 10),
+                LocalDate.of(2018, 9, 14)
+            )
+            .blockingGet()
+        assertEquals(2, completed.size)
+        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
+    }
+
+    private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
+        return CompletedLesson(1, 2, date, number, "", "", "", "", "", "", "")
+    }
+}
--- 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
@ -0,0 +1,52 @@
+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
+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, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""),
+                Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""),
+                Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "")
+        ))
+
+        val exams = examLocal
+            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+                        LocalDate.of(2018, 9, 10),
+                        LocalDate.of(2018, 9, 14)
+                )
+                .blockingGet()
+        assertEquals(2, exams.size)
+        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
+    }
+}
--- 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
@ -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)
+    }
+
+    @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, true, now(), now(), 1, 1)
+
+        val grades = gradeLocal
+            .getGrades(semester)
+            .blockingGet()
+
+        assertEquals(2, grades.size)
+        assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
+        assertEquals(grades[1].date, LocalDate.of(2019, 2, 28))
+    }
+}
--- 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
@ -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.api.Api
+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.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.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
+import io.github.wulkanowy.api.grades.Grade as GradeApi
+
+@SdkSuppress(minSdkVersion = P)
+@RunWith(AndroidJUnit4::class)
+class GradeRepositoryTest {
+
+    @SpyK
+    private var mockApi = Api()
+
+    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)
+        gradeRemote = GradeRemote(mockApi)
+
+        every { mockApi.diaryId } returns 1
+        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.semesterId } returns 1
+        every { semesterMock.diaryId } returns 1
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun markOlderThanRegisterDateAsRead() {
+        every { mockApi.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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().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 { mockApi.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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet().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 { mockApi.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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(2, grades.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 { mockApi.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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.size)
+    }
+
+    @Test
+    fun emptyLocal() {
+        gradeLocal.saveGrades(listOf())
+
+        every { mockApi.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")
+        ))
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(3, grades.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 { mockApi.getGrades(1) } returns Single.just(listOf())
+
+        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
+            .getGrades(studentMock, semesterMock, true).blockingGet()
+
+        assertEquals(0, grades.size)
+    }
+}
--- 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
@ -0,0 +1,34 @@
+package io.github.wulkanowy.data.repositories.grade
+
+import io.github.wulkanowy.api.toDate
+import org.threeten.bp.LocalDate
+import io.github.wulkanowy.api.grades.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,
+        weight = "",
+        weightValue = weight
+    )
+}
+
+fun createGradeApi(value: Int, weight: Double, date: LocalDate, desc: String): GradeRemote {
+    return GradeRemote().apply {
+        this.value = value
+        this.weightValue = weight
+        this.date = date.toDate()
+        this.description = desc
+    }
+}
--- 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
@ -0,0 +1,115 @@
+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
+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(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), 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(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
+            "Wszystkie"
+        ).blockingGet()
+        assertEquals(1, stats.size)
+        assertEquals(stats[0].subject, "Wszystkie")
+    }
+
+    @Test
+    fun saveAndRead_points() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
+            getGradePointsStatistics("Matematyka", 2, 1),
+            getGradePointsStatistics("Chemia", 2, 1),
+            getGradePointsStatistics("Fizyka", 1, 2)
+        ))
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
+        with(stats) {
+            assertEquals(subject, "Matematyka")
+            assertEquals(others, 5.0)
+            assertEquals(student, 5.0)
+        }
+    }
+
+    @Test
+    fun saveAndRead_subjectEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Matematyka"
+        ).blockingGet()
+        assertEquals(null, stats)
+    }
+
+    @Test
+    fun saveAndRead_allEmpty() {
+        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+
+        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
+            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            "Wszystkie"
+        ).blockingGet()
+        assertEquals(null, stats)
+    }
+
+    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)
+    }
+}
--- 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
@ -0,0 +1,47 @@
+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 org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.threeten.bp.LocalDate
+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(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            LocalDate.of(2019, 1, 20)
+        ).blockingGet()
+
+        assertEquals(1, luckyNumber.studentId)
+        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
+        assertEquals(14, luckyNumber.luckyNumber)
+    }
+}
--- 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
@ -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", "", "", "", 1, "", "", "", "", 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)
+    }
+}
--- 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
@ -0,0 +1,48 @@
+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.db.SharedPrefProvider
+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.now
+import kotlin.test.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class StudentLocalTest {
+
+    private lateinit var studentLocal: StudentLocal
+
+    private lateinit var testDb: AppDatabase
+
+    private lateinit var sharedProvider: SharedPrefProvider
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
+            .build()
+        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
+        studentLocal = StudentLocal(testDb.studentDao, context)
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun saveAndReadTest() {
+        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", endpoint = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "")))
+            .blockingGet()
+
+        val student = studentLocal.getCurrentStudent(true).blockingGet()
+        assertEquals("23", student.schoolSymbol)
+    }
+}
--- 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
@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.repositories.timetable
+
+import io.github.wulkanowy.api.toDate
+import io.github.wulkanowy.utils.toDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalDateTime.now
+import io.github.wulkanowy.api.timetable.Timetable as TimetableRemote
+import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
+
+fun createTimetableLocal(number: Int, start: LocalDateTime, 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 = "",
+        changes = changes,
+        canceled = false
+    )
+}
+
+fun createTimetableRemote(number: Int, start: LocalDateTime, room: String, subject: String = "", teacher: String = "", changes: Boolean = false): TimetableRemote {
+    return TimetableRemote(
+        number = number,
+        start = start.toDate(),
+        end = start.plusMinutes(45).toDate(),
+        date = start.toLocalDate().toDate(),
+        subject = subject,
+        group = "",
+        room = room,
+        teacher = teacher,
+        info = "",
+        changes = changes,
+        canceled = false
+    )
+}
--- 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
@ -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(1, of(2018, 9, 10, 0, 0, 0)),
+            createTimetableLocal(1, of(2018, 9, 14, 0, 0, 0)),
+            createTimetableLocal(1, of(2018, 9, 17, 0, 0, 0))
+        ))
+
+        val exams = timetableDb.getTimetable(
+            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
+            LocalDate.of(2018, 9, 10),
+            LocalDate.of(2018, 9, 14)
+        ).blockingGet()
+
+        assertEquals(2, exams.size)
+        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
+        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
+    }
+}
--- 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
@ -0,0 +1,114 @@
+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.api.Api
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
+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.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 {
+
+    @SpyK
+    private var mockApi = Api()
+
+    private val settings = InternetObservingSettings.builder()
+        .strategy(TestInternetObservingStrategy())
+        .build()
+
+    @MockK
+    private lateinit var semesterMock: Semester
+
+    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(mockApi)
+
+        every { semesterMock.studentId } returns 1
+        every { semesterMock.diaryId } returns 2
+    }
+
+    @After
+    fun closeDb() {
+        testDb.close()
+    }
+
+    @Test
+    fun copyRoomToCompletedFromPrevious() {
+        timetableLocal.saveTimetable(listOf(
+            createTimetableLocal(1, of(2019, 3, 5, 8, 0), "123", "Przyroda"),
+            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia"),
+            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F"),
+            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "Jan Kowalski")
+        ))
+
+        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda"),
+            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia"),
+            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F"),
+            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F")
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(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(1, of(2019, 3, 5, 8, 0), "123", "Przyroda", "Jan Garnkiewicz", false),
+            createTimetableLocal(2, of(2019, 3, 5, 8, 50), "321", "Religia", "Paweł Jumper", false),
+            createTimetableLocal(3, of(2019, 3, 5, 9, 40), "213", "W-F", "", true),
+            createTimetableLocal(4, of(2019, 3, 5, 10, 30), "213", "W-F", "", false)
+        ))
+
+        every { mockApi.getTimetable(any(), any()) } returns Single.just(listOf(
+            createTimetableRemote(1, of(2019, 3, 5, 8, 0), "", "Przyroda", "", true), // should override local
+            createTimetableRemote(2, of(2019, 3, 5, 8, 50), "", "Religia", "", false),
+            createTimetableRemote(3, of(2019, 3, 5, 9, 40), "", "W-F", "Jan Garnkiewicz", false),
+            createTimetableRemote(4, of(2019, 3, 5, 10, 30), "", "W-F", "Paweł Jumper", false)
+        ))
+
+        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
+            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
+            .blockingGet()
+
+        assertEquals(4, lessons.size)
+        assertEquals("", lessons[0].teacher)
+        assertEquals("Paweł Jumper", lessons[1].teacher)
+        assertEquals("Jan Garnkiewicz", lessons[2].teacher)
+        assertEquals("Paweł Jumper", lessons[3].teacher)
+    }
+}
--- a/app/src/debug/agconnect-services.json
+++ b/app/src/debug/agconnect-services.json
@ -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"
-}
--- a/app/src/debug/res/drawable/ic_stat_grade.xml
+++ b/app/src/debug/res/drawable/ic_stat_grade.xml
@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="30.434782"
-    android:viewportHeight="30.434782">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 8.131 2.131 C 7.601 2.131 7.092 2.342 6.717 2.717 C 6.342 3.092 6.131 3.601 6.131 4.131 L 6.131 18.131 C 6.131 18.661 6.342 19.17 6.717 19.545 C 7.092 19.92 7.601 20.131 8.131 20.131 L 16.918 20.131 C 17.252 19.39 17.712 18.714 18.277 18.131 L 8.131 18.131 L 8.131 4.131 L 22.131 4.131 L 22.131 16.1 C 22.516 16.034 22.906 16.001 23.297 16 C 23.576 16.002 23.854 16.02 24.131 16.055 L 24.131 4.131 C 24.131 3.601 23.92 3.092 23.545 2.717 C 23.17 2.342 22.661 2.131 22.131 2.131 L 8.131 2.131 Z M 2.131 6.131 L 2.131 22.131 C 2.131 22.661 2.342 23.17 2.717 23.545 C 3.092 23.92 3.601 24.131 4.131 24.131 L 16.391 24.131 C 16.329 23.757 16.297 23.379 16.297 23 C 16.299 22.709 16.319 22.419 16.357 22.131 L 4.131 22.131 L 4.131 6.131 L 2.131 6.131 Z M 14.131 6.131 C 13.601 6.131 13.092 6.342 12.717 6.717 C 12.342 7.092 12.131 7.601 12.131 8.131 L 12.131 14.131 C 12.131 15.231 13.031 16.131 14.131 16.131 L 16.131 16.131 C 16.661 16.131 17.17 15.92 17.545 15.545 C 17.92 15.17 18.131 14.661 18.131 14.131 L 18.131 12.131 C 18.131 11.601 17.92 11.092 17.545 10.717 C 17.17 10.342 16.661 10.131 16.131 10.131 L 14.131 10.131 L 14.131 8.131 L 18.131 8.131 L 18.131 6.131 L 14.131 6.131 Z M 14.131 12.131 L 16.131 12.131 L 16.131 14.131 L 14.131 14.131 L 14.131 12.131 Z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 20.174 28 L 20.174 18.521 L 23.091 18.521 Q 24.341 18.521 25.324 19.087 Q 26.314 19.647 26.867 20.689 Q 27.421 21.724 27.421 23.046 L 27.421 23.482 Q 27.421 24.803 26.874 25.832 Q 26.333 26.861 25.344 27.427 Q 24.354 27.993 23.111 28 Z M 22.128 20.103 L 22.128 26.431 L 23.072 26.431 Q 24.217 26.431 24.823 25.682 Q 25.428 24.934 25.441 23.54 L 25.441 23.039 Q 25.441 21.594 24.842 20.852 Q 24.243 20.103 23.091 20.103 Z" />
-</vector>
--- a/app/src/debug/res/drawable/ic_stat_luckynumber.xml
+++ b/app/src/debug/res/drawable/ic_stat_luckynumber.xml
@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="28.26087"
-    android:viewportHeight="28.26087">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 10.734 3.043 C 9.234 3.043 8.043 4.293 8.043 5.793 C 8.043 7.683 9.743 9.223 13.043 12.223 C 16.343 9.223 18.043 7.684 18.043 5.734 C 18.043 4.234 16.793 3.043 15.293 3.043 C 14.433 3.043 13.613 3.403 13.043 4.043 C 12.473 3.403 11.654 3.043 10.734 3.043 Z M 5.734 8.043 C 4.234 8.043 3.043 9.293 3.043 10.793 C 3.043 11.653 3.403 12.473 4.043 13.043 C 3.403 13.613 3.043 14.434 3.043 15.354 C 3.043 16.854 4.293 18.043 5.793 18.043 C 7.683 18.043 9.223 16.343 12.223 13.043 C 9.223 9.743 7.684 8.043 5.734 8.043 Z M 20.293 8.043 C 18.403 8.043 16.863 9.743 13.873 13.043 C 15.043 14.334 15.987 15.373 16.824 16.168 C 17.476 15.484 18.26 14.94 19.129 14.567 C 19.997 14.195 20.932 14.002 21.877 14 C 22.181 14.002 22.484 14.025 22.785 14.066 C 22.615 13.68 22.365 13.329 22.043 13.043 C 22.683 12.473 23.043 11.654 23.043 10.734 C 23.043 9.234 21.793 8.043 20.293 8.043 Z M 13.043 13.863 C 9.743 16.863 8.043 18.404 8.043 20.354 C 8.043 21.854 9.293 23.043 10.793 23.043 C 11.653 23.043 12.473 22.683 13.043 22.043 C 13.576 22.642 14.333 22.982 15.182 23.025 C 14.981 22.369 14.879 21.686 14.877 21 C 14.88 19.52 15.351 18.078 16.225 16.883 C 15.422 16.032 14.368 15.067 13.043 13.863 Z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
-</vector>
--- a/app/src/debug/res/drawable/ic_stat_message.xml
+++ b/app/src/debug/res/drawable/ic_stat_message.xml
@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="28.26087"
-    android:viewportHeight="28.26087">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 5.043 3.043 C 3.943 3.043 3.053 3.943 3.053 5.043 L 3.043 23.043 L 7.043 19.043 L 15.16 19.043 C 15.646 17.378 16.733 15.952 18.209 15.043 L 7.043 15.043 L 7.043 13.043 L 19.043 13.043 L 19.043 14.609 C 19.935 14.211 20.9 14.003 21.877 14 C 22.268 14.003 22.658 14.038 23.043 14.105 L 23.043 5.043 C 23.043 3.943 22.143 3.043 21.043 3.043 L 5.043 3.043 Z M 7.043 7.043 L 19.043 7.043 L 19.043 9.043 L 7.043 9.043 L 7.043 7.043 Z M 7.043 10.043 L 19.043 10.043 L 19.043 12.043 L 7.043 12.043 L 7.043 10.043 Z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
-</vector>
--- a/app/src/debug/res/drawable/ic_stat_note.xml
+++ b/app/src/debug/res/drawable/ic_stat_note.xml
@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="28.26087"
-    android:viewportHeight="28.26087">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 3.043 3.043 L 3.043 12.043 C 3.043 13.043 4.043 14.043 5.043 14.043 L 7.244 14.043 C 7.644 16.043 8.943 17.743 12.043 18.043 L 12.043 20.143 C 9.843 20.343 9.043 21.444 9.043 22.744 L 9.043 23.043 L 15.188 23.043 C 14.983 22.381 14.879 21.693 14.877 21 C 14.877 20.763 14.888 20.527 14.912 20.291 C 14.649 20.226 14.364 20.172 14.043 20.143 L 14.043 18.043 C 14.68 17.981 15.224 17.848 15.717 17.678 C 16.382 16.446 17.401 15.442 18.643 14.795 C 18.725 14.551 18.792 14.299 18.844 14.043 L 21.043 14.043 C 22.043 14.043 23.043 13.043 23.043 12.043 L 23.043 3.043 L 19.043 3.043 C 18.143 3.043 17.043 4.043 17.043 5.043 L 9.043 5.043 C 9.043 4.043 7.943 3.043 7.043 3.043 L 3.043 3.043 Z M 5.043 5.043 L 7.043 5.043 L 7.043 12.043 L 5.043 12.043 L 5.043 5.043 Z M 19.043 5.043 L 21.043 5.043 L 21.043 12.043 L 19.043 12.043 L 19.043 5.043 Z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
-</vector>
--- a/app/src/debug/res/drawable/ic_stat_timetable.xml
+++ b/app/src/debug/res/drawable/ic_stat_timetable.xml
@ -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>
--- a/app/src/debug/res/values/preferences_defaults.xml
+++ b/app/src/debug/res/values/preferences_defaults.xml
@ -1,4 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-
-    <bool name="pref_default_notification_debug">true</bool>
-</resources>
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Wulkanowy DEV</string>
+</resources>
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
@ -1,22 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.app.Activity
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-@Suppress("UNUSED_PARAMETER")
-class AnalyticsHelper @Inject constructor() {
-
-    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
-        // do nothing
-    }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        // do nothing
-    }
-
-    fun popCurrentScreen(name: String?) {
-        // do nothing
-    }
-}
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashLogUtils.kt
@ -1,13 +0,0 @@
-@file:Suppress("UNUSED_PARAMETER")
-
-package io.github.wulkanowy.utils
-
-import timber.log.Timber
-
-open class TimberTreeNoOp : Timber.Tree() {
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
-}
-
-class CrashLogTree : TimberTreeNoOp()
-
-class CrashLogExceptionTree : TimberTreeNoOp()
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@ -0,0 +1,17 @@
+@file:Suppress("UNUSED_PARAMETER")
+
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import timber.log.Timber
+
+fun initCrashlytics(context: Context, appInfo: AppInfo) {
+    // do nothing
+}
+
+class CrashlyticsTree : Timber.Tree() {
+
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        // do nothing
+    }
+}
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@ -0,0 +1,13 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FirebaseAnalyticsHelper @Inject constructor() {
+
+    @Suppress("UNUSED_PARAMETER")
+    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
+        // do nothing
+    }
+}
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
@ -1,18 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import javax.inject.Singleton
-import javax.inject.Inject
-
-@Suppress("UNUSED_PARAMETER", "unused")
-@Singleton
-class InAppReviewHelper @Inject constructor(
-    @ApplicationContext private val context: Context
-)  {
-
-    fun showInAppReview(activity: MainActivity) {
-        // do nothing
-    }
-}
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/UpdateHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/UpdateHelper.kt
@ -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) {}
-}
--- a/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
@ -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)
-    }
-}
--- a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
@ -1,37 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.util.Log
-import com.huawei.agconnect.crash.AGConnectCrash
-import fr.bipi.tressence.base.FormatterPriorityTree
-
-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, ExceptionFilter) {
-
-    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
-
-        // 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)))
-        }*/
-    }
-}
--- a/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
@ -1,17 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.content.Context
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class InAppReviewHelper @Inject constructor(
-    @ApplicationContext private val context: Context
-)  {
-
-    fun showInAppReview(activity: MainActivity) {
-        // do nothing
-    }
-}
--- a/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/UpdateHelper.kt
@ -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) {}
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -6,50 +6,23 @@

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
-
-    <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"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="false"
        android:theme="@style/WulkanowyTheme"
+        android:usesCleartextTraffic="true"
        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
        <activity
            android:name=".ui.modules.splash.SplashActivity"
-            android:exported="true"
            android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen"
-            tools:ignore="LockedOrientationActivity">
+            android:theme="@style/WulkanowyTheme.SplashScreen">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
@ -59,24 +32,22 @@
            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"
            android:configChanges="orientation|screenSize"
            android:label="@string/main_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
-            android:windowSoftInputMode="adjustPan" />
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
        <activity
            android:name=".ui.modules.message.send.SendMessageActivity"
            android:configChanges="orientation|screenSize"
            android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.MessageSend"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/WulkanowyTheme.NoActionBar" />
        <activity
            android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
            android:excludeFromRecents="true"
-            android:exported="true"
            android:noHistory="true"
            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
            <intent-filter>
@ -86,7 +57,6 @@
        <activity
            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity"
            android:excludeFromRecents="true"
-            android:exported="true"
            android:noHistory="true"
            android:theme="@style/WulkanowyTheme.WidgetAccountSwitcher">
            <intent-filter>
@ -97,22 +67,6 @@
        <service
            android:name=".services.widgets.TimetableWidgetService"
            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <service
-            android:name=".services.piggyback.VulcanNotificationListenerService"
-            android:exported="true"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService" />
-            </intent-filter>
-        </service>
-        <service
-            android:name=".services.messaging.AppMessagingService"
-            android:exported="false"
-            tools:ignore="MissingClass">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>

        <receiver
            android:name=".ui.modules.timetablewidget.TimetableWidgetProvider"
@ -127,7 +81,6 @@
        </receiver>
        <receiver
            android:name=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider"
-            android:exported="true"
            android:label="@string/lucky_number_title">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@ -137,60 +90,17 @@
                android:resource="@xml/provider_widget_lucky_number" />
        </receiver>

-        <receiver android:name=".services.alarm.TimetableNotificationReceiver" />
-
        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:exported="false"
            tools:node="remove" />
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-
-        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
-        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
-        <provider
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:enabled="${firebase_enabled}"
-            android:exported="false"
-            tools:ignore="MissingClass" />

        <meta-data
-            android:name="install_channel"
-            android:value="${install_channel}" />
-        <meta-data
-            android:name="firebase_analytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="google_analytics_adid_collection_enabled"
-            android:value="${firebase_enabled}" />
+            android:name="io.fabric.ApiKey"
+            android:value="${fabric_api_key}" />
        <meta-data
            android:name="firebase_crashlytics_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_messaging_auto_init_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
-            android:value="${firebase_enabled}" />
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_stat_all" />
-        <meta-data
-            android:name="com.google.firebase.messaging.default_notification_channel_id"
-            android:value="push_channel" />
-        <meta-data
-            android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="${admob_project_id}" />
-        <meta-data
-            android:name="com.google.android.gms.ads.DELAY_APP_MEASUREMENT_INIT"
-            android:value="true" />
+            android:value="${crashlytics_enabled}" />
    </application>
 </manifest>
--- a/app/src/main/assets/contributors.json
+++ b/app/src/main/assets/contributors.json
@ -1,54 +0,0 @@
-[
-  {
-    "displayName": "Mikołaj Pich",
-    "githubUsername": "mklkj"
-  },
-  {
-    "displayName": "Rafał Borcz",
-    "githubUsername": "Faierbel"
-  },
-  {
-    "displayName": "Dominik Korsa",
-    "githubUsername": "dominik-korsa"
-  },
-  {
-    "displayName": "Kacper Ziubryniewicz",
-    "githubUsername": "kapi2289"
-  },
-  {
-    "displayName": "doteq",
-    "githubUsername": "doteq"
-  },
-  {
-    "displayName": "Paweł Krzyś",
-    "githubUsername": "pavuloff"
-  },
-  {
-    "displayName": "Piotr Romanowski",
-    "githubUsername": "v0idzz"
-  },
-  {
-    "displayName": "Dinolek",
-    "githubUsername": "Dinolek"
-  },
-  {
-    "displayName": "Mateusz Idziejczak",
-    "githubUsername": "Luncenok"
-  },
-  {
-    "displayName": "Daniel Olczyk",
-    "githubUsername": "MRmlik12"
-  },
-  {
-    "displayName": "Damian Czupryn",
-    "githubUsername": "Daxxxis"
-  },
-  {
-    "displayName": "Kamil Studziński",
-    "githubUsername": "studzinskik"
-  },
-  {
-    "displayName": "Tomasz F.",
-    "githubUsername": "Pengwius"
-  }
-]
--- a/app/src/main/assets/message-print-page.html
+++ b/app/src/main/assets/message-print-page.html
@ -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>
--- a/app/src/main/assets/wulkanowy-logo-black.svg
+++ b/app/src/main/assets/wulkanowy-logo-black.svg
@ -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>
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@ -1,72 +1,92 @@
 package io.github.wulkanowy

-import android.app.Application
-import android.util.Log.*
-import androidx.hilt.work.HiltWorkerFactory
+import android.content.Context
+import android.util.Log.INFO
+import android.util.Log.VERBOSE
+import androidx.multidex.MultiDex
 import androidx.work.Configuration
+import com.jakewharton.threetenabp.AndroidThreeTen
 import com.yariksoffice.lingver.Lingver
-import dagger.hilt.android.HiltAndroidApp
-import fr.bipi.tressence.file.FileLoggerTree
-import io.github.wulkanowy.data.repositories.PreferencesRepository
+import dagger.android.AndroidInjector
+import dagger.android.support.DaggerApplication
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.utils.Log
+import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
+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.*
+import io.github.wulkanowy.utils.ActivityLifecycleLogger
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.CrashlyticsTree
+import io.github.wulkanowy.utils.DebugLogTree
+import io.github.wulkanowy.utils.initCrashlytics
+import io.reactivex.exceptions.UndeliverableException
+import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject

-@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

+    @Inject
+    lateinit var sharedPrefProvider: SharedPrefProvider
+
    @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)
+    }

    override fun onCreate() {
        super.onCreate()
-        initializeAppLanguage()
+        AndroidThreeTen.init(this)
+        RxJavaPlugins.setErrorHandler(::onError)
+        Lingver.init(this)
        themeManager.applyDefaultTheme()
+        migrateSharedPreferences()
+
        initLogging()
+        initCrashlytics(this, appInfo)
    }

    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()
-            )
+            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
        } else {
-            Timber.plant(CrashLogExceptionTree())
-            Timber.plant(CrashLogTree())
+            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 migrateSharedPreferences() {
+        if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1) < 48) { // #596
+            sharedPrefProvider.delete(getString(R.string.pref_key_grade_modifier_plus))
+            sharedPrefProvider.delete(getString(R.string.pref_key_grade_modifier_minus))
        }
    }

+    private fun onError(error: Throwable) {
+        //RxJava's too deep stack traces may cause SOE on older android devices
+        val cause = error.cause
+        if (error is UndeliverableException && cause is IOException || cause is InterruptedException || cause is StackOverflowError) {
+            Timber.e(cause, "An undeliverable error occurred")
+        } else throw error
+    }
+
+    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
+        return DaggerAppComponent.factory().create(this)
+    }
+
    override fun getWorkManagerConfiguration() = Configuration.Builder()
        .setWorkerFactory(workerFactory)
        .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
--- a/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/ApiHelper.kt
@ -0,0 +1,35 @@
+package io.github.wulkanowy.data
+
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.entities.Student
+import java.net.URL
+import javax.inject.Inject
+
+class ApiHelper @Inject constructor(private val api: Api) {
+
+    fun initApi(student: Student) {
+        api.apply {
+            email = student.email
+            password = student.password
+            symbol = student.symbol
+            schoolSymbol = student.schoolSymbol
+            studentId = student.studentId
+            classId = student.classId
+            host = URL(student.endpoint).run { host + ":$port".removeSuffix(":-1") }
+            ssl = student.endpoint.startsWith("https")
+            loginType = Api.LoginType.valueOf(student.loginType)
+            useNewStudent = true
+        }
+    }
+
+    fun initApi(email: String, password: String, symbol: String, endpoint: String) {
+        api.apply {
+            this.email = email
+            this.password = password
+            this.symbol = symbol
+            host = URL(endpoint).run { host + ":$port".removeSuffix(":-1") }
+            ssl = endpoint.startsWith("https")
+            useNewStudent = true
+        }
+    }
+}
--- a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
@ -1,245 +0,0 @@
-package io.github.wulkanowy.data
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.preference.PreferenceManager
-import com.chuckerteam.chucker.api.ChuckerCollector
-import com.chuckerteam.chucker.api.ChuckerInterceptor
-import com.chuckerteam.chucker.api.RetentionManager
-import com.fredporciuncula.flow.preferences.FlowSharedPreferences
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-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.api.AdminMessageService
-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.sdk.Sdk
-import io.github.wulkanowy.utils.AppInfo
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Retrofit
-import retrofit2.create
-import timber.log.Timber
-import java.util.concurrent.TimeUnit
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal class DataModule {
-
-    @Singleton
-    @Provides
-    fun provideSdk(chuckerInterceptor: ChuckerInterceptor) =
-        Sdk().apply {
-            androidVersion = android.os.Build.VERSION.RELEASE
-            buildTag = android.os.Build.MODEL
-            setSimpleHttpLogger { Timber.d(it) }
-
-            // for debug only
-            addInterceptor(chuckerInterceptor, network = true)
-        }
-
-    @Singleton
-    @Provides
-    fun provideChuckerCollector(
-        @ApplicationContext context: Context,
-        prefRepository: PreferencesRepository
-    ) = ChuckerCollector(
-        context = context,
-        showNotification = prefRepository.isDebugNotificationEnable,
-        retentionPeriod = RetentionManager.Period.ONE_HOUR
-    )
-
-    @Singleton
-    @Provides
-    fun provideChuckerInterceptor(
-        @ApplicationContext context: Context,
-        chuckerCollector: ChuckerCollector
-    ) = ChuckerInterceptor.Builder(context)
-        .collector(chuckerCollector)
-        .alwaysReadResponseBody(true)
-        .build()
-
-    @Singleton
-    @Provides
-    fun provideOkHttpClient(chuckerInterceptor: ChuckerInterceptor): OkHttpClient =
-        OkHttpClient.Builder()
-            .addNetworkInterceptor(chuckerInterceptor)
-            .addInterceptor(HttpLoggingInterceptor().apply {
-                level = HttpLoggingInterceptor.Level.BASIC
-            })
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
-            .build()
-
-    @OptIn(ExperimentalSerializationApi::class)
-    @Singleton
-    @Provides
-    fun provideRetrofit(
-        okHttpClient: OkHttpClient,
-        json: Json,
-        appInfo: AppInfo
-    ): Retrofit = Retrofit.Builder()
-        .baseUrl(appInfo.messagesBaseUrl)
-        .client(okHttpClient)
-        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
-        .build()
-
-    @Singleton
-    @Provides
-    fun provideAdminMessageService(retrofit: Retrofit): AdminMessageService = retrofit.create()
-
-    @Singleton
-    @Provides
-    fun provideDatabase(
-        @ApplicationContext context: Context,
-        sharedPrefProvider: SharedPrefProvider,
-        appInfo: AppInfo
-    ) = AppDatabase.newInstance(context, sharedPrefProvider, appInfo)
-
-    @Singleton
-    @Provides
-    fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
-        PreferenceManager.getDefaultSharedPreferences(context)
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Singleton
-    @Provides
-    fun provideFlowSharedPref(sharedPreferences: SharedPreferences) =
-        FlowSharedPreferences(sharedPreferences)
-
-    @Singleton
-    @Provides
-    fun provideJson() = Json {
-        ignoreUnknownKeys = true
-    }
-
-    @Singleton
-    @Provides
-    fun provideStudentDao(database: AppDatabase) = database.studentDao
-
-    @Singleton
-    @Provides
-    fun provideSemesterDao(database: AppDatabase) = database.semesterDao
-
-    @Singleton
-    @Provides
-    fun provideGradeDao(database: AppDatabase) = database.gradeDao
-
-    @Singleton
-    @Provides
-    fun provideGradeSummaryDao(database: AppDatabase) = database.gradeSummaryDao
-
-    @Singleton
-    @Provides
-    fun provideGradePartialStatisticsDao(database: AppDatabase) = database.gradePartialStatisticsDao
-
-    @Singleton
-    @Provides
-    fun provideGradeSemesterStatisticsDao(database: AppDatabase) =
-        database.gradeSemesterStatisticsDao
-
-    @Singleton
-    @Provides
-    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatisticsDao
-
-    @Singleton
-    @Provides
-    fun provideMessagesDao(database: AppDatabase) = database.messagesDao
-
-    @Singleton
-    @Provides
-    fun provideMessageAttachmentsDao(database: AppDatabase) = database.messageAttachmentDao
-
-    @Singleton
-    @Provides
-    fun provideExamDao(database: AppDatabase) = database.examsDao
-
-    @Singleton
-    @Provides
-    fun provideAttendanceDao(database: AppDatabase) = database.attendanceDao
-
-    @Singleton
-    @Provides
-    fun provideAttendanceSummaryDao(database: AppDatabase) = database.attendanceSummaryDao
-
-    @Singleton
-    @Provides
-    fun provideTimetableDao(database: AppDatabase) = database.timetableDao
-
-    @Singleton
-    @Provides
-    fun provideNoteDao(database: AppDatabase) = database.noteDao
-
-    @Singleton
-    @Provides
-    fun provideHomeworkDao(database: AppDatabase) = database.homeworkDao
-
-    @Singleton
-    @Provides
-    fun provideSubjectDao(database: AppDatabase) = database.subjectDao
-
-    @Singleton
-    @Provides
-    fun provideLuckyNumberDao(database: AppDatabase) = database.luckyNumberDao
-
-    @Singleton
-    @Provides
-    fun provideCompletedLessonsDao(database: AppDatabase) = database.completedLessonsDao
-
-    @Singleton
-    @Provides
-    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
-
-    @Singleton
-    @Provides
-    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
-
-    @Singleton
-    @Provides
-    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
-
-    @Singleton
-    @Provides
-    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
-
-    @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
-
-    @Singleton
-    @Provides
-    fun provideTimetableHeaderDao(database: AppDatabase) = database.timetableHeaderDao
-
-    @Singleton
-    @Provides
-    fun provideSchoolAnnouncementDao(database: AppDatabase) = database.schoolAnnouncementDao
-
-    @Singleton
-    @Provides
-    fun provideNotificationDao(database: AppDatabase) = database.notificationDao
-
-    @Singleton
-    @Provides
-    fun provideAdminMessageDao(database: AppDatabase) = database.adminMessagesDao
-}
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@ -0,0 +1,151 @@
+package io.github.wulkanowy.data
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.res.Resources
+import androidx.preference.PreferenceManager
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
+import com.readystatesoftware.chuck.api.ChuckCollector
+import com.readystatesoftware.chuck.api.ChuckInterceptor
+import com.readystatesoftware.chuck.api.RetentionManager
+import dagger.Module
+import dagger.Provides
+import io.github.wulkanowy.api.Api
+import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import okhttp3.logging.HttpLoggingInterceptor
+import okhttp3.logging.HttpLoggingInterceptor.Level.BASIC
+import okhttp3.logging.HttpLoggingInterceptor.Level.NONE
+import timber.log.Timber
+import javax.inject.Singleton
+
+@Module
+internal class RepositoryModule {
+
+    @Singleton
+    @Provides
+    fun provideInternetObservingSettings(): InternetObservingSettings {
+        return InternetObservingSettings.builder()
+            .strategy(WalledGardenInternetObservingStrategy())
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    fun provideApi(chuckCollector: ChuckCollector, context: Context): Api {
+        return Api().apply {
+            logLevel = NONE
+            androidVersion = android.os.Build.VERSION.RELEASE
+            buildTag = android.os.Build.MODEL
+            setInterceptor(HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { Timber.d(it) }).setLevel(BASIC))
+
+            // for debug only
+            setInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true, 0)
+        }
+    }
+
+    @Singleton
+    @Provides
+    fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
+        return ChuckCollector(context)
+            .showNotification(prefRepository.isDebugNotificationEnable)
+            .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
+    }
+
+    @Singleton
+    @Provides
+    fun provideDatabase(context: Context) = AppDatabase.newInstance(context)
+
+    @Singleton
+    @Provides
+    fun provideResources(context: Context): Resources = context.resources
+
+    @Singleton
+    @Provides
+    fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+
+    @Singleton
+    @Provides
+    fun provideStudentDao(database: AppDatabase) = database.studentDao
+
+    @Singleton
+    @Provides
+    fun provideSemesterDao(database: AppDatabase) = database.semesterDao
+
+    @Singleton
+    @Provides
+    fun provideGradeDao(database: AppDatabase) = database.gradeDao
+
+    @Singleton
+    @Provides
+    fun provideGradeSummaryDao(database: AppDatabase) = database.gradeSummaryDao
+
+    @Singleton
+    @Provides
+    fun provideGradeStatisticsDao(database: AppDatabase) = database.gradeStatistics
+
+    @Singleton
+    @Provides
+    fun provideGradePointsStatisticsDao(database: AppDatabase) = database.gradePointsStatistics
+
+    @Singleton
+    @Provides
+    fun provideMessagesDao(database: AppDatabase) = database.messagesDao
+
+    @Singleton
+    @Provides
+    fun provideExamDao(database: AppDatabase) = database.examsDao
+
+    @Singleton
+    @Provides
+    fun provideAttendanceDao(database: AppDatabase) = database.attendanceDao
+
+    @Singleton
+    @Provides
+    fun provideAttendanceSummaryDao(database: AppDatabase) = database.attendanceSummaryDao
+
+    @Singleton
+    @Provides
+    fun provideTimetableDao(database: AppDatabase) = database.timetableDao
+
+    @Singleton
+    @Provides
+    fun provideNoteDao(database: AppDatabase) = database.noteDao
+
+    @Singleton
+    @Provides
+    fun provideHomeworkDao(database: AppDatabase) = database.homeworkDao
+
+    @Singleton
+    @Provides
+    fun provideSubjectDao(database: AppDatabase) = database.subjectDao
+
+    @Singleton
+    @Provides
+    fun provideLuckyNumberDao(database: AppDatabase) = database.luckyNumberDao
+
+    @Singleton
+    @Provides
+    fun provideCompletedLessonsDao(database: AppDatabase) = database.completedLessonsDao
+
+    @Singleton
+    @Provides
+    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
+
+    @Singleton
+    @Provides
+    fun provideRecipientDao(database: AppDatabase) = database.recipientDao
+
+    @Singleton
+    @Provides
+    fun provideMobileDevicesDao(database: AppDatabase) = database.mobileDeviceDao
+
+    @Singleton
+    @Provides
+    fun provideTeacherDao(database: AppDatabase) = database.teacherDao
+
+    @Singleton
+    @Provides
+    fun provideSchoolInfoDao(database: AppDatabase) = database.schoolDao
+}
--- a/app/src/main/java/io/github/wulkanowy/data/Resource.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
@ -1,173 +0,0 @@
-package io.github.wulkanowy.data
-
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import timber.log.Timber
-
-sealed class Resource<T> {
-
-    open class Loading<T> : Resource<T>()
-
-    data class Intermediate<T>(val data: T) : Loading<T>()
-
-    data class Success<T>(val data: T) : Resource<T>()
-
-    data class Error<T>(val error: Throwable) : Resource<T>()
-}
-
-val <T> Resource<T>.dataOrNull: T?
-    get() = when (this) {
-        is Resource.Success -> this.data
-        is Resource.Intermediate -> this.data
-        is Resource.Loading -> null
-        is Resource.Error -> null
-    }
-
-val <T> Resource<T>.errorOrNull: Throwable?
-    get() = when (this) {
-        is Resource.Error -> this.error
-        else -> null
-    }
-
-fun <T> resourceFlow(block: suspend () -> T) = flow {
-    emit(Resource.Loading())
-    emit(Resource.Success(block()))
-}.catch { emit(Resource.Error(it)) }
-
-fun <T> flatResourceFlow(block: suspend () -> Flow<Resource<T>>) = flow {
-    emit(Resource.Loading())
-    emitAll(block().filter { it is Resource.Intermediate || it !is Resource.Loading })
-}.catch { emit(Resource.Error(it)) }
-
-fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
-    is Resource.Success -> Resource.Success(block(this.data))
-    is Resource.Intermediate -> Resource.Intermediate(block(this.data))
-    is Resource.Loading -> Resource.Loading()
-    is Resource.Error -> Resource.Error(this.error)
-}
-
-fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = false) = onEach {
-    val description = when (it) {
-        is Resource.Loading -> "started"
-        is Resource.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
-        is Resource.Success -> "success" + if (showData) " (data: `${it.data}`)" else ""
-        is Resource.Error -> "exception occurred: ${it.error}"
-    }
-    Timber.i("$name: $description")
-}
-
-fun <T, U> Flow<Resource<T>>.mapResourceData(block: (T) -> U) = map {
-    it.mapData(block)
-}
-
-fun <T> Flow<Resource<T>>.onResourceData(block: suspend (T) -> Unit) = onEach {
-    when (it) {
-        is Resource.Success -> block(it.data)
-        is Resource.Intermediate -> block(it.data)
-        is Resource.Error,
-        is Resource.Loading -> Unit
-    }
-}
-
-fun <T> Flow<Resource<T>>.onResourceLoading(block: suspend () -> Unit) = onEach {
-    if (it is Resource.Loading) {
-        block()
-    }
-}
-
-fun <T> Flow<Resource<T>>.onResourceIntermediate(block: suspend (T) -> Unit) = onEach {
-    if (it is Resource.Intermediate) {
-        block(it.data)
-    }
-}
-
-fun <T> Flow<Resource<T>>.onResourceSuccess(block: suspend (T) -> Unit) = onEach {
-    if (it is Resource.Success) {
-        block(it.data)
-    }
-}
-
-fun <T> Flow<Resource<T>>.onResourceError(block: (Throwable) -> Unit) = onEach {
-    if (it is Resource.Error) {
-        block(it.error)
-    }
-}
-
-fun <T> Flow<Resource<T>>.onResourceNotLoading(block: () -> Unit) = onEach {
-    if (it !is Resource.Loading) {
-        block()
-    }
-}
-
-suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it !is Resource.Loading }.first()
-
-suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it is Resource.Loading }.collect()
-
-inline fun <ResultType, RequestType> networkBoundResource(
-    mutex: Mutex = Mutex(),
-    showSavedOnLoading: Boolean = true,
-    crossinline isResultEmpty: (ResultType) -> Boolean,
-    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)) {
-        val filteredResult = filterResult(data)
-
-        if (showSavedOnLoading && !isResultEmpty(filteredResult)) {
-            emit(Resource.Intermediate(filteredResult))
-        }
-
-        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) }
-        }
-    } else {
-        query().map { Resource.Success(filterResult(it)) }
-    })
-}
-
-@JvmName("networkBoundResourceWithMap")
-inline fun <ResultType, RequestType, T> networkBoundResource(
-    mutex: Mutex = Mutex(),
-    showSavedOnLoading: Boolean = true,
-    crossinline isResultEmpty: (T) -> Boolean,
-    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)) {
-        val mappedResult = mapResult(data)
-
-        if (showSavedOnLoading && !isResultEmpty(mappedResult)) {
-            emit(Resource.Intermediate(mappedResult))
-        }
-        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) }
-        }
-    } else {
-        query().map { Resource.Success(mapResult(it)) }
-    })
-}
--- a/app/src/main/java/io/github/wulkanowy/data/api/AdminMessageService.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/api/AdminMessageService.kt
@ -1,12 +0,0 @@
-package io.github.wulkanowy.data.api
-
-import io.github.wulkanowy.data.db.entities.AdminMessage
-import retrofit2.http.GET
-import javax.inject.Singleton
-
-@Singleton
-interface AdminMessageService {
-
-    @GET("/v1.json")
-    suspend fun getAdminMessages(): List<AdminMessage>
-}
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@ -1,12 +1,71 @@
 package io.github.wulkanowy.data.db

 import android.content.Context
-import androidx.room.*
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
-import io.github.wulkanowy.data.db.dao.*
-import io.github.wulkanowy.data.db.entities.*
-import io.github.wulkanowy.data.db.migrations.*
-import io.github.wulkanowy.utils.AppInfo
+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.ExamDao
+import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradePointsStatisticsDao
+import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
+import io.github.wulkanowy.data.db.dao.GradeSummaryDao
+import io.github.wulkanowy.data.db.dao.HomeworkDao
+import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.dao.MessagesDao
+import io.github.wulkanowy.data.db.dao.MobileDeviceDao
+import io.github.wulkanowy.data.db.dao.NoteDao
+import io.github.wulkanowy.data.db.dao.RecipientDao
+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.SubjectDao
+import io.github.wulkanowy.data.db.dao.TeacherDao
+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.Exam
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+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
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Recipient
+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.Subject
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.migrations.Migration10
+import io.github.wulkanowy.data.db.migrations.Migration11
+import io.github.wulkanowy.data.db.migrations.Migration12
+import io.github.wulkanowy.data.db.migrations.Migration13
+import io.github.wulkanowy.data.db.migrations.Migration14
+import io.github.wulkanowy.data.db.migrations.Migration15
+import io.github.wulkanowy.data.db.migrations.Migration16
+import io.github.wulkanowy.data.db.migrations.Migration17
+import io.github.wulkanowy.data.db.migrations.Migration18
+import io.github.wulkanowy.data.db.migrations.Migration2
+import io.github.wulkanowy.data.db.migrations.Migration3
+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 javax.inject.Singleton

@Singleton
@ -20,11 +79,9 @@ import javax.inject.Singleton
        AttendanceSummary::class,
        Grade::class,
        GradeSummary::class,
-        GradePartialStatistics::class,
+        GradeStatistics::class,
        GradePointsStatistics::class,
-        GradeSemesterStatistics::class,
        Message::class,
-        MessageAttachment::class,
        Note::class,
        Homework::class,
        Subject::class,
@ -34,19 +91,7 @@ import javax.inject.Singleton
        Recipient::class,
        MobileDevice::class,
        Teacher::class,
-        School::class,
-        Conference::class,
-        TimetableAdditional::class,
-        StudentInfo::class,
-        TimetableHeader::class,
-        SchoolAnnouncement::class,
-        Notification::class,
-        AdminMessage::class
-    ],
-    autoMigrations = [
-        AutoMigration(from = 44, to = 45),
-        AutoMigration(from = 46, to = 47),
-        AutoMigration(from = 47, to = 48),
+        School::class
    ],
    version = AppDatabase.VERSION_SCHEMA,
    exportSchema = true
@ -55,65 +100,38 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {

    companion object {
-        const val VERSION_SCHEMA = 48
+        const val VERSION_SCHEMA = 18

-        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),
-            Migration36(),
-            Migration37(),
-            Migration38(),
-            Migration39(),
-            Migration40(),
-            Migration41(sharedPrefProvider),
-            Migration42(),
-            Migration43(),
-            Migration44(),
-            Migration46(),
-        )
+        fun getMigrations(): Array<Migration> {
+            return arrayOf(
+                Migration2(),
+                Migration3(),
+                Migration4(),
+                Migration5(),
+                Migration6(),
+                Migration7(),
+                Migration8(),
+                Migration9(),
+                Migration10(),
+                Migration11(),
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15(),
+                Migration16(),
+                Migration17(),
+                Migration18()
+            )
+        }

-        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): AppDatabase {
+            return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
+                .setJournalMode(TRUNCATE)
+                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
+                .fallbackToDestructiveMigrationOnDowngrade()
+                .addMigrations(*getMigrations())
+                .build()
+        }
    }

    abstract val studentDao: StudentDao
@ -132,16 +150,12 @@ 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

-    abstract val messageAttachmentDao: MessageAttachmentDao
-
    abstract val noteDao: NoteDao

    abstract val homeworkDao: HomeworkDao
@ -161,18 +175,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
-
-    abstract val timetableHeaderDao: TimetableHeaderDao
-
-    abstract val schoolAnnouncementDao: SchoolAnnouncementDao
-
-    abstract val notificationDao: NotificationDao
-
-    abstract val adminMessagesDao: AdminMessageDao
 }
--- 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,36 +1,37 @@
 package io.github.wulkanowy.data.db

 import androidx.room.TypeConverter
-import io.github.wulkanowy.ui.modules.Destination
-import io.github.wulkanowy.utils.toTimestamp
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import java.time.*
-import java.util.*
-import java.time.Instant
-import java.time.LocalDate
-import java.time.Month
-import java.time.ZoneOffset
-import java.util.*
+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 json = Json
+    @TypeConverter
+    fun timestampToDate(value: Long?): LocalDate? = value?.run {
+        DateTimeUtils.toInstant(Date(value)).atZone(ZoneOffset.UTC).toLocalDate()
+    }

    @TypeConverter
-    fun timestampToLocalDate(value: Long?): LocalDate? =
-        value?.let(::Date)?.toInstant()?.atZone(ZoneOffset.UTC)?.toLocalDate()
+    fun dateToTimestamp(date: LocalDate?): Long? {
+        return date?.atStartOfDay()?.toInstant(ZoneOffset.UTC)?.toEpochMilli()
+    }

    @TypeConverter
-    fun dateToTimestamp(date: LocalDate?): Long? = date?.toTimestamp()
+    fun timestampToTime(value: Long?): LocalDateTime? = value?.let {
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(value), ZoneOffset.UTC)
+    }

    @TypeConverter
-    fun instantToTimestamp(instant: Instant?): Long? = instant?.toEpochMilli()
-
-    @TypeConverter
-    fun timestampToInstant(timestamp: Long?): Instant? = timestamp?.let(Instant::ofEpochMilli)
+    fun timeToTimestamp(date: LocalDateTime?): Long? {
+        return date?.atZone(ZoneOffset.UTC)?.toInstant()?.toEpochMilli()
+    }

    @TypeConverter
    fun monthToInt(month: Month?) = month?.value
@ -39,33 +40,12 @@ class Converters {
    fun intToMonth(value: Int?) = value?.let { Month.of(it) }

    @TypeConverter
-    fun intListToJson(list: List<Int>): String {
-        return json.encodeToString(list)
+    fun intListToGson(list: List<Int>): String {
+        return Gson().toJson(list)
    }

    @TypeConverter
-    fun jsonToIntList(value: String): List<Int> {
-        return json.decodeFromString(value)
+    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 json.encodeToString(list)
-    }
-
-    @TypeConverter
-    fun jsonToStringPairList(value: String): List<Pair<String, String>> {
-        return try {
-            json.decodeFromString(value)
-        } catch (e: SerializationException) {
-            emptyList() // handle errors from old gson Pair serialized data
-        }
-    }
-
-    @TypeConverter
-    fun destinationToString(destination: Destination) = json.encodeToString(destination)
-
-    @TypeConverter
-    fun stringToDestination(destination: String): Destination = json.decodeFromString(destination)
-
 }
--- 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"
@ -20,21 +18,6 @@ class SharedPrefProvider @Inject constructor(

    fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)

-    fun getString(key: String) = sharedPref.getString(key, null)
-
-    fun getString(key: String, defaultValue: String): String =
-        sharedPref.getString(key, defaultValue) ?: defaultValue
-
-    fun getBoolean(key: String, defaultValue: Boolean): Boolean =
-        sharedPref.getBoolean(key, defaultValue)
-
-    fun putBoolean(key: String, value: Boolean, sync: Boolean = false) =
-        sharedPref.edit(sync) { putBoolean(key, value) }
-
-    fun putString(key: String, value: String?, sync: Boolean = false) {
-        sharedPref.edit(sync) { putString(key, value) }
-    }
-
    fun delete(key: String) {
        sharedPref.edit().remove(key).apply()
    }
--- a/Show more
+++ b/Show more