.circleci/config.yml

@@ -162,7 +162,7 @@ jobs:
             openssl aes-256-cbc -d -in ./app/upload-key-encrypted.jks -k $ENCRYPT_KEY >> ./app/upload-key.jks
       - run:
           name: Publish release
-          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PdisablePreDex
+          command: ./gradlew publishPlayRelease --no-daemon --stacktrace --console=plain -PenableCrashlytics -PdisablePreDex
 
 workflows:
   version: 2

.editorconfig

@@ -1,7 +1,7 @@
 [*]
 charset=utf-8
 end_of_line=lf
-insert_final_newline=Advanced
+insert_final_newline=true
 indent_style=space
 indent_size=4
 

.gitea/release.yml

@@ -1,18 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - "release ignore"
-  categories:
-    - title: breaking changes
-      labels:
-        - major
-    - title: new features
-      labels:
-        - minor
-        - fr:approved
-    - title: translation updates
-      labels:
-        - translation
-    - title: features
-      labels:
-        - "*"

.gitea/workflows/build_android.yml

@@ -1,84 +0,0 @@
-name: Generate APK
-
-env:
-    main_project_module: app
-
-on:
-    pull_request:
-        types:
-            - closed
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-
-        env:
-            RUNNER_TOOL_CACHE: /toolcache
-
-        steps:
-            -   name: Checkout the repository
-                uses: actions/checkout@v3
-
-            -   name: Set current date as env variable
-                run: echo "date_today=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
-
-            -   name: Set repository name as env variable
-                run: echo "repository_name=$(echo '${{ gitea.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
-
-            -   name: Set up JDK
-                uses: actions/setup-java@v3
-                with:
-                    distribution: 'zulu'
-                    java-version: '17'
-                    cache: 'gradle'
-
-            -   name: Set up Go environment
-                uses: actions/setup-go@v3
-                with:
-                    go-version: '1.22'
-
-            -   name: Get hash of Gradle files
-                uses: https://gitea.com/actions/go-hashfiles@v0.0.1
-                id: get-hash
-                with: 
-                    patterns: |-
-                        **/*.gradle*
-
-            -   name: Cache Gradle
-                uses: actions/cache@v3
-                with:
-                    path: |
-                        ~/.gradle/caches
-                        ~/.gradle/wrapper
-                    key: gradle-${{ runner.os }}-${{ steps.get-hash.outputs.hash }}
-
-            -   name: Get app version
-                id: get_version
-                run: echo "VERSION_NAME=$(grep -m1 "versionName" app/build.gradle | awk '{print $2}' | tr -d \'\'\"\')" >> $GITHUB_ENV
-
-            -   name: Change wrapper permissions
-                run: chmod +x ./gradlew
-
-            -   name: Setup Android SDK
-                uses: android-actions/setup-android@v3
-
-            -   name: Build debug APK
-                run: ./gradlew assembleDebug
-
-            -   name: Upload artifacts
-                uses: actions/upload-artifact@v3 # not v4 because of GHES
-                with:
-                    name: wulkanowy_mod_debug_builds
-                    path: |
-                        app/build/outputs/**/*-debug.apk
-
-            -   name: Create release
-                uses: akkuman/gitea-release-action@v1
-                env:
-                    NODE_OPTIONS: '--experimental-fetch'
-                with:
-                    files: |
-                        app/build/outputs/**/*-debug.apk                        
-
-                    name: Release ${{ env.VERSION_NAME }} (${{ env.date_today }})
-                    tag_name: v${{ env.VERSION_NAME }}

.github/workflows/deploy-store.yml

@@ -0,0 +1,79 @@
+name: Deploy release
+
+on:
+  release:
+    types: [ created ]
+
+jobs:
+
+  deploy-google-play:
+    name: Google Play
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: google-play
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+      - uses: actions/cache@v3
+        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 }}
+          DASHBOARD_TILE_AD_ID: ${{ secrets.DASHBOARD_TILE_AD_ID }}
+          SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
+        run: ./gradlew publishPlayReleaseApps -PenableFirebase --stacktrace;
+
+  deploy-app-gallery:
+    name: AppGallery
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: app-gallery
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+      - uses: actions/cache@v3
+        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

.github/workflows/deploy-test.yml

@@ -0,0 +1,146 @@
+name: Deploy DEV
+
+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@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+      - uses: actions/cache@v3
+        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@v3
+        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@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+      - uses: actions/cache@v3
+        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@v3
+        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

.github/workflows/test.yml

@@ -0,0 +1,90 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+      - 'hotfix/**'
+    tags: [ '*' ]
+  pull_request:
+
+jobs:
+
+  tests-fdroid:
+      name: F-Droid
+      runs-on: ubuntu-latest
+      timeout-minutes: 10
+      steps:
+        - uses: fkirc/skip-duplicate-actions@master
+        - uses: actions/checkout@v3
+        - uses: gradle/wrapper-validation-action@v1
+        - uses: actions/setup-java@v3
+          with:
+            distribution: 'zulu'
+            java-version: 17
+        - uses: actions/cache@v3
+          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@v3
+          with:
+              flags: unit
+
+  tests-play:
+      name: Play
+      runs-on: ubuntu-latest
+      timeout-minutes: 10
+      steps:
+        - uses: fkirc/skip-duplicate-actions@master
+        - uses: actions/checkout@v3
+        - uses: gradle/wrapper-validation-action@v1
+        - uses: actions/setup-java@v3
+          with:
+            distribution: 'zulu'
+            java-version: 17
+        - uses: actions/cache@v3
+          with:
+            path: |
+              ~/.gradle/caches
+              ~/.gradle/wrapper
+            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+        - name: Unit tests
+          run: |
+            ./gradlew testPlayDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
+        - uses: codecov/codecov-action@v3
+          with:
+              flags: unit
+
+  tests-hms:
+      name: HMS
+      runs-on: ubuntu-latest
+      timeout-minutes: 10
+      steps:
+        - uses: fkirc/skip-duplicate-actions@master
+        - uses: actions/checkout@v3
+        - uses: gradle/wrapper-validation-action@v1
+        - uses: actions/setup-java@v3
+          with:
+            distribution: 'zulu'
+            java-version: 17
+        - uses: actions/cache@v3
+          with:
+            path: |
+              ~/.gradle/caches
+              ~/.gradle/wrapper
+            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+        - name: Unit tests
+          run: |
+            ./gradlew testHmsDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
+        - uses: codecov/codecov-action@v3
+          with:
+              flags: unit

.gitignore

@@ -117,14 +117,12 @@ Thumbs.db
 *.ear
 
 ### AndroidStudio Patch ###
+
 !/gradle/wrapper/gradle-wrapper.jar
 .idea/jarRepositories.xml
 
-### Services config files
-agconnect-services.json
-agconnect-credentials.json
-google-services.json
-!app/google-services.json
 
-
+app/src/release/agconnect-services.json
-.idea/appInsightsSettings.xml
+app/src/release/agconnect-credentials.json
+.idea/deploymentTargetDropDown.xml
+.idea/kotlinc.xml

.travis.yml

@@ -61,7 +61,7 @@ script:
       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 --stacktrace;
+      ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
     fi
 
 after_success:

README.cs.md

@@ -1,33 +1,73 @@
 Česká verze / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy MOD
+# Wulkanowy
 
-## Funkce:
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-* skrýt známky
+[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-* Skrýt jednotlivé záznamy o docházce.
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-* Skrýt komentáře.
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-* falešná docházka %
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
-Chcete-li se dostat na skrytý panel:
+Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
-1. Přejděte na kartu „Další“.
-2. Přejděte na panel „Nastavení“.
-3. Přejděte na panel „O aplikaci“.
-4. Klikněte 5x na logo aplikace
-5. Přejděte na domovskou obrazovku
-6. Přejděte do nastavení
-7. Zadejte „tajná nastavení“
- 
-# Instalace
 
-|  Název souboru   |    Přizpůsobeno   |
+## Funkce
-| ---------------- | ----------------- |
-| `*-fdroid-*.apk` |      F-Droid      |
-|  `*-hms-*.apk`   | Huawei AppGallery |
-|  `*-play-*.apk`  |     Play Store    |
 
-Stáhněte si vybranou verzi z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+* přihlášení pomocí emailu a hesla
-Doporučujeme stáhnout nejnovější dostupnou verzi.
+* 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
+* volitelné reklamy na podporu projektu
 
-# O projektu Wulkanowy
+## Stáhnout
 
-Chcete si přečíst více o projektu Wulkanowy? [Klikněte sem](https://github.com/wulkanowy/wulkanowy)
+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 pomocí
+
+
+* [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)

README.de.md

@@ -1,33 +1,73 @@
 [Česká verze](README.cs.md) / Deutsche Version / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy MOD
+# Wulkanowy
 
-## Funktionen:
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-* Noten ausblenden
+[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-* Individuelle Anwesenheitslisten ausblenden.
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-* Kommentare ausblenden.
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-* Anwesenheit fälschen %
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
-So gelangen Sie zum ausgeblendeten Bereich:
+Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre Eltern
-1. Gehen Sie zur Registerkarte „Mehr“.
-2. Gehen Sie zum Bereich „Einstellungen“.
-3. Gehen Sie zum Bereich „Über die Anwendung“.
-4. Klicken Sie fünfmal auf das Anwendungslogo
-5. Gehen Sie zum Startbildschirm
-6. Gehen Sie zu den Einstellungen
-7. Geben Sie „Geheime Einstellungen“ ein
- 
-# Installation
 
-|    Dateiname     |    Angepasst an   |
+## Merkmale
-| ---------------- | ----------------- |
-| `*-fdroid-*.apk` |      F-Droid      |
-|  `*-hms-*.apk`   | Huawei AppGallery |
-|  `*-play-*.apk`  |     Play Store    |
 
-Laden Sie die ausgewählte Version von [hier](https://git.sador.me/sadorowo/wulkanowy-mod/releases) herunter.
+* Einloggen mit E-Mail und Passwort
-Wir empfehlen, die neueste verfügbare Version herunterzuladen.
+* Funktionen von der Registerwebsite:
+    * Noten
+    * Notenstatistik
+    * Anwesenheit
+    * Prozentsatz der Anwesenheit
+    * Prüfungen
+    * Stundenplan
+    * abgeschlossene Unterrichtsstunden
+    * 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
+* optionale Werbungen, die es uns ermöglichen das Projekt zu unterstützen
 
-# Über das Wulkanowy-Projekt
+## Herunterladen
 
-Möchten Sie mehr über das Wulkanowy-Projekt lesen? [Hier klicken](https://github.com/wulkanowy/wulkanowy)
+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 eine [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) die 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

README.en.md

@@ -1,33 +1,73 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / English version / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy MOD
+# Wulkanowy
 
-## Functions:
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-* hide grades
+[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-* hide individual attendance entries
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-* hide comments
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-* fake attendance %.
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
-To get to the hidden panel:
+Unofficial android VULCAN UONET+ register client for both students and their parents
-1. Go to the "More" tab
-2. Go to the "Settings" panel
-3. Go to the "About application" panel
-4. Click on the application logo 5 times
-5. Go to the home screen
-6. Go to settings
-7. Enter "secret settings"
- 
-# Installation
 
-|    File name     |    Adapted to     |
+## Features
-| ---------------- | ----------------- |
-| `*-fdroid-*.apk` |      F-Droid      |
-|  `*-hms-*.apk`   | Huawei AppGallery |
-|  `*-play-*.apk`  |     Play Store    |
 
-Download application from [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+* logging in using the email and password
-We recommend downloading the latest available version.
+* functions from the register website:
+    * grades
+    * grade statistics
+    * attendance
+    * percentage of attendance
+    * exams
+    * timetable
+    * completed lessons
+    * messages
+    * homework
+    * notes
+    * lucky number
+    * additional lessons
+    * school conferences
+    * student and school information
+* calculation of the average independently of school's preferences
+* notifications, e.g. about a new grade
+* support for multiple accounts with the ability to rename students 
+* dark and black (AMOLED) theme
+* offline mode
+* optional ads which allow to support the project
 
-# About the Wulkanowy project
+## Download
 
-Want to read more about the Wulkanowy project? [Click here](https://github.com/wulkanowy/wulkanowy)
+You can download the current version from the Google Play, F-Droid or Huawei AppGallery store
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+    alt="Get it on Google Play"
+    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on F-Droid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+[<img src="appgallery_badge.png"
+    alt="Explore it on AppGallery"
+    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
+    
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features being prepared for the next release
+
+## Built With
+
+
+* [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) 
+
+## Contributing
+
+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

README.md

@@ -1,33 +1,74 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / Polska wersja / [Slovenská verzia](README.sk.md)
 
-# Wulkanowy MOD
+# Wulkanowy
 
-## Funkcje:
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-* ukryj oceny
+[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-* ukryj poszczególne wpisy frekwencji
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-* ukryj uwagi
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-* sfałszuj % frekwencji
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
-Aby dostać się do ukrytego panelu:
+Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
-1. Przejdź do karty "Więcej"
-2. Przejdź do panelu "Ustawienia"
-3. Przejdź do panelu "O aplikacji"
-4. Kliknij 5 razy w logo aplikacji
-5. Przejdź na ekran główny
-6. Wejdź w ustawienia
-7. Wejdź w "sekretne ustawienia"
- 
-# Instalacja
 
-|   Nazwa pliku    | Przystosowana do  |
+## Funkcje
-| ---------------- | ----------------- |
-| `*-fdroid-*.apk` |      F-Droid      |
-|  `*-hms-*.apk`   | Huawei AppGallery |
-|  `*-play-*.apk`  |     Sklep Play    |
 
-Pobierz wybraną wersję z [wydań](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+* logowanie za pomocą e-maila i hasła
-Zalecamy pobranie najnowszej dostępnej wersji.
+* funkcje ze strony internetowej dziennika:
+    * oceny
+    * statystyki ocen
+    * frekwencja
+    * procent frekwencji
+    * sprawdziany
+    * plan lekcji
+    * lekcje zrealizowane
+    * wiadomości
+    * zadania domowe
+    * uwagi
+    * szczęśliwy numerek
+    * dodatkowe lekcje
+    * zebrania w szkole
+    * informacje o uczniu i szkole
+* obliczanie średniej niezależnie od preferencji szkoły
+* powiadomienia np. o nowej ocenie
+* obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
+* ciemny i czarny (AMOLED) motyw
+* tryb offline
+* opcjonalne reklamy umożliwiające wsparcie projektu
 
-# O projekcie Wulkanowy
+## Pobierz
 
-Chcesz poczytać więcej o projekcie Wulkanowy? [Kliknij tutaj](https://github.com/wulkanowy/wulkanowy)
+Aktualną wersję możesz pobrać ze sklepu Google Play, F-Droid lub Huawei AppGallery
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+    alt="Pobierz z Google Play"
+    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Pobierz z F-Droid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+[<img src="appgallery_badge.png"
+    alt="Odkrywaj w AppGallery"
+    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
+
+
+Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
+
+
+## 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/)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Współpraca
+
+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)

README.sk.md

@@ -1,33 +1,73 @@
 [Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / Slovenská verzia
 
-# Wulkanowy MOD
+# Wulkanowy
 
-## Funkcie:
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
-* skryť známky
+[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-* Skryť individuálne záznamy o dochádzke.
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
-* Skryť komentáre.
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
-* falošná dochádzka %
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
-Ak chcete prejsť na skrytý panel:
+Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
-1. Prejdite na kartu „Viac“.
-2. Prejdite na panel „Nastavenia“.
-3. Prejdite na panel „O aplikácii“.
-4. Kliknite 5-krát na logo aplikácie
-5. Prejdite na domovskú obrazovku
-6. Prejdite do nastavení
-7. Zadajte „tajné nastavenia“
- 
-# Inštalácia
 
-|   Názov súboru   |    Prispôsobené   |
+## Funkcie
-| ---------------- | ----------------- |
-| `*-fdroid-*.apk` |      F-Droid      |
-|  `*-hms-*.apk`   | Huawei AppGallery |
-|  `*-play-*.apk`  |     Play Store    |
 
-Stiahnite si vybranú verziu z [releases](https://git.sador.me/sadorowo/wulkanowy-mod/releases).
+* prihlásenie pomocou emailu a hesla
-Odporúčame stiahnuť najnovšiu dostupnú verziu.
+* 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
+* voliteľné reklamy na podporu projektu
 
-# O projekte Wulkanowy
+## Stiahnuť
 
-Chcete si prečítať viac o projekte Wulkanowy? [Kliknite sem](https://github.com/wulkanowy/wulkanowy)
+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 pomocou
+
+
+* [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)

app/build.gradle

@@ -27,12 +27,15 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 173
+        versionCode 152
-        versionName "2.6.13"
+        versionName "2.5.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
-        manifestPlaceholders = [admob_project_id: ""]
+        manifestPlaceholders = [
+            firebase_enabled: project.hasProperty("enableFirebase"),
+            admob_project_id: ""
+        ]
 
         buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
         buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
@@ -62,8 +65,8 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            // signingConfig signingConfigs.release
+            signingConfig signingConfigs.release
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
             buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
@@ -73,6 +76,7 @@ android {
             resValue "string", "app_name", "Wulkanowy DEV"
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
+            ext.enableCrashlytics = project.hasProperty("enableFirebase")
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
             buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
@@ -160,8 +164,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
-    userFraction = 0.1d
+    userFraction = 0.20d
-    updatePriority = 2
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -187,29 +191,27 @@ ext {
     room = "2.6.1"
     chucker = "4.0.0"
     mockk = "1.13.10"
-    coroutines = "1.8.1"
+    coroutines = "1.8.0"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.6.11'
+    implementation 'io.github.wulkanowy:sdk:2.5.3'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutines"
 
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.9.0"
+    implementation "androidx.activity:activity-ktx:1.8.2"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.7.0"
+    implementation "androidx.fragment:fragment-ktx:1.6.2"
     implementation "androidx.annotation:annotation:1.7.1"
-    implementation "androidx.javascriptengine:javascriptengine:1.0.0-beta01"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-rc01"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
@@ -235,7 +237,7 @@ dependencies {
     implementation 'com.github.ncapdevi:FragNav:3.3.0'
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
-    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
     implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
     implementation "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
@@ -248,9 +250,9 @@ dependencies {
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
-    implementation 'org.apache.commons:commons-text:1.12.0'
+    implementation 'org.apache.commons:commons-text:1.11.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:33.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.7.3')
     playImplementation 'com.google.firebase:firebase-analytics'
     playImplementation 'com.google.firebase:firebase-messaging'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
@@ -276,7 +278,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.12.1'
+    testImplementation 'org.robolectric:robolectric:4.11.1'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"

app/play-publish-lint.sh

@@ -1,8 +1,7 @@
 #!/bin/bash -
 
 content=$(cat < "app/src/main/play/release-notes/pl-PL/default.txt") || exit
-content2=echo "$content" | dos2unix
+if [[ "${#content}" -gt 500 ]]; then
-if [[ "${#content2}" -gt 500 ]]; then
     echo >&2 "Release notes content has reached the limit of 500 characters"
     exit 1
 fi

app/src/debug/agconnect-services.json

@@ -0,0 +1,92 @@
+{
+  "agcgw": {
+    "backurl": "connect-dre.hispace.hicloud.com",
+    "url": "connect-dre.dbankcloud.cn",
+    "websocketbackurl": "connect-ws-dre.hispace.dbankcloud.com",
+    "websocketurl": "connect-ws-dre.hispace.dbankcloud.cn"
+  },
+  "agcgw_all": {
+    "CN": "connect-drcn.dbankcloud.cn",
+    "CN_back": "connect-drcn.hispace.hicloud.com",
+    "DE": "connect-dre.dbankcloud.cn",
+    "DE_back": "connect-dre.hispace.hicloud.com",
+    "RU": "connect-drru.hispace.dbankcloud.ru",
+    "RU_back": "connect-drru.hispace.dbankcloud.cn",
+    "SG": "connect-dra.dbankcloud.cn",
+    "SG_back": "connect-dra.hispace.hicloud.com"
+  },
+  "websocketgw_all": {
+    "CN": "connect-ws-drcn.hispace.dbankcloud.cn",
+    "CN_back": "connect-ws-drcn.hispace.dbankcloud.com",
+    "DE": "connect-ws-dre.hispace.dbankcloud.cn",
+    "DE_back": "connect-ws-dre.hispace.dbankcloud.com",
+    "RU": "connect-ws-drru.hispace.dbankcloud.ru",
+    "RU_back": "connect-ws-drru.hispace.dbankcloud.cn",
+    "SG": "connect-ws-dra.hispace.dbankcloud.cn",
+    "SG_back": "connect-ws-dra.hispace.dbankcloud.com"
+  },
+  "client": {
+    "cp_id": "890048000024105546",
+    "product_id": "736430079244736562",
+    "client_id": "514530959291319360",
+    "client_secret": "C42522DBF17D3D4BBE9D9C1783A54484B7E6844B388B7A67502D36A633A4186B",
+    "project_id": "736430079244736562",
+    "app_id": "106552551",
+    "api_key": "CgB6e3x9BUNiq+r8ebCHNojjjYsMT4pJSjjNDOkm9owtBb6rVI6LjnASoZBRxbjjhObcrV5gANo99fI/eKZDTbWS",
+    "package_name": "io.github.wulkanowy.dev"
+  },
+  "oauth_client": {
+    "client_id": "106552551",
+    "client_type": 1
+  },
+  "app_info": {
+    "app_id": "106552551",
+    "package_name": "io.github.wulkanowy.dev"
+  },
+  "service": {
+    "analytics": {
+      "collector_url": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+      "collector_url_ru": "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+      "collector_url_sg": "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+      "collector_url_de": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+      "collector_url_cn": "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+      "resource_id": "p1",
+      "channel_id": ""
+    },
+		"search":{
+			"url":"https://search-dre.cloud.huawei.com"
+		},
+		"cloudstorage": {
+      "storage_url_sg_back": "https://agc-storage-dra.cloud.huawei.asia",
+      "storage_url_ru_back": "https://agc-storage-drru.cloud.huawei.ru",
+      "storage_url_ru": "https://agc-storage-drru.cloud.huawei.ru",
+      "storage_url_de_back": "https://agc-storage-dre.cloud.huawei.eu",
+      "storage_url_de": "https://ops-dre.agcstorage.link",
+      "storage_url": "https://agc-storage-drcn.platform.dbankcloud.cn",
+      "storage_url_sg": "https://ops-dra.agcstorage.link",
+      "storage_url_cn_back": "https://agc-storage-drcn.cloud.huawei.com.cn",
+      "storage_url_cn": "https://agc-storage-drcn.platform.dbankcloud.cn"
+    },
+    "ml": {
+      "mlservice_url": "ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
+    }
+  },
+  "region": "DE",
+  "configuration_version": "3.0",
+  "appInfos": [
+    {
+      "package_name": "io.github.wulkanowy.dev",
+      "client": {
+        "app_id": "106552551"
+      },
+      "app_info": {
+        "package_name": "io.github.wulkanowy.dev",
+        "app_id": "106552551"
+      },
+      "oauth_client": {
+        "client_type": 1,
+        "client_id": "106552551"
+      }
+    }
+  ]
+}

app/src/debug/google-services.json

@@ -36,37 +36,6 @@
           "status": 2
         }
       }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:1091101852179:android:b558a25f65d088b1",
-        "android_client_info": {
-          "package_name": "io.github.wulkanowy"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": ""
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 1
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
-        }
-      }
     }
   ],
   "configuration_version": "1"

app/src/main/AndroidManifest.xml

@@ -3,8 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="internalOnly">
 
-    <uses-sdk tools:overrideLibrary="androidx.javascriptengine" />
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -44,16 +42,16 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:resizeableActivity="true"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
+        android:resizeableActivity="true"
         tools:ignore="DataExtractionRules,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/WulkanowyTheme.SplashScreen"
-            tools:ignore="DiscouragedApi,LockedOrientationActivity">
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -157,9 +155,33 @@
                 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}" />
+        <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" />

app/src/main/java/io/github/wulkanowy/data/DataModule.kt

@@ -13,8 +13,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import io.github.wulkanowy.data.api.services.SchoolsService
+import io.github.wulkanowy.data.api.AdminMessageService
-import io.github.wulkanowy.data.api.services.WulkanowyService
+import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
@@ -71,7 +71,7 @@ internal class DataModule {
         okHttpClient: OkHttpClient,
         json: Json,
         appInfo: AppInfo
-    ): WulkanowyService = Retrofit.Builder()
+    ): AdminMessageService = Retrofit.Builder()
         .baseUrl(appInfo.messagesBaseUrl)
         .client(okHttpClient)
         .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))

app/src/main/java/io/github/wulkanowy/data/Resource.kt

@@ -1,17 +1,11 @@
 package io.github.wulkanowy.data
 
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
@@ -20,39 +14,16 @@ import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 
-sealed interface Resource<out T> {
+sealed class Resource<T> {
-    /**
+
-     * The initial value of a resource flow. Indicates no data that is currently available to be shown,
+    open class Loading<T> : Resource<T>()
-     * however with the expectation that the state will transition to another one soon.
-     */
-    open class Loading<T> : Resource<T>
 
-    /**
-     * A semi-loading state with some data available to be displayed (usually cached data loaded from
-     * the database). Still not the target state and it's expected to transition into another one soon.
-     */
     data class Intermediate<T>(val data: T) : Loading<T>()
 
-    /**
+    data class Success<T>(val data: T) : Resource<T>()
-     * The happy-path target state. Data can either be:
-     * - loaded from the database - while it may seem like this case is already handled by the
-     *   Intermediate state, the difference here is semantic. Cached data is returned as Intermediate
-     *   when there's a API request in progress (or soon expected to be), however when there is no
-     *   intention of immediately querying the API, the cached data is returned as a Success.
-     * - fetched from the API.
-     */
-    data class Success<T>(val data: T) : Resource<T>
 
-    /**
+    data class Error<T>(val error: Throwable) : Resource<T>()
-     * Something bad happened and we were unable to get the requested data. This can be caused by
-     * a database error, a network error, or really just any other error. Upon receiving this state
-     * the UI can either: display a full screen error, or, when it has received any data previously,
-     * display a snack bar informing of the problem.
-     */
-    data class Error<T>(val error: Throwable) : Resource<T>
 }
 
 val <T> Resource<T>.dataOrNull: T?
@@ -93,22 +64,6 @@ fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
     is Resource.Error -> Resource.Error(this.error)
 }
 
-/**
- * Injects another flow into this flow's resource data.
- */
-inline fun <T1, T2, R> Flow<Resource<T1>>.combineWithResourceData(
-    flow: Flow<T2>,
-    crossinline block: suspend (T1, T2) -> R
-): Flow<Resource<R>> =
-    combine(flow) { resource, inject ->
-        when (resource) {
-            is Resource.Success -> Resource.Success(block(resource.data, inject))
-            is Resource.Intermediate -> Resource.Intermediate(block(resource.data, inject))
-            is Resource.Loading -> Resource.Loading()
-            is Resource.Error -> Resource.Error(resource.error)
-        }
-    }
-
 fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = false) = onEach {
     val description = when (it) {
         is Resource.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
@@ -119,29 +74,8 @@ fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = fa
     Timber.i("$name: $description")
 }
 
-inline fun <T, U> Flow<Resource<T>>.mapResourceData(crossinline block: suspend (T) -> U) = map {
+fun <T, U> Flow<Resource<T>>.mapResourceData(block: (T) -> U) = map {
-    when (it) {
+    it.mapData(block)
-        is Resource.Success -> Resource.Success(block(it.data))
-        is Resource.Intermediate -> Resource.Intermediate(block(it.data))
-        is Resource.Loading -> Resource.Loading()
-        is Resource.Error -> Resource.Error(it.error)
-    }
-}
-
-@OptIn(ExperimentalCoroutinesApi::class)
-fun <T, U> Flow<Resource<T>>.flatMapResourceData(
-    inheritIntermediate: Boolean = true, block: suspend (T) -> Flow<Resource<U>>
-) = flatMapLatest {
-    when (it) {
-        is Resource.Success -> block(it.data)
-        is Resource.Intermediate -> block(it.data).map { newRes ->
-            if (inheritIntermediate && newRes is Resource.Success) Resource.Intermediate(newRes.data)
-            else newRes
-        }
-
-        is Resource.Loading -> flowOf(Resource.Loading())
-        is Resource.Error -> flowOf(Resource.Error(it.error))
-    }
 }
 
 fun <T> Flow<Resource<T>>.onResourceData(block: suspend (T) -> Unit) = onEach {
@@ -171,13 +105,13 @@ fun <T> Flow<Resource<T>>.onResourceSuccess(block: suspend (T) -> Unit) = onEach
     }
 }
 
-fun <T> Flow<Resource<T>>.onResourceError(block: suspend (Throwable) -> Unit) = onEach {
+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: suspend () -> Unit) = onEach {
+fun <T> Flow<Resource<T>>.onResourceNotLoading(block: () -> Unit) = onEach {
     if (it !is Resource.Loading) {
         block()
     }
@@ -187,99 +121,70 @@ suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it !is Resource.Loa
 
 suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it is Resource.Loading }.collect()
 
-// Can cause excessive amounts of `Resource.Intermediate` to be emitted. Unless that is desired,
+inline fun <ResultType, RequestType> networkBoundResource(
-// use `debounceIntermediates` to alleviate this behavior.
-inline fun <reified T> combineResourceFlows(flows: Iterable<Flow<Resource<T>>>): Flow<Resource<List<T>>> =
-    combine(flows) { items ->
-        var isIntermediate = false
-        val data = mutableListOf<T>()
-        for (item in items) {
-            when (item) {
-                is Resource.Success -> data.add(item.data)
-                is Resource.Intermediate -> {
-                    isIntermediate = true
-                    data.add(item.data)
-                }
-
-                is Resource.Loading -> return@combine Resource.Loading()
-                is Resource.Error -> continue
-            }
-        }
-        if (data.isEmpty()) {
-            // All items have to be errors for this to happen, so just return the first one.
-            // mapData is functionally useless and exists only to satisfy the type checker
-            items.first().mapData { listOf(it) }
-        } else if (isIntermediate) {
-            Resource.Intermediate(data)
-        } else {
-            Resource.Success(data)
-        }
-    }
-
-@OptIn(FlowPreview::class)
-fun <T> Flow<Resource<T>>.debounceIntermediates(timeout: Duration = 5.seconds) = flow {
-    var wasIntermediate = false
-
-    emitAll(this@debounceIntermediates.debounce {
-        if (it is Resource.Intermediate) {
-            if (!wasIntermediate) {
-                wasIntermediate = true
-                Duration.ZERO
-            } else {
-                timeout
-            }
-        } else {
-            wasIntermediate = false
-            Duration.ZERO
-        }
-    })
-}
-
-
-inline fun <OutputType, ApiType> networkBoundResource(
     mutex: Mutex = Mutex(),
-    crossinline isResultEmpty: (OutputType) -> Boolean,
+    showSavedOnLoading: Boolean = true,
-    crossinline query: () -> Flow<OutputType>,
+    crossinline isResultEmpty: (ResultType) -> Boolean,
-    crossinline fetch: suspend () -> ApiType,
+    crossinline query: () -> Flow<ResultType>,
-    crossinline saveFetchResult: suspend (old: OutputType, new: ApiType) -> Unit,
+    crossinline fetch: suspend (ResultType) -> RequestType,
-    crossinline shouldFetch: (OutputType) -> Boolean = { true },
+    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
-    crossinline filterResult: (OutputType) -> OutputType = { it }
+    crossinline onFetchFailed: (Throwable) -> Unit = { },
-) = networkBoundResource(
+    crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    mutex = mutex,
+    crossinline filterResult: (ResultType) -> ResultType = { it }
-    isResultEmpty = isResultEmpty,
-    query = query,
-    fetch = fetch,
-    saveFetchResult = saveFetchResult,
-    shouldFetch = shouldFetch,
-    mapResult = filterResult
-)
-
-@JvmName("networkBoundResourceWithMap")
-inline fun <DatabaseType, ApiType, OutputType> networkBoundResource(
-    mutex: Mutex = Mutex(),
-    crossinline isResultEmpty: (OutputType) -> Boolean,
-    crossinline query: () -> Flow<DatabaseType>,
-    crossinline fetch: suspend () -> ApiType,
-    crossinline saveFetchResult: suspend (old: DatabaseType, new: ApiType) -> Unit,
-    crossinline shouldFetch: (DatabaseType) -> Boolean = { true },
-    crossinline mapResult: (DatabaseType) -> OutputType,
 ) = flow {
     emit(Resource.Loading())
 
     val data = query().first()
-    if (shouldFetch(data)) {
+    emitAll(if (shouldFetch(data)) {
-        emit(Resource.Intermediate(data))
+        val filteredResult = filterResult(data)
+
+        if (showSavedOnLoading && !isResultEmpty(filteredResult)) {
+            emit(Resource.Intermediate(filteredResult))
+        }
 
         try {
-            val newData = fetch()
+            val newData = fetch(data)
             mutex.withLock { saveFetchResult(query().first(), newData) }
+            query().map { Resource.Success(filterResult(it)) }
         } catch (throwable: Throwable) {
-            emit(Resource.Error(throwable))
+            onFetchFailed(throwable)
-            return@flow
+            flowOf(Resource.Error(throwable))
         }
-    }
+    } else {
-
+        query().map { Resource.Success(filterResult(it)) }
-    emitAll(query().map { Resource.Success(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)
+            flowOf(Resource.Error(throwable))
+        }
+    } else {
+        query().map { Resource.Success(mapResult(it)) }
+    })
 }
-    .mapResourceData { mapResult(it) }
-    .filterNot { it is Resource.Intermediate && isResultEmpty(it.data) }

app/src/main/java/io/github/wulkanowy/data/WulkanowySdkFactory.kt

@@ -1,21 +1,13 @@
 package io.github.wulkanowy.data
 
-import android.content.Context
-import android.os.Build
-import androidx.javascriptengine.JavaScriptSandbox
 import com.chuckerteam.chucker.api.ChuckerInterceptor
-import com.google.common.util.concurrent.ListenableFuture
-import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentIsEduOne
-import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.scrapper.EvaluateHandler
 import io.github.wulkanowy.utils.RemoteConfigHelper
 import io.github.wulkanowy.utils.WebkitCookieManagerProxy
-import kotlinx.coroutines.guava.await
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
@@ -24,24 +16,17 @@ import javax.inject.Singleton
 
 @Singleton
 class WulkanowySdkFactory @Inject constructor(
-    @ApplicationContext private val context: Context,
     private val chuckerInterceptor: ChuckerInterceptor,
     private val remoteConfig: RemoteConfigHelper,
     private val webkitCookieManagerProxy: WebkitCookieManagerProxy,
     private val studentDb: StudentDao,
-    private val wulkanowyRepository: WulkanowyRepository,
 ) {
 
     private val eduOneMutex = Mutex()
-    private val migrationFailedStudentIds = mutableSetOf<Long>()
-    private val sandbox: ListenableFuture<JavaScriptSandbox>? =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && JavaScriptSandbox.isSupported())
-            JavaScriptSandbox.createConnectedInstanceAsync(context)
-        else null
 
     private val sdk = Sdk().apply {
-        androidVersion = Build.VERSION.RELEASE
+        androidVersion = android.os.Build.VERSION.RELEASE
-        buildTag = Build.MODEL
+        buildTag = android.os.Build.MODEL
         userAgentTemplate = remoteConfig.userAgentTemplate
         setSimpleHttpLogger { Timber.d(it) }
         setAdditionalCookieManager(webkitCookieManagerProxy)
@@ -50,46 +35,14 @@ class WulkanowySdkFactory @Inject constructor(
         addInterceptor(chuckerInterceptor, network = true)
     }
 
-    fun createBase() = sdk
+    fun create() = sdk
-
-    suspend fun create(): Sdk {
-        val mapping = wulkanowyRepository.getMapping()
-
-        return createBase().apply {
-            if (mapping != null) {
-                endpointsMapping = mapping.endpoints
-                vTokenMapping = mapping.vTokens
-                vHeaders = mapping.vHeaders
-                vParamsEvaluation = createIsolate()
-            }
-        }
-    }
-
-    private suspend fun createIsolate(): suspend () -> EvaluateHandler {
-        return {
-            val isolate = sandbox?.await()?.createIsolate()
-            object : EvaluateHandler {
-                override suspend fun evaluate(code: String): String? {
-                    return isolate?.evaluateJavaScriptAsync(code)?.await()
-                }
-
-                override fun close() {
-                    isolate?.close()
-                }
-            }
-        }
-    }
 
     suspend fun create(student: Student, semester: Semester? = null): Sdk {
         val overrideIsEduOne = checkEduOneAndMigrateIfNecessary(student)
         return buildSdk(student, semester, overrideIsEduOne)
     }
 
-    private suspend fun buildSdk(
+    private fun buildSdk(student: Student, semester: Semester?, isStudentEduOne: Boolean): Sdk {
-        student: Student,
-        semester: Semester?,
-        isStudentEduOne: Boolean
-    ): Sdk {
         return create().apply {
             email = student.email
             password = student.password
@@ -125,24 +78,14 @@ class WulkanowySdkFactory @Inject constructor(
     private suspend fun checkEduOneAndMigrateIfNecessary(student: Student): Boolean {
         if (student.isEduOne != null) return student.isEduOne
 
-        if (student.id in migrationFailedStudentIds) {
-            Timber.i("Migration eduOne: skipping because of previous failure")
-            return false
-        }
-
         eduOneMutex.withLock {
-            if (student.id in migrationFailedStudentIds) {
-                Timber.i("Migration eduOne: skipping because of previous failure")
-                return false
-            }
-
             val studentFromDatabase = studentDb.loadById(student.id)
             if (studentFromDatabase?.isEduOne != null) {
-                Timber.i("Migration eduOne: already done")
+                Timber.d("Migration eduOne: already done")
                 return studentFromDatabase.isEduOne
             }
 
-            Timber.i("Migration eduOne: flag missing. Running migration...")
+            Timber.d("Migration eduOne: flag missing. Running migration...")
             val initializedSdk = buildSdk(
                 student = student,
                 semester = null,
@@ -153,12 +96,11 @@ class WulkanowySdkFactory @Inject constructor(
                 .getOrNull()
 
             if (newCurrentStudent == null) {
-                Timber.i("Migration eduOne: failed, so skipping")
+                Timber.d("Migration eduOne: failed, so skipping")
-                migrationFailedStudentIds.add(student.id)
                 return false
             }
 
-            Timber.i("Migration eduOne: success. New isEduOne flag: ${newCurrentStudent.isEduOne}")
+            Timber.d("Migration eduOne: success. New isEduOne flag: ${newCurrentStudent.isEduOne}")
 
             val studentIsEduOne = StudentIsEduOne(
                 id = student.id,

app/src/main/java/io/github/wulkanowy/data/api/AdminMessageService.kt

@@ -1,16 +1,12 @@
-package io.github.wulkanowy.data.api.services
+package io.github.wulkanowy.data.api
 
-import io.github.wulkanowy.data.api.models.Mapping
 import io.github.wulkanowy.data.db.entities.AdminMessage
 import retrofit2.http.GET
 import javax.inject.Singleton
 
 @Singleton
-interface WulkanowyService {
+interface AdminMessageService {
 
     @GET("/v1.json")
     suspend fun getAdminMessages(): List<AdminMessage>
-
+}
-    @GET("/mapping2.json")
-    suspend fun getMapping(): Mapping
-}

app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt

@@ -1,4 +1,4 @@
-package io.github.wulkanowy.data.api.services
+package io.github.wulkanowy.data.api
 
 import io.github.wulkanowy.data.pojos.IntegrityRequest
 import io.github.wulkanowy.data.pojos.LoginEvent

app/src/main/java/io/github/wulkanowy/data/api/models/Mapping.kt

@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.api.models
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Mapping(
-
-    @SerialName("endpoints")
-    val endpoints: Map<String, Map<String, Map<String, String>>>,
-
-    @SerialName("vTokens")
-    val vTokens: Map<String, Map<String, Map<String, String>>>,
-
-    @SerialName("vTokenScheme")
-    val vTokenScheme: Map<String, Map<String, String>> = emptyMap(),
-
-    @SerialName("vHeaders")
-    val vHeaders: Map<String, Map<String, Map<String, String>>> = emptyMap(),
-)

app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt

@@ -177,7 +177,6 @@ import javax.inject.Singleton
         AutoMigration(from = 60, to = 61),
         AutoMigration(from = 61, to = 62),
         AutoMigration(from = 62, to = 63, spec = Migration63::class),
-        AutoMigration(from = 63, to = 64),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -186,7 +185,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 64
+        const val VERSION_SCHEMA = 63
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),

app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt

@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import kotlinx.coroutines.flow.Flow
 import java.time.LocalDate
 import javax.inject.Singleton

app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt

@@ -12,8 +12,4 @@ interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
     fun loadAll(semesterId: Int, studentId: Int): Flow<List<Grade>>
-
-    @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId " +
-        "AND entry NOT IN(:censoredEntries)")
-    fun loadAllCensored(semesterId: Int, studentId: Int, censoredEntries: Array<String>): Flow<List<Grade>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt

@@ -8,6 +8,6 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
-    @Query("SELECT * FROM MobileDevices WHERE user_login_id = :studentId ORDER BY date DESC")
+    @Query("SELECT * FROM MobileDevices WHERE user_login_id = :userLoginId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Flow<List<MobileDevice>>
+    fun loadAll(userLoginId: Int): Flow<List<MobileDevice>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt

@@ -9,6 +9,7 @@ import javax.inject.Singleton
 @Singleton
 @Dao
 interface NoteDao : BaseDao<Note> {
+
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
     fun loadAll(studentId: Int): Flow<List<Note>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt

@@ -10,6 +10,6 @@ import javax.inject.Singleton
 @Singleton
 interface SchoolAnnouncementDao : BaseDao<SchoolAnnouncement> {
 
-    @Query("SELECT * FROM SchoolAnnouncements WHERE user_login_id = :studentId ORDER BY date DESC")
+    @Query("SELECT * FROM SchoolAnnouncements WHERE user_login_id = :userLoginId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
+    fun loadAll(userLoginId: Int): Flow<List<SchoolAnnouncement>>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt

@@ -14,6 +14,6 @@ interface SemesterDao : BaseDao<Semester> {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertSemesters(items: List<Semester>): List<Long>
 
-    @Query("SELECT * FROM Semesters WHERE (student_id = :studentId AND class_id = :classId) OR (student_id = :studentId AND class_id = 0)")
+    @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
     suspend fun loadAll(studentId: Int, classId: Int): List<Semester>
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt

@@ -47,11 +47,11 @@ abstract class StudentDao {
     abstract suspend fun loadAll(): List<Student>
 
     @Transaction
-    @Query("SELECT * FROM Students JOIN Semesters ON (Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id) OR (Students.student_id = Semesters.student_id AND Semesters.class_id = 0)")
+    @Query("SELECT * FROM Students JOIN Semesters ON Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id")
     abstract suspend fun loadStudentsWithSemesters(): Map<Student, List<Semester>>
 
     @Transaction
-    @Query("SELECT * FROM Students JOIN Semesters ON (Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id) OR (Students.student_id = Semesters.student_id AND Semesters.class_id = 0) WHERE Students.id = :id")
+    @Query("SELECT * FROM Students JOIN Semesters ON Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id WHERE Students.id = :id")
     abstract suspend fun loadStudentWithSemestersById(id: Long): Map<Student, List<Semester>>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")

app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt

@@ -4,8 +4,6 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import io.github.wulkanowy.data.enums.MessageType
-import io.github.wulkanowy.data.serializers.SafeMessageTypeEnumListSerializer
-import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -36,8 +34,6 @@ data class AdminMessage(
 
     val priority: String,
 
-    @SerialName("messageTypes")
-    @Serializable(with = SafeMessageTypeEnumListSerializer::class)
     @ColumnInfo(name = "types", defaultValue = "[]")
     val types: List<MessageType> = emptyList(),
 

app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt

@@ -33,13 +33,7 @@ data class GradeSummary(
     @ColumnInfo(name = "points_sum")
     val pointsSum: String,
 
-    @ColumnInfo(name = "points_sum_all_year")
+    val average: Double
-    val pointsSumAllYear: String?,
-
-    val average: Double,
-
-    @ColumnInfo(name = "average_all_year")
-    val averageAllYear: Double? = null,
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0

app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt

@@ -9,8 +9,8 @@ import java.time.Instant
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
 
-    @ColumnInfo(name = "user_login_id") // todo: change column name
+    @ColumnInfo(name = "user_login_id")
-    val studentId: Int,
+    val userLoginId: Int,
 
     @ColumnInfo(name = "device_id")
     val deviceId: Int,

app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt

@@ -9,8 +9,8 @@ import java.time.LocalDate
 @Entity(tableName = "SchoolAnnouncements")
 data class SchoolAnnouncement(
 
-    @ColumnInfo(name = "user_login_id") // todo: change column name
+    @ColumnInfo(name = "user_login_id")
-    val studentId: Int,
+    val userLoginId: Int,
 
     val date: LocalDate,
 

app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt

@@ -49,7 +49,6 @@ data class Student(
     @ColumnInfo(name = "student_id")
     val studentId: Int,
 
-    @Deprecated("not available in VULCAN anymore")
     @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 

app/src/main/java/io/github/wulkanowy/data/enums/AppTheme.kt

@@ -7,6 +7,6 @@ enum class AppTheme(val value: String) {
     BLACK("black");
 
     companion object {
-        fun getByValue(value: String) = entries.find { it.value == value } ?: LIGHT
+        fun getByValue(value: String) = values().find { it.value == value } ?: LIGHT
     }
-}
+}

app/src/main/java/io/github/wulkanowy/data/enums/AttendanceCalculatorSortingMode.kt

@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.enums
-
-enum class AttendanceCalculatorSortingMode(private val value: String) {
-    ALPHABETIC("alphabetic"),
-    ATTENDANCE("attendance_percentage"),
-    LESSON_BALANCE("lesson_balance");
-
-    companion object {
-        fun getByValue(value: String) =
-            AttendanceCalculatorSortingMode.values()
-                .find { it.value == value } ?: ALPHABETIC
-    }
-}

app/src/main/java/io/github/wulkanowy/data/enums/GradeColorTheme.kt

@@ -8,6 +8,6 @@ enum class GradeColorTheme(val value: String) : Serializable {
     GRADE_COLOR("grade_color");
 
     companion object {
-        fun getByValue(value: String) = entries.find { it.value == value } ?: VULCAN
+        fun getByValue(value: String) = values().find { it.value == value } ?: VULCAN
     }
-}
+}

app/src/main/java/io/github/wulkanowy/data/enums/GradeExpandMode.kt

@@ -6,6 +6,6 @@ enum class GradeExpandMode(val value: String) {
     ALWAYS_EXPANDED("always");
 
     companion object {
-        fun getByValue(value: String) = entries.find { it.value == value } ?: ONE
+        fun getByValue(value: String) = values().find { it.value == value } ?: ONE
     }
-}
+}

app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt

@@ -6,6 +6,6 @@ enum class GradeSortingMode(val value: String) {
     AVERAGE("average");
 
     companion object {
-        fun getByValue(value: String) = entries.find { it.value == value } ?: ALPHABETIC
+        fun getByValue(value: String) = values().find { it.value == value } ?: ALPHABETIC
     }
 }

app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt

@@ -4,8 +4,6 @@ enum class MessageType {
     GENERAL_MESSAGE,
     DASHBOARD_MESSAGE,
     LOGIN_MESSAGE,
-    LOGIN_STUDENT_SELECT_MESSAGE,
-    LOGIN_SYMBOL_MESSAGE,
     PASS_RESET_MESSAGE,
     ERROR_OVERRIDE,
 }

app/src/main/java/io/github/wulkanowy/data/enums/ShowAdditionalLessonsMode.kt

@@ -1,11 +0,0 @@
-package io.github.wulkanowy.data.enums
-
-enum class ShowAdditionalLessonsMode(val value: String) {
-    NONE("none"),
-    INLINE("inline"),
-    BELOW("below");
-
-    companion object {
-        fun getByValue(value: String) = entries.find { it.value == value } ?: INLINE
-    }
-}

app/src/main/java/io/github/wulkanowy/data/enums/TimetableMode.kt

@@ -6,6 +6,6 @@ enum class TimetableMode(val value: String) {
     SMALL_OTHER_GROUP("small");
 
     companion object {
-        fun getByValue(value: String) = entries.find { it.value == value } ?: ONLY_CURRENT_GROUP
+        fun getByValue(value: String) = values().find { it.value == value } ?: ONLY_CURRENT_GROUP
     }
-}
+}

app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt

@@ -8,7 +8,7 @@ import io.github.wulkanowy.sdk.pojo.LastAnnouncement as SdkLastAnnouncement
 @JvmName("mapDirectorInformationToEntities")
 fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
     SchoolAnnouncement(
-        studentId = student.studentId,
+        userLoginId = student.userLoginId,
         date = it.date,
         subject = it.subject,
         content = it.content,
@@ -19,7 +19,7 @@ fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
 @JvmName("mapLastAnnouncementsToEntities")
 fun List<SdkLastAnnouncement>.mapToEntities(student: Student) = map {
     SchoolAnnouncement(
-        studentId = student.studentId,
+        userLoginId = student.userLoginId,
         date = it.date,
         subject = it.subject,
         content = it.content,

app/src/main/java/io/github/wulkanowy/data/mappers/GradeMapper.kt

@@ -37,11 +37,9 @@ fun List<SdkGradeSummary>.mapToEntities(semester: Semester) = map {
         predictedGrade = it.predicted,
         finalGrade = it.final,
         pointsSum = it.pointsSum,
-        pointsSumAllYear = it.pointsSumAllYear,
         proposedPoints = it.proposedPoints,
         finalPoints = it.finalPoints,
-        average = it.average,
+        average = it.average
-        averageAllYear = it.averageAllYear,
     )
 }
 

app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt

@@ -8,7 +8,7 @@ import io.github.wulkanowy.sdk.pojo.Token as SdkToken
 
 fun List<SdkDevice>.mapToEntities(student: Student) = map {
     MobileDevice(
-        studentId = student.studentId,
+        userLoginId = student.userLoginId,
         date = it.createDate.toInstant(),
         deviceId = it.id,
         name = it.name

app/src/main/java/io/github/wulkanowy/data/pojos/AttendanceData.kt

@@ -1,14 +0,0 @@
-package io.github.wulkanowy.data.pojos
-
-data class AttendanceData(
-    val subjectName: String,
-    val lessonBalance: Int,
-    val presences: Int,
-    val absences: Int,
-) {
-    val total: Int
-        get() = presences + absences
-
-    val presencePercentage: Double
-        get() = if (total == 0) 0.0 else (presences.toDouble() / total) * 100
-}

app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt

@@ -0,0 +1,33 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.api.AdminMessageService
+import io.github.wulkanowy.data.db.dao.AdminMessageDao
+import io.github.wulkanowy.data.db.entities.AdminMessage
+import io.github.wulkanowy.data.networkBoundResource
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.sync.Mutex
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AdminMessageRepository @Inject constructor(
+    private val adminMessageService: AdminMessageService,
+    private val adminMessageDao: AdminMessageDao,
+) {
+
+    private val saveFetchResultMutex = Mutex()
+
+    fun getAdminMessages(): Flow<Resource<List<AdminMessage>>> =
+        networkBoundResource(
+            mutex = saveFetchResultMutex,
+            isResultEmpty = { false },
+            query = { adminMessageDao.loadAll() },
+            fetch = { adminMessageService.getAdminMessages() },
+            shouldFetch = { true },
+            saveFetchResult = { oldItems, newItems ->
+                adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
+            },
+            showSavedOnLoading = false,
+        )
+}

app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt

@@ -9,15 +9,12 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.pojo.Absent
-import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
-import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -31,71 +28,12 @@ class AttendanceRepository @Inject constructor(
     private val timetableDb: TimetableDao,
     private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
-    private val preferencesRepository: PreferencesRepository
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
     private val cacheKey = "attendance"
 
-    private fun filterAttendance(
-        hiddenAttendanceTiles: List<DashboardItem.HiddenAttendanceTile>,
-        attendanceItem: Attendance
-    ): Boolean {
-        return when {
-            attendanceItem.absence && attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.EXCUSED_ABSENCE
-            ) -> false
-
-            attendanceItem.absence && !attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.UNEXCUSED_ABSENCE
-            ) -> false
-
-            attendanceItem.lateness && attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.EXCUSED_LATENESS
-            ) -> false
-
-            attendanceItem.lateness && !attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.UNEXCUSED_LATENESS
-            ) -> false
-
-            attendanceItem.exemption && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.EXEMPTION) -> false
-            attendanceItem.deleted && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.DELETED) -> false
-            attendanceItem.presence && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.PRESENT) -> false
-
-            else -> !hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.UNKNOWN)
-        }
-    }
-
-    private fun filterAttendance(
-        hiddenAttendanceTiles: List<DashboardItem.HiddenAttendanceTile>,
-        attendanceItem: SdkAttendance
-    ): Boolean {
-        return when {
-            attendanceItem.absence && attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.EXCUSED_ABSENCE
-            ) -> false
-
-            attendanceItem.absence && !attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.UNEXCUSED_ABSENCE
-            ) -> false
-
-            attendanceItem.lateness && attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.EXCUSED_LATENESS
-            ) -> false
-
-            attendanceItem.lateness && !attendanceItem.excused && hiddenAttendanceTiles.contains(
-                DashboardItem.HiddenAttendanceTile.UNEXCUSED_LATENESS
-            ) -> false
-
-            attendanceItem.exemption && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.EXEMPTION) -> false
-            attendanceItem.deleted && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.DELETED) -> false
-            attendanceItem.presence && hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.PRESENT) -> false
-
-            else -> !hiddenAttendanceTiles.contains(DashboardItem.HiddenAttendanceTile.UNKNOWN)
-        }
-    }
-
     fun getAttendance(
         student: Student,
         semester: Semester,
@@ -113,24 +51,14 @@ class AttendanceRepository @Inject constructor(
             it.isEmpty() || forceRefresh || isExpired
         },
         query = {
-            val hiddenAttendanceItems = preferencesRepository.hiddenAttendanceItems
+            attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
-
-            attendanceDb
-                .loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
-                .map {
-                    it.filter { item -> filterAttendance(hiddenAttendanceItems, item) }
-                }
         },
         fetch = {
-            val hiddenAttendanceItems = preferencesRepository.hiddenAttendanceItems
-
             val lessons = timetableDb.load(
                 semester.diaryId, semester.studentId, start.monday, end.sunday
             )
-
             wulkanowySdkFactory.create(student, semester)
                 .getAttendance(start.monday, end.sunday)
-                .filter { item -> filterAttendance(hiddenAttendanceItems, item) }
                 .mapToEntities(semester, lessons)
         },
         saveFetchResult = { old, new ->
@@ -151,13 +79,7 @@ class AttendanceRepository @Inject constructor(
         start: LocalDate,
         end: LocalDate
     ): Flow<List<Attendance>> {
-        val hiddenAttendanceItems = preferencesRepository.hiddenAttendanceItems
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, start, end)
-
-        return attendanceDb
-            .loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
-            .map {
-                it.filter { item -> filterAttendance(hiddenAttendanceItems, item) }
-            }
     }
 
     suspend fun updateTimetable(timetable: List<Attendance>) {

app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt

@@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
-import timber.log.Timber
 import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -31,18 +30,10 @@ class GradeRepository @Inject constructor(
     private val gradeDescriptiveDb: GradeDescriptiveDao,
     private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
-    private val preferencesRepository: PreferencesRepository
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
-    private fun loadGrades(semesterId: Int, studentId: Int): Flow<List<Grade>> {
-        val hiddenGrades = preferencesRepository.hiddenGrades
-
-        Timber.i("Load grades for semester $semesterId student $studentId")
-        return gradeDb.loadAllCensored(semesterId, studentId, hiddenGrades.toTypedArray())
-    }
-
     fun getGrades(
         student: Student,
         semester: Semester,
@@ -70,15 +61,11 @@ class GradeRepository @Inject constructor(
             }
         },
         fetch = {
-            val hiddenGrades = preferencesRepository.hiddenGrades
-
             val (details, summary, descriptive) = wulkanowySdkFactory.create(student, semester)
                 .getGrades(semester.semesterId)
 
-            val censoredDetails = details.filterNot { it.entry in hiddenGrades }
-
             Triple(
-                censoredDetails.mapToEntities(semester),
+                details.mapToEntities(semester),
                 summary.mapToEntities(semester),
                 descriptive.mapToEntities(semester)
             )
@@ -170,13 +157,13 @@ class GradeRepository @Inject constructor(
     }
 
     fun getUnreadGrades(semester: Semester): Flow<List<Grade>> {
-        return loadGrades(semester.semesterId, semester.studentId).map {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).map {
             it.filter { grade -> !grade.isRead }
         }
     }
 
     fun getGradesFromDatabase(semester: Semester): Flow<List<Grade>> {
-        return loadGrades(semester.semesterId, semester.studentId)
+        return gradeDb.loadAll(semester.semesterId, semester.studentId)
     }
 
     fun getGradesPredictedFromDatabase(semester: Semester): Flow<List<GradeSummary>> {

app/src/main/java/io/github/wulkanowy/data/repositories/LuckyNumberRepository.kt

@@ -6,8 +6,6 @@ import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
-import io.github.wulkanowy.utils.AppWidgetUpdater
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
@@ -20,7 +18,6 @@ import javax.inject.Singleton
 class LuckyNumberRepository @Inject constructor(
     private val luckyNumberDb: LuckyNumberDao,
     private val wulkanowySdkFactory: WulkanowySdkFactory,
-    private val appWidgetUpdater: AppWidgetUpdater,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -29,7 +26,6 @@ class LuckyNumberRepository @Inject constructor(
         student: Student,
         forceRefresh: Boolean,
         notify: Boolean = false,
-        isFromAppWidget: Boolean = false
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = { it == null },
@@ -48,9 +44,6 @@ class LuckyNumberRepository @Inject constructor(
                     oldItems = listOfNotNull(oldLuckyNumber),
                     newItems = listOf(newLuckyNumber.apply { if (notify) isNotified = false }),
                 )
-                if (!isFromAppWidget) {
-                    appWidgetUpdater.updateAllAppWidgetsByProvider(LuckyNumberWidgetProvider::class)
-                }
             }
         }
     )

app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt

@@ -122,7 +122,7 @@ class MessageRepository @Inject constructor(
         fetch = {
             wulkanowySdkFactory.create(student)
                 .getMessageDetails(
-                    messageKey = message.messageGlobalKey,
+                    messageKey = it!!.message.messageGlobalKey,
                     markAsRead = message.unread && markAsRead,
                 )
         },

app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt

@@ -38,7 +38,7 @@ class MobileDeviceRepository @Inject constructor(
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
             it.isEmpty() || forceRefresh || isExpired
         },
-        query = { mobileDb.loadAll(student.studentId) },
+        query = { mobileDb.loadAll(student.userLoginId) },
         fetch = {
             wulkanowySdkFactory.create(student, semester)
                 .getRegisteredDevices()

app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt

@@ -21,7 +21,6 @@ class NoteRepository @Inject constructor(
     private val noteDb: NoteDao,
     private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val refreshHelper: AutoRefreshHelper,
-    private val preferencesRepository: PreferencesRepository
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -40,16 +39,12 @@ class NoteRepository @Inject constructor(
             val isExpired = refreshHelper.shouldBeRefreshed(
                 getRefreshKey(cacheKey, semester)
             )
-
             it.isEmpty() || forceRefresh || isExpired
         },
         query = { noteDb.loadAll(student.studentId) },
         fetch = {
-            val showNotes = preferencesRepository.showNotes
-
             wulkanowySdkFactory.create(student, semester)
                 .getNotes()
-                .filter { showNotes }
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->

app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt

@@ -7,16 +7,12 @@ import androidx.core.content.edit
 import com.fredporciuncula.flow.preferences.FlowSharedPreferences
 import com.fredporciuncula.flow.preferences.Preference
 import com.fredporciuncula.flow.preferences.Serializer
-import com.fredporciuncula.flow.preferences.map
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.api.models.Mapping
 import io.github.wulkanowy.data.enums.AppTheme
-import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode
 import io.github.wulkanowy.data.enums.GradeColorTheme
 import io.github.wulkanowy.data.enums.GradeExpandMode
 import io.github.wulkanowy.data.enums.GradeSortingMode
-import io.github.wulkanowy.data.enums.ShowAdditionalLessonsMode
 import io.github.wulkanowy.data.enums.TimetableGapsMode
 import io.github.wulkanowy.data.enums.TimetableMode
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
@@ -26,7 +22,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import timber.log.Timber
 import java.time.Instant
 import java.util.UUID
 import javax.inject.Inject
@@ -39,7 +34,6 @@ class PreferencesRepository @Inject constructor(
     private val flowSharedPref: FlowSharedPreferences,
     private val json: Json,
 ) {
-    private val NO_ATTENDANCE_VALUE = -1.0
 
     val isShowPresent: Boolean
         get() = getBoolean(
@@ -47,27 +41,6 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_attendance_present
         )
 
-    val targetAttendanceFlow: Flow<Int>
-        get() = flowSharedPref.getInt(
-            context.getString(R.string.pref_key_attendance_target),
-            context.resources.getInteger(R.integer.pref_default_attendance_target)
-        ).asFlow()
-
-    val attendanceCalculatorSortingModeFlow: Flow<AttendanceCalculatorSortingMode>
-        get() = flowSharedPref.getString(
-            context.getString(R.string.pref_key_attendance_calculator_sorting_mode),
-            context.resources.getString(R.string.pref_default_attendance_calculator_sorting_mode)
-        ).asFlow().map(AttendanceCalculatorSortingMode::getByValue)
-
-    /**
-     * Subjects are empty when they don't have any attendances (total = 0, attendances = 0, absences = 0).
-     */
-    val attendanceCalculatorShowEmptySubjects: Flow<Boolean>
-        get() = flowSharedPref.getBoolean(
-            context.getString(R.string.pref_key_attendance_calculator_show_empty_subjects),
-            context.resources.getBoolean(R.bool.pref_default_attendance_calculator_show_empty_subjects)
-        ).asFlow()
-
     private val gradeAverageModePref: Preference<GradeAverageMode>
         get() = getObjectFlow(
             R.string.pref_key_grade_average_mode,
@@ -218,12 +191,6 @@ class PreferencesRepository @Inject constructor(
             )
         )
 
-    val showAdditionalLessonsInPlan: ShowAdditionalLessonsMode
-        get() = getString(
-            R.string.pref_key_timetable_show_additional_lessons,
-            R.string.pref_default_timetable_show_additional_lessons
-        ).let { ShowAdditionalLessonsMode.getByValue(it) }
-
     val gradeSortingMode: GradeSortingMode
         get() = GradeSortingMode.getByValue(
             getString(
@@ -305,60 +272,6 @@ class PreferencesRepository @Inject constructor(
             selectedDashboardTilesPreference.set(filteredValue)
         }
 
-    var attendancePercentage: Double?
-        get() = attendancePercentagePreference.get().takeIf { it != NO_ATTENDANCE_VALUE }
-        set(value) = attendancePercentagePreference.set(value ?: NO_ATTENDANCE_VALUE)
-
-    var hiddenAttendanceItems: List<DashboardItem.HiddenAttendanceTile>
-        get() = hiddenAttendanceItemsPreference.get().toList()
-        set(value) = hiddenAttendanceItemsPreference.set(value.toSet())
-
-    var hiddenGrades: List<String>
-        get() = hiddenGradesPreference.get().toList()
-        set(value) = hiddenGradesPreference.set(value.toSet())
-
-    var showNotes: Boolean
-        get() = showNotesPreference.get()
-        set(value) = showNotesPreference.set(value)
-
-    var developerMode: Boolean
-        get() = developerModePreference.get()
-        set(value) = developerModePreference.set(value)
-
-    private val developerModePreference: Preference<Boolean>
-        get() = flowSharedPref.getBoolean(
-            context.getString(R.string.pref_key_developer_mode),
-            context.resources.getBoolean(R.bool.pref_default_developer_mode)
-        )
-
-    private val hiddenGradesPreference: Preference<Set<String>>
-        get() {
-            val defaultSet = context.resources.getStringArray(R.array.pref_default_hidden_grades).toSet()
-            val prefKey = "hidden_grades"
-
-            return flowSharedPref.getStringSet(prefKey, defaultSet)
-        }
-
-    private val showNotesPreference: Preference<Boolean>
-        get() = flowSharedPref.getBoolean(
-            context.getString(R.string.pref_key_show_notes),
-            context.resources.getBoolean(R.bool.pref_default_show_notes)
-        )
-
-    private val hiddenAttendanceItemsPreference: Preference<Set<DashboardItem.HiddenAttendanceTile>>
-        get() {
-            val defaultSet =
-                context.resources.getStringArray(R.array.pref_default_hidden_attendance_items).toSet()
-            val prefKey = "attendance_items"
-
-            return flowSharedPref
-                .getStringSet(prefKey, defaultSet)
-                .map(
-                    mapper = { it -> it.map { DashboardItem.HiddenAttendanceTile.valueOf(it) }.toSet() },
-                    reverse = { it -> it.map { it.name }.toSet() }
-                )
-        }
-
     private val selectedDashboardTilesPreference: Preference<Set<String>>
         get() {
             val defaultSet =
@@ -368,19 +281,6 @@ class PreferencesRepository @Inject constructor(
             return flowSharedPref.getStringSet(prefKey, defaultSet)
         }
 
-    private val attendancePercentagePreference: Preference<Double>
-        get() {
-            val prefKey = context.getString(R.string.pref_key_attendance_percentage)
-            val defaultValue = context.resources.getString(R.string.pref_default_attendance_percentage)
-
-            return flowSharedPref
-                .getString(prefKey, defaultValue)
-                .map(
-                    mapper = { it.toDoubleOrNull() ?: NO_ATTENDANCE_VALUE },
-                    reverse = { it.toString() }
-                )
-        }
-
     var dismissedAdminMessageIds: List<Int>
         get() = sharedPref.getStringSet(PREF_KEY_ADMIN_DISMISSED_MESSAGE_IDS, emptySet())
             .orEmpty()
@@ -446,15 +346,6 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getString(PREF_KEY_INSTALLATION_ID, null).orEmpty()
         private set(value) = sharedPref.edit { putString(PREF_KEY_INSTALLATION_ID, value) }
 
-    var mapping: Mapping?
-        get() {
-            val value = sharedPref.getString("mapping", null)
-            return value?.let { json.decodeFromString(it) }
-        }
-        set(value) = sharedPref.edit(commit = true) {
-            putString("mapping", value?.let { json.encodeToString(it) })
-        }
-
     init {
         if (installationId.isEmpty()) {
             installationId = UUID.randomUUID().toString()

app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt

@@ -37,7 +37,7 @@ class SchoolAnnouncementRepository @Inject constructor(
             it.isEmpty() || forceRefresh || isExpired
         },
         query = {
-            schoolAnnouncementDb.loadAll(student.studentId)
+            schoolAnnouncementDb.loadAll(student.userLoginId)
         },
         fetch = {
             val sdk = wulkanowySdkFactory.create(student)
@@ -57,7 +57,7 @@ class SchoolAnnouncementRepository @Inject constructor(
     )
 
     fun getSchoolAnnouncementFromDatabase(student: Student): Flow<List<SchoolAnnouncement>> {
-        return schoolAnnouncementDb.loadAll(student.studentId)
+        return schoolAnnouncementDb.loadAll(student.userLoginId)
     }
 
     suspend fun updateSchoolAnnouncement(schoolAnnouncement: List<SchoolAnnouncement>) =

app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt

@@ -1,7 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.WulkanowySdkFactory
-import io.github.wulkanowy.data.api.services.SchoolsService
+import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters

app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt

@@ -64,10 +64,7 @@ class SemesterRepository @Inject constructor(
             .getSemesters()
             .mapToEntities(student.studentId)
 
-        if (new.isEmpty()) {
+        if (new.isEmpty()) return Timber.i("Empty semester list!")
-            Timber.i("Empty semester list from SDK!")
-            return
-        }
 
         val old = semesterDb.loadAll(student.studentId, student.classId)
         semesterDb.removeOldAndSaveNew(

app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt

@@ -42,7 +42,6 @@ class StudentRepository @Inject constructor(
     ): RegisterUser = wulkanowySdkFactory.create()
         .getStudentsFromHebe(token, pin, symbol, "")
         .mapToPojo(null)
-        .also { it.logErrors() }
 
     suspend fun getUserSubjectsFromScrapper(
         email: String,
@@ -53,7 +52,6 @@ class StudentRepository @Inject constructor(
     ): RegisterUser = wulkanowySdkFactory.create()
         .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, domainSuffix, symbol)
         .mapToPojo(password)
-        .also { it.logErrors() }
 
     suspend fun getStudentsHybrid(
         email: String,
@@ -63,7 +61,6 @@ class StudentRepository @Inject constructor(
     ): RegisterUser = wulkanowySdkFactory.create()
         .getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
         .mapToPojo(password)
-        .also { it.logErrors() }
 
     suspend fun getSavedStudents(decryptPass: Boolean = true): List<StudentWithSemesters> {
         return studentDb.loadStudentsWithSemesters().map { (student, semesters) ->
@@ -198,10 +195,10 @@ class StudentRepository @Inject constructor(
             .authorizePermission(pesel)
 
     suspend fun refreshStudentAfterAuthorize(student: Student, semester: Semester) {
-        val wulkanowySdk = wulkanowySdkFactory.create(student, semester)
+        val newCurrentApiStudent = wulkanowySdkFactory
-            val newCurrentApiStudent = runCatching { wulkanowySdk.getCurrentStudent() }
+            .create(student, semester)
-            .onFailure { Timber.e(it, "Can't find student with id ${student.studentId}") }
+            .getCurrentStudent()
-            .getOrNull() ?: return
+            ?: return Timber.d("Can't find student with id ${student.studentId}")
 
         val studentName = StudentName(
             studentName = "${newCurrentApiStudent.studentName} ${newCurrentApiStudent.studentSurname}"
@@ -224,18 +221,6 @@ class StudentRepository @Inject constructor(
             appDatabase.clearAllTables()
         }
     }
-
-    private fun RegisterUser.logErrors() {
-        val symbolsErrors = symbols.filter { it.error != null }
-            .map { it.error }
-        val unitsErrors = symbols.flatMap { it.schools }
-            .filter { it.error != null }
-            .map { it.error }
-
-        (symbolsErrors + unitsErrors).forEach { error ->
-            Timber.e(error, "Error occurred while fetching students")
-        }
-    }
 }
 
 class NoAuthorizationException : Exception()

app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt

@@ -13,8 +13,6 @@ import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.TimetableFull
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
-import io.github.wulkanowy.utils.AppWidgetUpdater
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.monday
@@ -28,7 +26,6 @@ import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
-
 @Singleton
 class TimetableRepository @Inject constructor(
     private val timetableDb: TimetableDao,
@@ -37,7 +34,6 @@ class TimetableRepository @Inject constructor(
     private val wulkanowySdkFactory: WulkanowySdkFactory,
     private val schedulerHelper: TimetableNotificationSchedulerHelper,
     private val refreshHelper: AutoRefreshHelper,
-    private val appWidgetUpdater: AppWidgetUpdater,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -56,8 +52,7 @@ class TimetableRepository @Inject constructor(
         forceRefresh: Boolean,
         refreshAdditional: Boolean = false,
         notify: Boolean = false,
-        timetableType: TimetableType = TimetableType.NORMAL,
+        timetableType: TimetableType = TimetableType.NORMAL
-        isFromAppWidget: Boolean = false
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = {
@@ -88,9 +83,6 @@ class TimetableRepository @Inject constructor(
             refreshDayHeaders(timetableOld.headers, timetableNew.headers)
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
-            if (!isFromAppWidget) {
-                appWidgetUpdater.updateAllAppWidgetsByProvider(TimetableWidgetProvider::class)
-            }
         },
         filterResult = { (timetable, additional, headers) ->
             TimetableFull(

app/src/main/java/io/github/wulkanowy/data/repositories/WulkanowyRepository.kt

@@ -1,66 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.api.models.Mapping
-import io.github.wulkanowy.data.api.services.WulkanowyService
-import io.github.wulkanowy.data.db.dao.AdminMessageDao
-import io.github.wulkanowy.data.db.entities.AdminMessage
-import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filterNot
-import kotlinx.coroutines.sync.Mutex
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class WulkanowyRepository @Inject constructor(
-    private val wulkanowyService: WulkanowyService,
-    private val adminMessageDao: AdminMessageDao,
-    private val preferencesRepository: PreferencesRepository,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val saveFetchResultMutex = Mutex()
-
-    private val cacheKey = "mapping_refresh_key"
-
-    fun getAdminMessages(): Flow<Resource<List<AdminMessage>>> =
-        networkBoundResource(
-            mutex = saveFetchResultMutex,
-            isResultEmpty = { false },
-            query = { adminMessageDao.loadAll() },
-            fetch = { wulkanowyService.getAdminMessages() },
-            shouldFetch = { true },
-            saveFetchResult = { oldItems, newItems ->
-                adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
-            },
-        )
-            .filterNot { it is Resource.Intermediate }
-
-    suspend fun getMapping(): Mapping? {
-        var savedMapping = preferencesRepository.mapping
-
-        val isExpired = refreshHelper.shouldBeRefreshed(
-            key = getRefreshKey(cacheKey)
-        )
-
-        if (savedMapping == null || isExpired) {
-            fetchMapping()
-            savedMapping = preferencesRepository.mapping
-        }
-
-        return savedMapping
-    }
-
-    suspend fun fetchMapping() {
-        runCatching { wulkanowyService.getMapping() }
-            .onFailure { Timber.e(it) }
-            .onSuccess {
-                preferencesRepository.mapping = it
-                refreshHelper.updateLastRefreshTimestamp(cacheKey)
-            }
-    }
-}

app/src/main/java/io/github/wulkanowy/data/serializers/SafeMessageTypeEnumListSerializer.kt

@@ -1,27 +0,0 @@
-package io.github.wulkanowy.data.serializers
-
-import io.github.wulkanowy.data.enums.MessageType
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-
-@OptIn(ExperimentalSerializationApi::class)
-object SafeMessageTypeEnumListSerializer : KSerializer<List<MessageType>> {
-
-    private val serializer = ListSerializer(String.serializer())
-
-    override val descriptor = serializer.descriptor
-
-    override fun serialize(encoder: Encoder, value: List<MessageType>) {
-        encoder.encodeNotNullMark()
-        serializer.serialize(encoder, value.map { it.name })
-    }
-
-    override fun deserialize(decoder: Decoder): List<MessageType> =
-        serializer.deserialize(decoder).mapNotNull { enumName ->
-            MessageType.entries.find { it.name == enumName }
-        }
-}

app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt

@@ -5,14 +5,14 @@ import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageType
 import io.github.wulkanowy.data.mapResourceData
+import io.github.wulkanowy.data.repositories.AdminMessageRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.WulkanowyRepository
 import io.github.wulkanowy.utils.AppInfo
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetAppropriateAdminMessageUseCase @Inject constructor(
-    private val wulkanowyRepository: WulkanowyRepository,
+    private val adminMessageRepository: AdminMessageRepository,
     private val preferencesRepository: PreferencesRepository,
     private val appInfo: AppInfo
 ) {
@@ -22,7 +22,7 @@ class GetAppropriateAdminMessageUseCase @Inject constructor(
     }
 
     operator fun invoke(scrapperBaseUrl: String, type: MessageType): Flow<Resource<AdminMessage?>> {
-        return wulkanowyRepository.getAdminMessages().mapResourceData { adminMessages ->
+        return adminMessageRepository.getAdminMessages().mapResourceData { adminMessages ->
             adminMessages
                 .asSequence()
                 .filter { it.isNotDismissed() }

app/src/main/java/io/github/wulkanowy/domain/attendance/GetAttendanceCalculatorDataUseCase.kt

@@ -1,106 +0,0 @@
-package io.github.wulkanowy.domain.attendance
-
-import io.github.wulkanowy.data.*
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.Subject
-import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode
-import io.github.wulkanowy.data.enums.AttendanceCalculatorSortingMode.*
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.data.repositories.SubjectRepository
-import io.github.wulkanowy.utils.allAbsences
-import io.github.wulkanowy.utils.allPresences
-import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
-import kotlin.math.ceil
-import kotlin.math.floor
-
-class GetAttendanceCalculatorDataUseCase @Inject constructor(
-    private val subjectRepository: SubjectRepository,
-    private val attendanceSummaryRepository: AttendanceSummaryRepository,
-    private val preferencesRepository: PreferencesRepository,
-) {
-
-    operator fun invoke(
-        student: Student,
-        semester: Semester,
-        forceRefresh: Boolean,
-    ): Flow<Resource<List<AttendanceData>>> =
-        subjectRepository.getSubjects(student, semester, forceRefresh)
-            .mapResourceData { subjects -> subjects.sortedBy(Subject::name) }
-            .combineWithResourceData(preferencesRepository.targetAttendanceFlow, ::Pair)
-            .flatMapResourceData { (subjects, targetFreq) ->
-                combineResourceFlows(subjects.map { subject ->
-                    attendanceSummaryRepository.getAttendanceSummary(
-                        student = student,
-                        semester = semester,
-                        subjectId = subject.realId,
-                        forceRefresh = forceRefresh
-                    ).mapResourceData { summaries ->
-                        summaries.toAttendanceData(subject.name, targetFreq)
-                    }
-                })
-                    // Every individual combined flow causes separate network requests to update data.
-                    // When there is N child flows, they can cause up to N-1 items to be emitted. Since all
-                    // requests are usually completed in less than 5s, there is no need to emit multiple
-                    // intermediates that will be visible for barely any time.
-                    .debounceIntermediates()
-            }
-            .combineWithResourceData(preferencesRepository.attendanceCalculatorShowEmptySubjects) { attendanceDataList, showEmptySubjects ->
-                attendanceDataList.filter { it.total != 0 || showEmptySubjects }
-            }
-            .combineWithResourceData(preferencesRepository.attendanceCalculatorSortingModeFlow, List<AttendanceData>::sortedBy)
-}
-
-private fun List<AttendanceSummary>.toAttendanceData(subjectName: String, targetFreq: Int): AttendanceData {
-    val presences = sumOf { it.allPresences }
-    val absences = sumOf { it.allAbsences }
-    return AttendanceData(
-        subjectName = subjectName,
-        lessonBalance = calcLessonBalance(
-            targetFreq.toDouble() / 100, presences, absences
-        ),
-        presences = presences,
-        absences = absences,
-    )
-}
-
-private fun calcLessonBalance(targetFreq: Double, presences: Int, absences: Int): Int {
-    val total = presences + absences
-    // The `+ 1` is to avoid false positives in close cases. Eg.:
-    // target frequency 99%, 1 presence. Without the `+ 1` this would be reported shown as
-    // a positive balance of +1, however that is not actually true as skipping one class
-    // would make it so that the balance would actually be negative (-98). The `+ 1`
-    // fixes this and makes sure that in situations like these, it's not reporting incorrect
-    // balances
-    return when {
-        presences / (total + 1f) >= targetFreq -> calcMissingAbsences(
-            targetFreq, absences, presences
-        )
-        presences / (total + 0f) < targetFreq -> -calcMissingPresences(
-            targetFreq, absences, presences
-        )
-        else -> 0
-    }
-}
-
-private fun calcMissingPresences(targetFreq: Double, absences: Int, presences: Int) =
-    calcMinRequiredPresencesFor(targetFreq, absences) - presences
-
-private fun calcMinRequiredPresencesFor(targetFreq: Double, absences: Int) =
-    ceil((targetFreq / (1 - targetFreq)) * absences).toInt()
-
-private fun calcMissingAbsences(targetFreq: Double, absences: Int, presences: Int) =
-    calcMinRequiredAbsencesFor(targetFreq, presences) - absences
-
-private fun calcMinRequiredAbsencesFor(targetFreq: Double, presences: Int) =
-    floor((presences * (1 - targetFreq)) / targetFreq).toInt()
-
-private fun List<AttendanceData>.sortedBy(mode: AttendanceCalculatorSortingMode) = when (mode) {
-    ALPHABETIC -> sortedBy(AttendanceData::subjectName)
-    ATTENDANCE -> sortedByDescending(AttendanceData::presencePercentage)
-    LESSON_BALANCE -> sortedBy(AttendanceData::lessonBalance)
-}

app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt

@@ -59,7 +59,7 @@ class GetMailboxByStudentUseCase @Inject constructor(
     private fun String.getUnauthorizedVersion(): String {
         return normalizeStudentName().split(" ")
             .joinToString(" ") {
-                it.firstOrNull()?.toString().orEmpty() + "*".repeat((it.length - 1).coerceAtLeast(0))
+                it.first() + "*".repeat(it.length - 1)
             }
     }
 }

app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt

@@ -19,18 +19,16 @@ class NewGradeNotification @Inject constructor(
 ) {
 
     suspend fun notifyDetails(items: List<Grade>, student: Student) {
-        val notificationDataList = items
+        val notificationDataList = items.map {
-            .filter { !it.isNotified }
+            NotificationData(
-            .map {
+                title = context.getPlural(R.plurals.grade_new_items, 1),
-                NotificationData(
+                content = buildString {
-                    title = context.getPlural(R.plurals.grade_new_items, 1),
+                    append("${it.subject}: ${it.entry}")
-                    content = buildString {
+                    if (it.comment.isNotBlank()) append(" (${it.comment})")
-                        append("${it.subject}: ${it.entry}")
+                },
-                        if (it.comment.isNotBlank()) append(" (${it.comment})")
+                destination = Destination.Grade,
-                    },
+            )
-                    destination = Destination.Grade,
+        }
-                )
-            }
 
         val groupNotificationData = GroupNotificationData(
             notificationDataList = notificationDataList,

app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt

@@ -3,19 +3,14 @@ package io.github.wulkanowy.ui.modules.about
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemAboutBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderAboutBinding
 import javax.inject.Inject
 
-class AboutAdapter @Inject constructor(
+class AboutAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    private val preferencesRepository: PreferencesRepository
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private var developerModeClicks = 0
     private enum class ViewType(val id: Int) {
         ITEM_HEADER(1),
         ITEM_ELEMENT(2)
@@ -51,19 +46,6 @@ class AboutAdapter @Inject constructor(
 
     private fun bindHeaderViewHolder(binding: ScrollableHeaderAboutBinding) {
         with(binding.aboutScrollableHeaderIcon) {
-            setOnClickListener {
-                if (++developerModeClicks == 5 && !preferencesRepository.developerMode) {
-                    preferencesRepository.developerMode = true
-                    developerModeClicks = 0
-
-                    Toast.makeText(
-                        context,
-                        "done!",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-
             setImageDrawable(ResourcesCompat.getDrawableForDensity(
                 context.resources, context.applicationInfo.icon, 640, null)
             )

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt

@@ -14,7 +14,6 @@ import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.databinding.DialogExcuseBinding
 import io.github.wulkanowy.databinding.FragmentAttendanceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.attendance.calculator.AttendanceCalculatorFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -135,7 +134,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return if (item.itemId == R.id.attendanceMenuSummary) presenter.onSummarySwitchSelected()
-        else if (item.itemId == R.id.attendanceMenuCalculator) presenter.onCalculatorSwitchSelected()
         else false
     }
 
@@ -255,10 +253,6 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         (activity as? MainActivity)?.pushView(AttendanceSummaryFragment.newInstance())
     }
 
-    override fun openCalculatorView() {
-        (activity as? MainActivity)?.pushView(AttendanceCalculatorFragment.newInstance())
-    }
-
     override fun startActionMode() {
         actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback)
     }

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt

@@ -1,36 +1,16 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
-import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.flatResourceFlow
-import io.github.wulkanowy.data.logResourceStatus
-import io.github.wulkanowy.data.mapResourceData
-import io.github.wulkanowy.data.onResourceData
-import io.github.wulkanowy.data.onResourceError
-import io.github.wulkanowy.data.onResourceIntermediate
-import io.github.wulkanowy.data.onResourceLoading
-import io.github.wulkanowy.data.onResourceNotLoading
-import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.AttendanceRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.*
-import io.github.wulkanowy.utils.capitalise
-import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
-import io.github.wulkanowy.utils.isExcusableOrNotExcused
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.nextSchoolDay
-import io.github.wulkanowy.utils.previousOrSameSchoolDay
-import io.github.wulkanowy.utils.previousSchoolDay
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -215,11 +195,6 @@ class AttendancePresenter @Inject constructor(
         return true
     }
 
-    fun onCalculatorSwitchSelected(): Boolean {
-        view?.openCalculatorView()
-        return true
-    }
-
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
 

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt

@@ -56,8 +56,6 @@ interface AttendanceView : BaseView {
 
     fun openSummaryView()
 
-    fun openCalculatorView()
-
     fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String)
 
     fun startActionMode()

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorAdapter.kt

@@ -1,67 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.databinding.ItemAttendanceCalculatorHeaderBinding
-import javax.inject.Inject
-import kotlin.math.abs
-import kotlin.math.roundToInt
-
-class AttendanceCalculatorAdapter @Inject constructor() :
-    RecyclerView.Adapter<AttendanceCalculatorAdapter.ViewHolder>() {
-
-    var items = emptyList<AttendanceData>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
-        ItemAttendanceCalculatorHeaderBinding.inflate(
-            LayoutInflater.from(parent.context), parent, false
-        )
-    )
-
-    override fun onBindViewHolder(parent: ViewHolder, position: Int) {
-        val context = parent.binding.root.context
-        val item = items[position]
-
-        with(parent.binding) {
-            attendanceCalculatorPercentage.text = "${item.presencePercentage.roundToInt()}"
-
-            attendanceCalculatorSummaryBalance.text = when {
-                item.lessonBalance > 0 -> {
-                    context.getString(
-                        R.string.attendance_calculator_summary_balance_positive,
-                        item.lessonBalance
-                    )
-                }
-
-                item.lessonBalance < 0 -> {
-                    context.getString(
-                        R.string.attendance_calculator_summary_balance_negative,
-                        abs(item.lessonBalance)
-                    )
-                }
-
-                else -> context.getString(R.string.attendance_calculator_summary_balance_neutral)
-            }
-            attendanceCalculatorWarning.isVisible = item.lessonBalance < 0
-            attendanceCalculatorTitle.text = item.subjectName
-            attendanceCalculatorSummaryValues.text = if (item.total == 0) {
-                context.getString(R.string.attendance_calculator_summary_values_empty)
-            } else {
-                context.getString(
-                    R.string.attendance_calculator_summary_values,
-                    item.presences,
-                    item.total
-                )
-            }
-        }
-    }
-
-    class ViewHolder(val binding: ItemAttendanceCalculatorHeaderBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorFragment.kt

@@ -1,133 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.LinearLayoutManager
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.databinding.FragmentAttendanceCalculatorBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.modules.settings.appearance.AppearanceFragment
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.getThemeAttrColor
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AttendanceCalculatorFragment :
-    BaseFragment<FragmentAttendanceCalculatorBinding>(R.layout.fragment_attendance_calculator),
-    AttendanceCalculatorView, MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: AttendanceCalculatorPresenter
-
-    @Inject
-    lateinit var attendanceCalculatorAdapter: AttendanceCalculatorAdapter
-
-    override val titleStringId get() = R.string.attendance_title
-
-    companion object {
-        fun newInstance() = AttendanceCalculatorFragment()
-    }
-
-    override val isViewEmpty get() = attendanceCalculatorAdapter.items.isEmpty()
-
-    @Suppress("DEPRECATION")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentAttendanceCalculatorBinding.bind(view)
-        messageContainer = binding.attendanceCalculatorRecycler
-        presenter.onAttachView(this)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.action_menu_attendance_calculator, menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return if (item.itemId == R.id.attendance_calculator_menu_settings) presenter.onSettingsSelected()
-        else false
-    }
-
-    override fun openSettingsView() {
-        (activity as? MainActivity)?.pushView(AppearanceFragment.withFocusedPreference(getString(R.string.pref_key_attendance_target)))
-    }
-
-    override fun initView() {
-        with(binding.attendanceCalculatorRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = attendanceCalculatorAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-
-        with(binding) {
-            attendanceCalculatorSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-            attendanceCalculatorSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            attendanceCalculatorSwipe.setProgressBackgroundColorSchemeColor(
-                requireContext().getThemeAttrColor(
-                    R.attr.colorSwipeRefresh
-                )
-            )
-            attendanceCalculatorErrorRetry.setOnClickListener { presenter.onRetry() }
-            attendanceCalculatorErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        }
-    }
-
-    override fun updateData(data: List<AttendanceData>) {
-        with(attendanceCalculatorAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun clearView() {
-        with(attendanceCalculatorAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun showEmpty(show: Boolean) {
-        binding.attendanceCalculatorEmpty.isVisible = show
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.attendanceCalculatorError.isVisible = show
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.attendanceCalculatorErrorMessage.text = message
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.attendanceCalculatorProgress.isVisible = show
-    }
-
-    override fun enableSwipe(enable: Boolean) {
-        binding.attendanceCalculatorSwipe.isEnabled = enable
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.attendanceCalculatorRecycler.isVisible = show
-    }
-
-    override fun showRefresh(show: Boolean) {
-        binding.attendanceCalculatorSwipe.isRefreshing = show
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorPresenter.kt

@@ -1,94 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import io.github.wulkanowy.data.flatResourceFlow
-import io.github.wulkanowy.data.logResourceStatus
-import io.github.wulkanowy.data.onResourceData
-import io.github.wulkanowy.data.onResourceError
-import io.github.wulkanowy.data.onResourceIntermediate
-import io.github.wulkanowy.data.onResourceNotLoading
-import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.domain.attendance.GetAttendanceCalculatorDataUseCase
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import timber.log.Timber
-import javax.inject.Inject
-
-class AttendanceCalculatorPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
-    private val getAttendanceCalculatorData: GetAttendanceCalculatorDataUseCase,
-) : BasePresenter<AttendanceCalculatorView>(errorHandler, studentRepository) {
-
-    private lateinit var lastError: Throwable
-
-    override fun onAttachView(view: AttendanceCalculatorView) {
-        super.onAttachView(view)
-        view.initView()
-        Timber.i("Attendance calculator view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    fun onSwipeRefresh() {
-        Timber.i("Force refreshing the attendance calculator")
-        loadData(forceRefresh = true)
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun loadData(forceRefresh: Boolean = false) {
-        flatResourceFlow {
-            val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            getAttendanceCalculatorData(student, semester, forceRefresh)
-        }
-            .logResourceStatus("load attendance calculator")
-            .onResourceData {
-                view?.run {
-                    showProgress(false)
-                    showErrorView(false)
-                    showContent(it.isNotEmpty())
-                    showEmpty(it.isEmpty())
-                    updateData(it)
-                }
-            }
-            .onResourceIntermediate { view?.showRefresh(true) }
-            .onResourceNotLoading {
-                view?.run {
-                    enableSwipe(true)
-                    showRefresh(false)
-                    showProgress(false)
-                }
-            }
-            .onResourceError(errorHandler::dispatch)
-            .launch()
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
-    fun onSettingsSelected(): Boolean {
-        view?.openSettingsView()
-        return true
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/calculator/AttendanceCalculatorView.kt

@@ -1,31 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.calculator
-
-import io.github.wulkanowy.data.pojos.AttendanceData
-import io.github.wulkanowy.ui.base.BaseView
-
-interface AttendanceCalculatorView : BaseView {
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun showRefresh(show: Boolean)
-
-    fun showContent(show: Boolean)
-
-    fun showProgress(show: Boolean)
-
-    fun enableSwipe(enable: Boolean)
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun updateData(data: List<AttendanceData>)
-
-    fun clearView()
-
-    fun openSettingsView()
-}

app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt

@@ -5,7 +5,6 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemAttendanceSummaryBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderAttendanceSummaryBinding
 import io.github.wulkanowy.utils.calculatePercentage
@@ -14,13 +13,9 @@ import java.time.Month
 import java.util.Locale
 import javax.inject.Inject
 
-class AttendanceSummaryAdapter @Inject constructor(
+class AttendanceSummaryAdapter @Inject constructor() :
-    private val preferencesRepository: PreferencesRepository
-) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private val attendancePercentage = preferencesRepository.attendancePercentage
-
     private enum class ViewType(val id: Int) {
         HEADER(1),
         ITEM(2)
@@ -53,10 +48,7 @@ class AttendanceSummaryAdapter @Inject constructor(
     }
 
     private fun bindHeaderViewHolder(binding: ScrollableHeaderAttendanceSummaryBinding) {
-        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(
+        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(items.calculatePercentage())
-            attendancePercentage ?:
-            items.calculatePercentage()
-        )
     }
 
     private fun bindItemViewHolder(binding: ItemAttendanceSummaryBinding, position: Int) {
@@ -68,8 +60,8 @@ class AttendanceSummaryAdapter @Inject constructor(
                 else -> item.month.getFormattedName()
             }
             attendanceSummaryPercentage.text = when (position) {
-                -1 -> formatPercentage(attendancePercentage ?: item.calculatePercentage())
+                -1 -> formatPercentage(items.calculatePercentage())
-                else -> formatPercentage(attendancePercentage ?: item.calculatePercentage())
+                else -> formatPercentage(item.calculatePercentage())
             }
 
             attendanceSummaryPresent.text = item.presence.toString()

app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt

@@ -27,12 +27,8 @@ class AuthPresenter @Inject constructor(
 
     private fun loadName() {
         presenterScope.launch {
-            runCatching {
+            runCatching { studentRepository.getCurrentStudent(false) }
-                studentRepository.getCurrentStudent(false)
+                .onSuccess { view?.showDescriptionWithName(it.studentName) }
-                    .studentName
-                    .replace(" ", "\u00A0")
-            }
-                .onSuccess { view?.showDescriptionWithName(it) }
                 .onFailure { errorHandler.dispatch(it) }
         }
     }

app/src/main/java/io/github/wulkanowy/ui/modules/captcha/CaptchaDialog.kt

@@ -59,7 +59,7 @@ class CaptchaDialog : BaseDialogFragment<DialogCaptchaBinding>() {
             webView = this
             with(settings) {
                 javaScriptEnabled = true
-                userAgentString = wulkanowySdkFactory.createBase().userAgent
+                userAgentString = wulkanowySdkFactory.create().userAgent
             }
 
             webViewClient = object : WebViewClient() {

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt

@@ -30,7 +30,6 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.notificationscenter.NotificationsCenterFragment
-import io.github.wulkanowy.ui.modules.panicmode.PanicModeFragment
 import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import io.github.wulkanowy.utils.capitalise
@@ -126,7 +125,6 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
                 mainActivity.pushView(ConferenceFragment.newInstance())
             }
             onAdminMessageClickListener = presenter::onAdminMessageSelected
-            onPanicButtonClickListener = presenter::onPanicButtonClicked
             onAdminMessageDismissClickListener = presenter::onAdminMessageDismissed
 
             registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
@@ -210,11 +208,7 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
                 binding = binding.dashboardErrorAdminMessage,
                 onAdminMessageDismissClickListener = presenter::onAdminMessageDismissed,
                 onAdminMessageClickListener = presenter::onAdminMessageSelected,
-                onPanicButtonClickListener = presenter::onPanicButtonClicked,
+            ).bind(adminMessageItem.adminMessage)
-            ).bind(
-                item = adminMessageItem.adminMessage,
-                showPanicButton = true,
-            )
         }
     }
 
@@ -242,10 +236,6 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
         requireContext().openInternetBrowser(url)
     }
 
-    override fun openPanicWebView(url: String) {
-        (requireActivity() as MainActivity).pushView(PanicModeFragment.newInstance(url))
-    }
-
     override fun onDestroyView() {
         dashboardAdapter.clearTimers()
         presenter.onDetachView()

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt

@@ -147,17 +147,6 @@ sealed class DashboardItem(val type: Type) {
         EXAMS,
         CONFERENCES,
     }
-
-    enum class HiddenAttendanceTile {
-        UNEXCUSED_ABSENCE,
-        EXEMPTION,
-        EXCUSED_LATENESS,
-        UNEXCUSED_LATENESS,
-        PRESENT,
-        DELETED,
-        EXCUSED_ABSENCE,
-        UNKNOWN,
-    }
 }
 
 fun DashboardItem.Tile.toDashboardItemType() = when (this) {

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt

@@ -11,7 +11,6 @@ import io.github.wulkanowy.data.errorOrNull
 import io.github.wulkanowy.data.flatResourceFlow
 import io.github.wulkanowy.data.mapResourceData
 import io.github.wulkanowy.data.onResourceError
-import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
 import io.github.wulkanowy.data.repositories.ConferenceRepository
 import io.github.wulkanowy.data.repositories.ExamRepository
@@ -24,7 +23,6 @@ import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
-import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 import io.github.wulkanowy.domain.timetable.IsStudentHasLessonsOnWeekendUseCase
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -46,7 +44,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import timber.log.Timber
 import java.time.Instant
 import java.time.LocalDate
@@ -285,26 +282,8 @@ class DashboardPresenter @Inject constructor(
         url?.let { view?.openInternetBrowser(it) }
     }
 
-    fun onPanicButtonClicked() {
-        resourceFlow { studentRepository.getCurrentStudent() }
-            .onResourceError { errorHandler.dispatch(it) }
-            .onResourceSuccess {
-                val baseUrl = it.scrapperBaseUrl.toHttpUrl()
-                val urlToOpen = baseUrl.newBuilder()
-                    .host("uonetplus${it.scrapperDomainSuffix}.${baseUrl.host}")
-                    .addPathSegment(it.symbol)
-                    .build()
-                    .toString()
-
-                view?.openPanicWebView(urlToOpen)
-            }
-            .launch("panic_button")
-    }
-
     private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) {
         flow {
-            val attendancePercentage = preferencesRepository.attendancePercentage
-
             val selectedTiles = selectedDashboardTiles
             val flowSuccess = flowOf(Resource.Success(null))
 
@@ -357,7 +336,7 @@ class DashboardPresenter @Inject constructor(
                             } else null
                         },
                         attendancePercentage = DashboardItem.HorizontalGroup.Cell(
-                            data = attendancePercentage ?: attendanceResource.dataOrNull?.calculatePercentage(),
+                            data = attendanceResource.dataOrNull?.calculatePercentage(),
                             error = attendanceResource.errorOrNull != null,
                             isLoading = attendanceResource is Resource.Loading,
                         ),

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardView.kt

@@ -31,6 +31,4 @@ interface DashboardView : BaseView {
     fun openNotificationsCenterView()
 
     fun openInternetBrowser(url: String)
-
-    fun openPanicWebView(url: String)
 }

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt

@@ -59,8 +59,6 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
 
     var onAdminMessageClickListener: (String?) -> Unit = {}
 
-    var onPanicButtonClickListener: () -> Unit = {}
-
     var onAdminMessageDismissClickListener: (AdminMessage) -> Unit = {}
 
     val items = mutableListOf<DashboardItem>()
@@ -88,46 +86,35 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             DashboardItem.Type.ACCOUNT.ordinal -> AccountViewHolder(
                 ItemDashboardAccountBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.HORIZONTAL_GROUP.ordinal -> HorizontalGroupViewHolder(
                 ItemDashboardHorizontalGroupBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.GRADES.ordinal -> GradesViewHolder(
                 ItemDashboardGradesBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.LESSONS.ordinal -> LessonsViewHolder(
                 ItemDashboardLessonsBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.HOMEWORK.ordinal -> HomeworkViewHolder(
                 ItemDashboardHomeworkBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.ANNOUNCEMENTS.ordinal -> AnnouncementsViewHolder(
                 ItemDashboardAnnouncementsBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.EXAMS.ordinal -> ExamsViewHolder(
                 ItemDashboardExamsBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.CONFERENCES.ordinal -> ConferencesViewHolder(
                 ItemDashboardConferencesBinding.inflate(inflater, parent, false)
             )
-
             DashboardItem.Type.ADMIN_MESSAGE.ordinal -> AdminMessageViewHolder(
                 ItemDashboardAdminMessageBinding.inflate(inflater, parent, false),
                 onAdminMessageDismissClickListener = onAdminMessageDismissClickListener,
                 onAdminMessageClickListener = onAdminMessageClickListener,
-                onPanicButtonClickListener = onPanicButtonClickListener,
             )
-
             DashboardItem.Type.ADS.ordinal -> AdsViewHolder(
                 ItemDashboardAdsBinding.inflate(inflater, parent, false)
             )
-
             else -> throw IllegalArgumentException()
         }
     }
@@ -142,11 +129,7 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             is AnnouncementsViewHolder -> bindAnnouncementsViewHolder(holder, position)
             is ExamsViewHolder -> bindExamsViewHolder(holder, position)
             is ConferencesViewHolder -> bindConferencesViewHolder(holder, position)
-            is AdminMessageViewHolder -> holder.bind(
+            is AdminMessageViewHolder -> holder.bind((items[position] as DashboardItem.AdminMessages).adminMessage)
-                (items[position] as DashboardItem.AdminMessages).adminMessage,
-                showPanicButton = true
-            )
-
             is AdsViewHolder -> bindAdsViewHolder(holder, position)
         }
     }
@@ -257,15 +240,12 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             attendancePercentage == null || attendancePercentage == .0 -> {
                 root.context.getThemeAttrColor(R.attr.colorOnSurface)
             }
-
             attendancePercentage <= ATTENDANCE_SECOND_WARNING_THRESHOLD -> {
                 root.context.getThemeAttrColor(R.attr.colorPrimary)
             }
-
             attendancePercentage <= ATTENDANCE_FIRST_WARNING_THRESHOLD -> {
                 root.context.getThemeAttrColor(R.attr.colorTimetableChange)
             }
-
             else -> root.context.getThemeAttrColor(R.attr.colorOnSurface)
         }
         val attendanceString = if (attendancePercentage == null || attendancePercentage == .0) {
@@ -356,28 +336,24 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                     binding.dashboardLessonsItemTitleTomorrow.isVisible = false
                     binding.dashboardLessonsItemTitleTodayAndTomorrow.isVisible = false
                 }
-
                 tomorrowTimetable.isNotEmpty() -> {
                     dateToNavigate = tomorrowDate
                     updateLessonView(item, tomorrowTimetable, binding)
                     binding.dashboardLessonsItemTitleTomorrow.isVisible = true
                     binding.dashboardLessonsItemTitleTodayAndTomorrow.isVisible = false
                 }
-
                 currentDayHeader != null && currentDayHeader.content.isNotBlank() -> {
                     dateToNavigate = currentDate
                     updateLessonView(item, emptyList(), binding, currentDayHeader)
                     binding.dashboardLessonsItemTitleTomorrow.isVisible = false
                     binding.dashboardLessonsItemTitleTodayAndTomorrow.isVisible = false
                 }
-
                 tomorrowDayHeader != null && tomorrowDayHeader.content.isNotBlank() -> {
                     dateToNavigate = tomorrowDate
                     updateLessonView(item, emptyList(), binding, tomorrowDayHeader)
                     binding.dashboardLessonsItemTitleTomorrow.isVisible = true
                     binding.dashboardLessonsItemTitleTodayAndTomorrow.isVisible = false
                 }
-
                 else -> {
                     dateToNavigate = currentDate
                     updateLessonView(item, emptyList(), binding)
@@ -485,7 +461,6 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                     firstTitleText =
                         context.getString(R.string.dashboard_timetable_first_lesson_title_moment)
                 }
-
                 minutesToStartLesson < 240 -> {
                     firstTitleAndValueTextColor =
                         context.getThemeAttrColor(R.attr.colorOnSurface)
@@ -493,7 +468,6 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                     firstTitleText =
                         context.getString(R.string.dashboard_timetable_first_lesson_title_soon)
                 }
-
                 else -> {
                     firstTitleAndValueTextColor =
                         context.getThemeAttrColor(R.attr.colorOnSurface)

app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/viewholders/AdminMessageViewHolder.kt

@@ -13,10 +13,9 @@ class AdminMessageViewHolder(
     private val binding: ItemDashboardAdminMessageBinding,
     private val onAdminMessageDismissClickListener: (AdminMessage) -> Unit,
     private val onAdminMessageClickListener: (String?) -> Unit,
-    private val onPanicButtonClickListener: () -> Unit,
 ) : RecyclerView.ViewHolder(binding.root) {
 
-    fun bind(item: AdminMessage?, showPanicButton: Boolean = false) {
+    fun bind(item: AdminMessage?) {
         item ?: return
 
         val context = binding.root.context
@@ -49,14 +48,10 @@ class AdminMessageViewHolder(
             dashboardAdminMessageItemClose.setOnClickListener {
                 onAdminMessageDismissClickListener(item)
             }
-            dashboardPanicSection.root.isVisible = showPanicButton
-            dashboardPanicSection.dashboardPanicButton.setOnClickListener {
-                onPanicButtonClickListener()
-            }
 
-            dashboardAdminMessage.setCardBackgroundColor(backgroundColor?.let { ColorStateList.valueOf(it) })
+            root.setCardBackgroundColor(backgroundColor?.let { ColorStateList.valueOf(it) })
             item.destinationUrl?.let { url ->
-                dashboardAdminMessage.setOnClickListener { onAdminMessageClickListener(url) }
+                root.setOnClickListener { onAdminMessageClickListener(url) }
             }
         }
     }

app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt

@@ -26,7 +26,5 @@ private fun generateSummary(subject: String, predicted: String, final: String) =
     proposedPoints = "",
     finalPoints = "",
     pointsSum = "",
-    average = .0,
+    average = .0
-    pointsSumAllYear = null,
-    averageAllYear = null,
 )

app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt

@@ -19,6 +19,6 @@ val debugSchoolAnnouncementItems = listOf(
 private fun generateAnnouncement(subject: String, content: String) = SchoolAnnouncement(
     subject = subject,
     content = content,
-    studentId = 0,
+    userLoginId = 0,
     date = LocalDate.now()
 )

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt

@@ -6,6 +6,6 @@ enum class GradeAverageMode(val value: String) {
     BOTH_SEMESTERS("both_semesters");
 
     companion object {
-        fun getByValue(value: String) = entries.firstOrNull { it.value == value } ?: ONE_SEMESTER
+        fun getByValue(value: String) = values().firstOrNull { it.value == value } ?: ONE_SEMESTER
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt

@@ -266,9 +266,7 @@ class GradeAverageProvider @Inject constructor(
                 proposedPoints = "",
                 finalPoints = "",
                 pointsSum = "",
-                pointsSumAllYear = null,
+                average = .0
-                average = .0,
-                averageAllYear = null,
             )
         }
 
@@ -296,15 +294,13 @@ class GradeAverageProvider @Inject constructor(
                 proposedPoints = "",
                 finalPoints = "",
                 pointsSum = "",
-                pointsSumAllYear = null,
                 average = when {
                     calcAverage -> details
                         .updateModifiers(student, params)
                         .calcAverage(isOptionalArithmeticAverage = params.isOptionalArithmeticAverage)
 
                     else -> .0
-                },
+                }
-                averageAllYear = null,
             )
         }
     }

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt

@@ -96,11 +96,9 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
             ViewType.HEADER.id -> HeaderViewHolder(
                 HeaderGradeDetailsBinding.inflate(inflater, parent, false)
             )
-
             ViewType.ITEM.id -> ItemViewHolder(
                 ItemGradeDetailsBinding.inflate(inflater, parent, false)
             )
-
             else -> throw IllegalStateException()
         }
     }
@@ -112,7 +110,6 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
                 header = items[position].value as GradeDetailsHeader,
                 position = position
             )
-
             is ItemViewHolder -> bindItemViewHolder(
                 holder = holder,
                 grade = items[position].value as Grade
@@ -136,10 +133,6 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
                 maxLines = if (expandedPositions[headerPosition]) 2 else 1
             }
             gradeHeaderAverage.text = formatAverage(header.average, root.context.resources)
-            with(gradeHeaderAverageAllYear) {
-                isVisible = header.averageAllYear != null && header.averageAllYear != .0
-                text = formatAverageAllYear(header.averageAllYear, root.context.resources)
-            }
             gradeHeaderPointsSum.text =
                 context.getString(R.string.grade_points_sum, header.pointsSum)
             gradeHeaderPointsSum.isVisible = !header.pointsSum.isNullOrEmpty()
@@ -240,13 +233,6 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
             resources.getString(R.string.grade_average, average)
         }
 
-    private fun formatAverageAllYear(average: Double?, resources: Resources) =
-        if (average == null || average == .0) {
-            resources.getString(R.string.grade_no_average)
-        } else {
-            resources.getString(R.string.grade_average_year, average)
-        }
-
     private class HeaderViewHolder(val binding: HeaderGradeDetailsBinding) :
         RecyclerView.ViewHolder(binding.root)
 

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt

@@ -13,7 +13,6 @@ data class GradeDetailsItem(
 data class GradeDetailsHeader(
     val subject: String,
     val average: Double?,
-    val averageAllYear: Double?,
     val pointsSum: String?,
     val grades: List<GradeDetailsItem>
 ) {

app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt

@@ -226,9 +226,8 @@ class GradeDetailsPresenter @Inject constructor(
                         GradeDetailsHeader(
                             subject = gradeSubject.subject,
                             average = gradeSubject.average,
-                            averageAllYear = gradeSubject.summary.averageAllYear,
                             pointsSum = gradeSubject.points,
-                            grades = subItems,
+                            grades = subItems
                         ).apply {
                             newGrades = gradeSubject.grades.filter { grade -> !grade.isRead }.size
                         }, ViewType.HEADER

app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt

@@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.modules.grade.summary
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
@@ -66,55 +65,37 @@ class GradeSummaryAdapter @Inject constructor(
         val gradeSummaries = items
             .filter { it.gradeDescriptive == null }
             .map { it.gradeSummary }
-        val isSecondSemester = items.any { item ->
-            item.gradeSummary.let { it.averageAllYear != null && it.averageAllYear != .0 }
-        }
 
         val context = binding.root.context
         val finalItemsCount = gradeSummaries.count { isGradeValid(it.finalGrade) }
-        val calculatedSemesterItemsCount = gradeSummaries.count { value -> value.average != 0.0 }
+        val calculatedItemsCount = gradeSummaries.count { value -> value.average != 0.0 }
-        val calculatedAnnualItemsCount =
-            gradeSummaries.count { value -> value.averageAllYear != 0.0 }
         val allItemsCount = gradeSummaries.count { !it.subject.equals("zachowanie", true) }
         val finalAverage = gradeSummaries.calcFinalAverage(
-            plusModifier = preferencesRepository.gradePlusModifier,
+            preferencesRepository.gradePlusModifier,
-            minusModifier = preferencesRepository.gradeMinusModifier,
+            preferencesRepository.gradeMinusModifier
         )
-        val calculatedSemesterAverage = gradeSummaries.filter { value -> value.average != 0.0 }
+        val calculatedAverage = gradeSummaries.filter { value -> value.average != 0.0 }
             .map { values -> values.average }
             .reversed() // fix average precision
             .average()
             .let { if (it.isNaN()) 0.0 else it }
-        val calculatedAnnualAverage = gradeSummaries.filter { value -> value.averageAllYear != 0.0 }
-            .mapNotNull { values -> values.averageAllYear }
-            .reversed() // fix average precision
-            .average()
-            .let { if (it.isNaN()) 0.0 else it }
 
         with(binding) {
-            gradeSummaryScrollableHeaderCalculated.text = formatAverage(calculatedSemesterAverage)
-            gradeSummaryScrollableHeaderCalculatedAnnual.text =
-                formatAverage(calculatedAnnualAverage)
             gradeSummaryScrollableHeaderFinal.text = formatAverage(finalAverage)
-            gradeSummaryScrollableHeaderFinalSubjectCount.text = context.getString(
+            gradeSummaryScrollableHeaderCalculated.text = formatAverage(calculatedAverage)
-                R.string.grade_summary_from_subjects,
+            gradeSummaryScrollableHeaderFinalSubjectCount.text =
-                finalItemsCount,
+                context.getString(
-                allItemsCount
+                    R.string.grade_summary_from_subjects,
-            )
+                    finalItemsCount,
+                    allItemsCount
+                )
             gradeSummaryScrollableHeaderCalculatedSubjectCount.text = context.getString(
                 R.string.grade_summary_from_subjects,
-                calculatedSemesterItemsCount,
+                calculatedItemsCount,
                 allItemsCount
             )
-            gradeSummaryScrollableHeaderCalculatedSubjectCountAnnual.text = context.getString(
-                R.string.grade_summary_from_subjects,
-                calculatedAnnualItemsCount,
-                allItemsCount
-            )
-            gradeSummaryScrollableHeaderCalculatedAnnualContainer.isVisible = isSecondSemester
 
             gradeSummaryCalculatedAverageHelp.setOnClickListener { onCalculatedHelpClickListener() }
-            gradeSummaryCalculatedAverageHelpAnnual.setOnClickListener { onCalculatedHelpClickListener() }
             gradeSummaryFinalAverageHelp.setOnClickListener { onFinalHelpClickListener() }
         }
     }
@@ -126,12 +107,7 @@ class GradeSummaryAdapter @Inject constructor(
         with(binding) {
             gradeSummaryItemTitle.text = gradeSummary.subject
             gradeSummaryItemPoints.text = gradeSummary.pointsSum
-
             gradeSummaryItemAverage.text = formatAverage(gradeSummary.average, "")
-            gradeSummaryItemAverageAllYear.text = gradeSummary.averageAllYear?.let {
-                formatAverage(it, "")
-            }
-
             gradeSummaryItemPredicted.text =
                 "${gradeSummary.predictedGrade} ${gradeSummary.proposedPoints}".trim()
             gradeSummaryItemFinal.text =
@@ -140,12 +116,6 @@ class GradeSummaryAdapter @Inject constructor(
                 root.context.getString(R.string.all_no_data)
             }
 
-            gradeSummaryItemAverageContainer.isVisible = gradeSummary.average != .0
-            gradeSummaryItemAverageDivider.isVisible = gradeSummaryItemAverageContainer.isVisible
-            gradeSummaryItemAverageAllYearContainer.isGone =
-                gradeSummary.averageAllYear == null || gradeSummary.averageAllYear == .0
-            gradeSummaryItemAverageAllYearDivider.isGone =
-                gradeSummaryItemAverageAllYearContainer.isGone
             gradeSummaryItemFinalDivider.isVisible = gradeDescriptive == null
             gradeSummaryItemPredictedDivider.isVisible = gradeDescriptive == null
             gradeSummaryItemPointsDivider.isVisible = gradeDescriptive == null
@@ -153,7 +123,6 @@ class GradeSummaryAdapter @Inject constructor(
             gradeSummaryItemFinalContainer.isVisible = gradeDescriptive == null
             gradeSummaryItemDescriptiveContainer.isVisible = gradeDescriptive != null
             gradeSummaryItemPointsContainer.isVisible = gradeSummary.pointsSum.isNotBlank()
-            gradeSummaryItemPointsDivider.isVisible = gradeSummaryItemPointsContainer.isVisible
         }
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt

@@ -118,6 +118,5 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     override fun onResume() {
         super.onResume()
         inAppUpdateHelper.onResume()
-        presenter.updateSdkMappings()
     }
 }