Merge branch 'release/1.2.1'

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Utwórz raport błędu, aby pomóc nam ulepszyć Wulkanowego
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 ## Co powinno się dziać
 
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Zaproponuj nowy pomysł dla Wulkanowego
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+** Czy Twoja prośba o funkcję jest związana z problemem? Proszę opisz.**
+Jasny i zwięzły opis problemu. Np. Zawsze jestem sfrustrowany, gdy [...]
+
+** Opisz żądane rozwiązanie **
+Jasny i zwięzły opis tego, co chcesz, aby się wydarzyło.
+
+** Opisz alternatywy, które rozważałeś **
+Jasny i zwięzły opis wszelkich rozważanych alternatywnych rozwiązań lub funkcji.
+
+** Dodatkowy kontekst **
+Dodaj inny kontekst lub zrzuty ekranu dotyczące żądania funkcji tutaj.

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: gradle
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+  target-branch: develop
+  ignore:
+    - dependency-name: io.github.wulkanowy:sdk
+  reviewers:
+  - Faierbel

.github/workflows/deploy-store.yml

@@ -0,0 +1,74 @@
+name: Deploy to app stores
+
+on:
+  release:
+    types: [ created ]
+
+jobs:
+
+  deploy-google-play:
+    name: Deploy to google play
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: google-play
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Decrypt keys
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
+      - name: Upload apk to google play
+        env:
+          PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
+          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
+          PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
+          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
+        run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
+
+  deploy-app-gallery:
+    name: Deploy to AppGallery
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: app-gallery
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Decrypt keys
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+          SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
+          gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
+      - name: 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_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
+          PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
+          PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
+        run: ./gradlew assembleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace

.github/workflows/deploy-test.yml

@@ -0,0 +1,144 @@
+name: Deploy to app tests
+
+on:
+  push:
+#    branches: [ develop ]
+    branches: [ '!*' ]
+  pull_request_target:
+#    branches: [ develop ]
+    branches: [ '!*' ]
+
+  workflow_dispatch:
+
+jobs:
+
+  deploy-appcenter:
+    name: App Center
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: app-center
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Set run number with offset
+        env:
+          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
+        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
+      - name: Prepare build configuration
+        run: |
+          sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle
+          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/google-services.json
+          sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/src/debug/agconnect-services.json
+          sed -i -e '/versionNameSuffix/d' app/build.gradle
+      - name: Add signing config
+        run: |
+          cat >> app/build.gradle <<EOF
+          android.signingConfigs.debug {
+              storeFile file("bitrise.jks")
+              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
+              keyAlias System.getenv("BITRISE_KEY_ALIAS")
+              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
+          }
+          EOF
+      - name: Decrypt keys
+        env:
+          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
+      - name: Bump version
+        uses: chkfung/android-version-actions@v1.1
+        with:
+          gradlePath: app/build.gradle
+          versionCode: ${{ env.RUN_NUMBER }}
+          versionName: ${{ env.RUN_NUMBER }}-${{ github.head_ref }}
+      - name: Build apk
+        env:
+          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
+          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
+          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
+        run: ./gradlew assembleFdroidDebug --stacktrace
+      - name: Upload apk to github artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
+          path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
+      - name: Deploy to app center
+        uses: wzieba/AppCenter-Github-Action@v1
+        with:
+          appName: wulkanowy/wulkanowy
+          token: ${{ secrets.APP_CENTER_TOKEN }}
+          group: Testers
+          file: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
+          notifyTesters: true
+          debug: true
+
+  deploy-app-distribution:
+    name: App Distribution
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    environment: app-distribution
+    if: github.event_name != 'pull_request_target'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+      - name: Set run number with offset
+        env:
+          BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }}
+        run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV
+      - name: Add signing config
+        run: |
+          cat >> app/build.gradle <<EOF
+          android.signingConfigs.debug {
+              storeFile file("bitrise.jks")
+              storePassword System.getenv("BITRISE_KEYSTORE_PASSWORD")
+              keyAlias System.getenv("BITRISE_KEY_ALIAS")
+              keyPassword System.getenv("BITRISE_KEY_PASSWORD")
+          }
+          EOF
+      - name: Decrypt keys
+        env:
+          BITRISE_ENCRYPT_KEY: ${{ secrets.BITRISE_ENCRYPT_KEY }}
+          BITRISE_SERVICES_ENCRYPT_KEY: ${{ secrets.BITRISE_SERVICES_ENCRYPT_KEY }}
+        run: |
+          gpg --yes --batch --passphrase=$BITRISE_SERVICES_ENCRYPT_KEY ./app/src/debug/google-services.json.gpg
+          gpg --yes --batch --passphrase=$BITRISE_ENCRYPT_KEY ./app/bitrise.jks.gpg
+      - name: Bump version
+        uses: chkfung/android-version-actions@v1.1
+        with:
+          gradlePath: app/build.gradle
+          versionCode: ${{ env.RUN_NUMBER }}
+          versionName: ${{ env.RUN_NUMBER }}
+      - name: Build apk
+        env:
+          BITRISE_KEYSTORE_PASSWORD: ${{ secrets.BITRISE_KEYSTORE_PASSWORD }}
+          BITRISE_KEY_ALIAS: ${{ secrets.BITRISE_KEY_ALIAS }}
+          BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
+        run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
+      - name: Upload apk to github artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
+          path: app/build/outputs/apk/play/debug/app-play-debug.apk
+      - name: Deploy to app distribution
+        uses: wzieba/Firebase-Distribution-Github-Action@v1
+        with:
+          appId: ${{ secrets.FIREBASE_APP_ID }}
+          token: ${{ secrets.FIREBASE_TOKEN }}
+          groups: discord
+          file: app/build/outputs/apk/play/debug/app-play-debug.apk

.github/workflows/test.yml

@@ -1,48 +1,21 @@
-name: Test and deploy
+name: Tests
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ master, develop ]
     tags: [ '*' ]
   pull_request:
-    branches: [ develop ]
-
-  workflow_dispatch:
+    branches: [ master, develop ]
 
 jobs:
-  build:
-    name: Pre-build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: fkirc/skip-duplicate-actions@master
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-      - name: Build
-        run: ./gradlew --build-cache compileFdroidDebugUnitTestKotlin preFdroidDebugAndroidTestBuild dexBuilderFdroidDebugAndroidTest packageFdroidDebug packageFdroidDebugAndroidTest
-      - name: Prepare build cache
-        run: tar -cf prebuild.tar .build-cache .gradle app/build
-      - uses: actions/upload-artifact@v2
-        with:
-          name: prebuild.tar
-          path: prebuild.tar
-
   unit-tests:
       name: Unit tests
       runs-on: ubuntu-latest
       timeout-minutes: 10
-      needs: [ build ]
       steps:
+        - uses: fkirc/skip-duplicate-actions@master
         - uses: actions/checkout@v2
+        - uses: gradle/wrapper-validation-action@v1
         - uses: actions/setup-java@v1
           with:
             java-version: 11
@@ -52,91 +25,10 @@ jobs:
               ~/.gradle/caches
               ~/.gradle/wrapper
             key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - uses: actions/download-artifact@v2
-          with:
-            name: prebuild.tar
-        - name: Extract build cache
-          run: tar -xf prebuild.tar
         - name: Unit tests
           run: |
-            ./gradlew --build-cache -Pcoverage testFdroidDebugUnitTest --stacktrace
-            ./gradlew --build-cache -Pcoverage jacocoTestReport --stacktrace
+            ./gradlew testFdroidDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
         - uses: codecov/codecov-action@v1
           with:
               flags: unit
-
-  instrumentation-tests:
-      name: Instrumentation tests
-      runs-on: macOS-latest
-      timeout-minutes: 15
-      needs: [ build ]
-      strategy:
-          fail-fast: true
-          matrix:
-              api-level: [21, 29]
-      steps:
-          - uses: actions/checkout@v2
-          - uses: actions/setup-java@v1
-            with:
-                java-version: 11
-          - uses: actions/cache@v2
-            with:
-              path: |
-                ~/.gradle/caches
-                ~/.gradle/wrapper
-              key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-          - uses: actions/download-artifact@v2
-            with:
-              name: prebuild.tar
-          - name: Extract build cache
-            run: tar -xf prebuild.tar
-          - name: Instrumentation tests
-            uses: reactivecircus/android-emulator-runner@v2
-            with:
-                api-level: ${{ matrix.api-level }}
-                arch: x86
-                script: |
-                  ./gradlew --build-cache -Pcoverage connectedFdroidDebugAndroidTest --stacktrace
-                  ./gradlew --build-cache -Pcoverage jacocoTestReport --stacktrace
-          - uses: codecov/codecov-action@v1
-            with:
-                flags: instrumented,api-${{ matrix.api-level }}
-
-  deploy-google-play:
-      name: Deploy to google play
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      environment: google-play
-      needs: [ build, unit-tests, instrumentation-tests ]
-      if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-      steps:
-        - uses: actions/checkout@v2
-        - uses: actions/setup-java@v1
-          with:
-            java-version: 11
-        - uses: actions/cache@v2
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - uses: actions/download-artifact@v2
-          with:
-            name: prebuild.tar
-        - name: Extract build cache
-          run: tar -xf prebuild.tar
-        - name: Decrypt keys
-          env:
-            ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-            SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-          run: |
-            gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg
-            gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
-            gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-        - name: Upload apk to google play
-          env:
-            PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-            PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-            PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
-            PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;

.gitignore

@@ -117,3 +117,5 @@ Thumbs.db
 
 
 app/src/release/agconnect-services.json
+app/src/release/agconnect-credentials.json
+.idea/deploymentTargetDropDown.xml

.idea/codeStyles/Project.xml

@@ -7,15 +7,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />

README.en.md

@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Test%20and%20deploy/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)

README.md

@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Test%20and%20deploy/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
@@ -32,7 +32,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 * powiadomienia np. o nowej ocenie
 * obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
 * ciemny i czarny (AMOLED) motyw
-* tryb offilne
+* tryb offline
 * brak reklam
 
 ## Pobierz

app/build.gradle

@@ -1,26 +1,28 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
+apply plugin: 'com.huawei.agconnect'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 17
+        minSdkVersion 21
         targetSdkVersion 30
-        versionCode 85
-        versionName "1.0.1"
-        multiDexEnabled true
+        versionCode 94
+        versionName "1.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
@@ -41,7 +43,8 @@ android {
     }
 
     sourceSets {
-        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
+        // https://github.com/robolectric/robolectric/issues/3928#issuecomment-395309991
+        debug.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -64,7 +67,6 @@ android {
             resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = project.hasProperty('coverage')
             ext.enableCrashlytics = project.hasProperty("enableFirebase")
         }
     }
@@ -74,7 +76,6 @@ android {
     productFlavors {
         hms {
             dimension "platform"
-            minSdkVersion 19
             manifestPlaceholders = [
                     install_channel: "AppGallery"
             ]
@@ -96,21 +97,21 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
     }
 
-    lintOptions {
-        disable 'HardwareIds'
+    testOptions.unitTests {
+        includeAndroidResources = true
     }
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
         freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
@@ -124,53 +125,66 @@ android {
     }
 }
 
+kapt {
+    correctErrorTypes true
+}
+
 play {
     serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
     serviceAccountCredentials = file('key.p12')
     defaultToAppBundles = false
-    track = 'alpha'
+    track = 'production'
     updatePriority = 3
 }
 
+huaweiPublish {
+    instances {
+        hmsRelease {
+            credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
+            buildFormat = "apk"
+            deployType = "draft"
+        }
+    }
+}
+
 ext {
     work_manager = "2.5.0"
-    work_hilt = "1.0.0-alpha03"
-    room = "2.3.0-beta01"
-    chucker = "3.4.0"
-    mockk = "1.10.6"
-    moshi = "1.11.0"
+    android_hilt = "1.0.0"
+    room = "2.3.0"
+    chucker = "3.5.2"
+    mockk = "1.12.0"
+    moshi = "1.12.0"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.0.1"
+    implementation "io.github.wulkanowy:sdk:1.2.1"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
 
-    implementation "androidx.core:core-ktx:1.3.2"
-    implementation "androidx.activity:activity-ktx:1.1.0"
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.appcompat:appcompat-resources:1.2.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.5"
-    implementation "androidx.annotation:annotation:1.1.0"
-    implementation "androidx.multidex:multidex:2.0.1"
+    implementation "androidx.core:core-ktx:1.6.0"
+    implementation "androidx.activity:activity-ktx:1.3.1"
+    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "androidx.appcompat:appcompat-resources:1.3.1"
+    implementation "androidx.fragment:fragment-ktx:1.3.6"
+    implementation "androidx.annotation:annotation:1.2.0"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.viewpager:viewpager:1.0.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.3.0"
-    implementation "com.github.wulkanowy:material-chips-input:2.1.1"
+    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.github.wulkanowy:material-chips-input:2.2.0"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
+    implementation 'com.github.lopspower:CircularImageView:4.2.0'
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -178,54 +192,56 @@ dependencies {
 
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-    implementation "androidx.hilt:hilt-work:$work_hilt"
-    kapt "androidx.hilt:hilt-compiler:$work_hilt"
+    kapt "androidx.hilt:hilt-compiler:$android_hilt"
+    implementation "androidx.hilt:hilt-work:$android_hilt"
 
-    implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation 'com.github.ncapdevi:FragNav:3.3.0'
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
     implementation "com.squareup.moshi:moshi:$moshi"
     implementation "com.squareup.moshi:moshi-adapters:$moshi"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi"
-    implementation "com.jakewharton.timber:timber:4.7.1"
+
+    implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "fr.bipi.treessence:treessence:0.3.2"
+    implementation 'com.github.bastienpaulfr:Treessence:1.0.4'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
-    implementation "io.coil-kt:coil:1.1.1"
+    implementation "io.coil-kt:coil:1.3.2"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.3.1'
+    implementation 'com.fredporciuncula:flow-preferences:1.5.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:26.4.0')
+    playImplementation platform('com.google.firebase:firebase-bom:28.4.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
-    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx'
-    playImplementation "com.google.firebase:firebase-inappmessaging-ktx"
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
+    playImplementation 'com.google.android.play:core:1.10.1'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:5.1.0.301'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.5.0.200'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.2.0.301'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
     debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
+    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:v1.0.6'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.2'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    androidTestImplementation "androidx.test:core:1.3.0"
-    androidTestImplementation "androidx.test:runner:1.3.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    testImplementation 'org.robolectric:robolectric:4.6.1'
+    testImplementation "androidx.test:runner:1.4.0"
+    testImplementation "androidx.test.ext:junit:1.1.3"
+    testImplementation "androidx.test:core:1.4.0"
+    testImplementation "androidx.room:room-testing:$room"
+    testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
+    kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
+
+    androidTestImplementation "androidx.test:core:1.4.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
-    androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }
-
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.huawei.agconnect'

app/jacoco.gradle

@@ -1,8 +1,8 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.5"
-    reportsDir = file("$buildDir/reports")
+    toolVersion "0.8.7"
+    reportsDirectory.set(file("$buildDir/reports"))
 }
 
 tasks.withType(Test) {
@@ -16,8 +16,8 @@ task jacocoTestReport(type: JacocoReport) {
     description = "Generate Jacoco coverage reports"
 
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
 
     def excludes = ['**/R.class',

app/proguard-rules.pro

@@ -1,33 +1,21 @@
-# Optimizations
--optimizationpasses 5
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontskipnonpubliclibraryclassmembers
--dontpreverify
+# General
 -dontobfuscate
--allowaccessmodification
--repackageclasses ''
--verbose
 
 
-#Keep all wulkanowy files
+#Config for wulkanowy
 -keep class io.github.wulkanowy.** {*;}
 
 
-#Config for anallitycs
--keepattributes *Annotation*
+#Config for firebase crashlitycs
 -keepattributes SourceFile,LineNumberTable
--keep class com.crashlytics.** {*;}
 -keep public class * extends java.lang.Exception
--dontwarn com.crashlytics.**
 
 
-#Config for OkHttp
+#Config for Okio and OkHttp
+-dontwarn javax.annotation.**
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
 -dontwarn org.codehaus.mojo.animal_sniffer.*
 -dontwarn okhttp3.internal.platform.ConscryptPlatform
--dontwarn javax.annotation.**
 
 
 #Config for MPAndroidChart
@@ -36,10 +24,3 @@
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
-
-
-#Config for About Libraries
--keep class .R
--keep class **.R$* {
-    <fields>;
-}

app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt

@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import javax.inject.Singleton
+import javax.inject.Inject
+
+@Singleton
+class InAppReviewHelper @Inject constructor(
+    @ApplicationContext private val context: Context
+)  {
+
+    fun showInAppReview(activity: MainActivity) {
+        // do nothing
+    }
+}

app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt

@@ -3,11 +3,6 @@ package io.github.wulkanowy.utils
 import android.util.Log
 import com.huawei.agconnect.crash.AGConnectCrash
 import fr.bipi.tressence.base.FormatterPriorityTree
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
-import java.io.InterruptedIOException
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 
 class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
 
@@ -20,21 +15,10 @@ class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
     }
 }
 
-class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) {
+class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR, ExceptionFilter) {
 
     private val connectCrash by lazy { AGConnectCrash.getInstance() }
 
-    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
-        return when (t) {
-            is FeatureDisabledException,
-            is FeatureNotAvailableException,
-            is UnknownHostException,
-            is SocketTimeoutException,
-            is InterruptedIOException -> true
-            else -> super.skipLog(priority, tag, message, t)
-        }
-    }
-
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         if (skipLog(priority, tag, message, t)) return
 

app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt

@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class InAppReviewHelper @Inject constructor(
+    @ApplicationContext private val context: Context
+)  {
+
+    fun showInAppReview(activity: MainActivity) {
+        // do nothing
+    }
+}

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
@@ -56,7 +57,7 @@
             android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:theme="@style/WulkanowyTheme.Login"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.main.MainActivity"
@@ -68,7 +69,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:theme="@style/WulkanowyTheme.MessageSend"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
@@ -167,7 +168,7 @@
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_stat_push" />
+            android:resource="@drawable/ic_stat_all" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"

app/src/main/assets/contributors.json

@@ -36,7 +36,19 @@
     "githubUsername": "Luncenok"
   },
   {
-    "displayName": "MRmlik12",
+    "displayName": "Daniel Olczyk",
     "githubUsername": "MRmlik12"
+  },
+  {
+    "displayName": "Damian Czupryn",
+    "githubUsername": "Daxxxis"
+  },
+  {
+    "displayName": "Kamil Studziński",
+    "githubUsername": "studzinskik"
+  },
+  {
+    "displayName": "Tomasz F.",
+    "githubUsername": "Pengwius"
   }
 ]

app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt

@@ -1,13 +1,13 @@
 package io.github.wulkanowy
 
+import android.annotation.SuppressLint
 import android.app.Application
-import android.content.Context
 import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import android.webkit.WebView
+import androidx.fragment.app.FragmentManager
 import androidx.hilt.work.HiltWorkerFactory
-import androidx.multidex.MultiDex
 import androidx.work.Configuration
 import com.yariksoffice.lingver.Lingver
 import dagger.hilt.android.HiltAndroidApp
@@ -41,14 +41,10 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        MultiDex.install(this)
-    }
-
+    @SuppressLint("UnsafeOptInUsageWarning")
     override fun onCreate() {
         super.onCreate()
-
+        FragmentManager.enableNewStateManager(false)
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
         initLogging()
@@ -88,7 +84,7 @@ class WulkanowyApp : Application(), Configuration.Provider {
         //https://stackoverflow.com/questions/40398528/android-webview-language-changes-abruptly-on-android-7-0-and-above
         try {
             WebView(this).destroy()
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             //Ignore exceptions
         }
     }

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

@@ -8,6 +8,8 @@ import androidx.preference.PreferenceManager
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
 import com.chuckerteam.chucker.api.RetentionManager
+import com.squareup.moshi.Moshi
+import com.fredporciuncula.flow.preferences.FlowSharedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -17,6 +19,8 @@ import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AppInfo
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import timber.log.Timber
 import javax.inject.Singleton
 
@@ -60,7 +64,8 @@ internal class RepositoryModule {
     fun provideDatabase(
         @ApplicationContext context: Context,
         sharedPrefProvider: SharedPrefProvider,
-    ) = AppDatabase.newInstance(context, sharedPrefProvider)
+        appInfo: AppInfo
+    ) = AppDatabase.newInstance(context, sharedPrefProvider, appInfo)
 
     @Singleton
     @Provides
@@ -75,6 +80,16 @@ internal class RepositoryModule {
     fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
         PreferenceManager.getDefaultSharedPreferences(context)
 
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Singleton
+    @Provides
+    fun provideFlowSharedPref(sharedPreferences: SharedPreferences) =
+        FlowSharedPreferences(sharedPreferences)
+
+    @Singleton
+    @Provides
+    fun provideMoshi() = Moshi.Builder().build()
+
     @Singleton
     @Provides
     fun provideStudentDao(database: AppDatabase) = database.studentDao
@@ -179,4 +194,12 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideStudentInfoDao(database: AppDatabase) = database.studentInfoDao
+
+    @Singleton
+    @Provides
+    fun provideTimetableHeaderDao(database: AppDatabase) = database.timetableHeaderDao
+
+    @Singleton
+    @Provides
+    fun provideSchoolAnnouncementDao(database: AppDatabase) = database.schoolAnnouncementDao
 }

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

@@ -6,11 +6,11 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.RoomDatabase.JournalMode.TRUNCATE
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ConferenceDao
+import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
 import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
@@ -33,10 +33,12 @@ import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
+import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Conference
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradePartialStatistics
@@ -59,6 +61,7 @@ import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.db.entities.TimetableHeader
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
 import io.github.wulkanowy.data.db.migrations.Migration12
@@ -86,12 +89,18 @@ import io.github.wulkanowy.data.db.migrations.Migration31
 import io.github.wulkanowy.data.db.migrations.Migration32
 import io.github.wulkanowy.data.db.migrations.Migration33
 import io.github.wulkanowy.data.db.migrations.Migration34
+import io.github.wulkanowy.data.db.migrations.Migration35
+import io.github.wulkanowy.data.db.migrations.Migration36
+import io.github.wulkanowy.data.db.migrations.Migration37
+import io.github.wulkanowy.data.db.migrations.Migration38
+import io.github.wulkanowy.data.db.migrations.Migration39
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
 import io.github.wulkanowy.data.db.migrations.Migration6
 import io.github.wulkanowy.data.db.migrations.Migration7
 import io.github.wulkanowy.data.db.migrations.Migration8
 import io.github.wulkanowy.data.db.migrations.Migration9
+import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Singleton
 
 @Singleton
@@ -123,6 +132,8 @@ import javax.inject.Singleton
         Conference::class,
         TimetableAdditional::class,
         StudentInfo::class,
+        TimetableHeader::class,
+        SchoolAnnouncement::class,
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -131,54 +142,59 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 34
+        const val VERSION_SCHEMA = 39
 
-        fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
-            return arrayOf(
-                Migration2(),
-                Migration3(),
-                Migration4(),
-                Migration5(),
-                Migration6(),
-                Migration7(),
-                Migration8(),
-                Migration9(),
-                Migration10(),
-                Migration11(),
-                Migration12(),
-                Migration13(),
-                Migration14(),
-                Migration15(),
-                Migration16(),
-                Migration17(),
-                Migration18(),
-                Migration19(sharedPrefProvider),
-                Migration20(),
-                Migration21(),
-                Migration22(),
-                Migration23(),
-                Migration24(),
-                Migration25(),
-                Migration26(),
-                Migration27(),
-                Migration28(),
-                Migration29(),
-                Migration30(),
-                Migration31(),
-                Migration32(),
-                Migration33(),
-                Migration34()
-            )
-        }
+        fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
+            Migration2(),
+            Migration3(),
+            Migration4(),
+            Migration5(),
+            Migration6(),
+            Migration7(),
+            Migration8(),
+            Migration9(),
+            Migration10(),
+            Migration11(),
+            Migration12(),
+            Migration13(),
+            Migration14(),
+            Migration15(),
+            Migration16(),
+            Migration17(),
+            Migration18(),
+            Migration19(sharedPrefProvider),
+            Migration20(),
+            Migration21(),
+            Migration22(),
+            Migration23(),
+            Migration24(),
+            Migration25(),
+            Migration26(),
+            Migration27(),
+            Migration28(),
+            Migration29(),
+            Migration30(),
+            Migration31(),
+            Migration32(),
+            Migration33(),
+            Migration34(),
+            Migration35(appInfo),
+            Migration36(),
+            Migration37(),
+            Migration38(),
+            Migration39(),
+        )
 
-        fun newInstance(context: Context, sharedPrefProvider: SharedPrefProvider): AppDatabase {
-            return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
-                .setJournalMode(TRUNCATE)
-                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
-                .fallbackToDestructiveMigrationOnDowngrade()
-                .addMigrations(*getMigrations(sharedPrefProvider))
-                .build()
-        }
+        fun newInstance(
+            context: Context,
+            sharedPrefProvider: SharedPrefProvider,
+            appInfo: AppInfo
+        ) = Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
+            .setJournalMode(TRUNCATE)
+            .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
+            .fallbackToDestructiveMigrationOnDowngrade()
+            .addMigrations(*getMigrations(sharedPrefProvider, appInfo))
+            .build()
     }
 
     abstract val studentDao: StudentDao
@@ -232,4 +248,8 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val timetableAdditionalDao: TimetableAdditionalDao
 
     abstract val studentInfoDao: StudentInfoDao
+
+    abstract val timetableHeaderDao: TimetableHeaderDao
+
+    abstract val schoolAnnouncementDao: SchoolAnnouncementDao
 }

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

@@ -20,9 +20,15 @@ class SharedPrefProvider @Inject constructor(
 
     fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
 
+    fun getString(key: String) = sharedPref.getString(key, null)
+
     fun getString(key: String, defaultValue: String): String = sharedPref.getString(key, defaultValue) ?: defaultValue
 
-    fun putString(key: String, value: String, sync: Boolean = false) {
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean = sharedPref.getBoolean(key, defaultValue)
+
+    fun putBoolean(key: String, value: Boolean, sync: Boolean = false) = sharedPref.edit(sync) { putBoolean(key, value) }
+
+    fun putString(key: String, value: String?, sync: Boolean = false) {
         sharedPref.edit(sync) { putString(key, value) }
     }
 

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

@@ -4,12 +4,13 @@ import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Conference
 import kotlinx.coroutines.flow.Flow
+import java.time.LocalDateTime
 import javax.inject.Singleton
 
 @Dao
 @Singleton
 interface ConferenceDao : BaseDao<Conference> {
 
-    @Query("SELECT * FROM Conferences WHERE diary_id = :diaryId AND student_id = :studentId")
-    fun loadAll(diaryId: Int, studentId: Int): Flow<List<Conference>>
+    @Query("SELECT * FROM Conferences WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :startDate")
+    fun loadAll(diaryId: Int, studentId: Int, startDate: LocalDateTime): Flow<List<Conference>>
 }

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

@@ -13,4 +13,7 @@ interface LuckyNumberDao : BaseDao<LuckyNumber> {
 
     @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
     fun load(studentId: Int, date: LocalDate): Flow<LuckyNumber?>
+
+    @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date >= :start AND date <= :end")
+    fun getAll(studentId: Int, start: LocalDate, end: LocalDate): Flow<List<LuckyNumber>>
 }

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

@@ -9,6 +9,6 @@ import javax.inject.Singleton
 @Dao
 interface RecipientDao : BaseDao<Recipient> {
 
-    @Query("SELECT * FROM Recipients WHERE student_id = :userLoginId AND unit_id = :unitId AND role = :role")
-    suspend fun loadAll(userLoginId: Int, unitId: Int, role: Int): List<Recipient>
+    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND unit_id = :unitId AND role = :role")
+    suspend fun loadAll(studentId: Int, unitId: Int, role: Int): List<Recipient>
 }

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

@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Dao
+@Singleton
+interface SchoolAnnouncementDao : BaseDao<SchoolAnnouncement> {
+
+    @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId")
+    fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
+}

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

@@ -8,7 +8,7 @@ import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentNick
+import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import javax.inject.Singleton
 
@@ -23,13 +23,13 @@ interface StudentDao {
     suspend fun delete(student: Student)
 
     @Update(entity = Student::class)
-    suspend fun update(studentNick: StudentNick)
+    suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
 
     @Query("SELECT * FROM Students WHERE is_current = 1")
     suspend fun loadCurrent(): Student?
 
     @Query("SELECT * FROM Students WHERE id = :id")
-    suspend fun loadById(id: Int): Student?
+    suspend fun loadById(id: Long): Student?
 
     @Query("SELECT * FROM Students")
     suspend fun loadAll(): List<Student>

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

@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.TimetableHeader
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
+import javax.inject.Singleton
+
+@Dao
+@Singleton
+interface TimetableHeaderDao : BaseDao<TimetableHeader> {
+
+    @Query("SELECT * FROM TimetableHeaders WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<TimetableHeader>>
+}

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

@@ -32,4 +32,7 @@ data class Conference(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
 }

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

@@ -36,4 +36,7 @@ data class Exam(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
 }

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

@@ -37,4 +37,7 @@ data class Homework(
 
     @ColumnInfo(name = "is_done")
     var isDone: Boolean = false
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
 }

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

@@ -10,7 +10,7 @@ import java.time.LocalDateTime
 data class Message(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    val studentId: Long,
 
     @ColumnInfo(name = "real_id")
     val realId: Int,

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

@@ -3,13 +3,15 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
 import java.io.Serializable
 
+@JsonClass(generateAdapter = true)
 @Entity(tableName = "Recipients")
 data class Recipient(
 
     @ColumnInfo(name = "student_id")
-    val userLoginId: Int,
+    val studentId: Int,
 
     @ColumnInfo(name = "real_id")
     val realId: String,

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

@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+import java.time.LocalDate
+
+@Entity(tableName = "SchoolAnnouncements")
+data class SchoolAnnouncement(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    val date: LocalDate,
+
+    val subject: String,
+
+    val content: String
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
+}

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

@@ -81,4 +81,7 @@ data class Student(
     var id: Long = 0
 
     var nick = ""
+
+    @ColumnInfo(name = "avatar_color")
+    var avatarColor = 0L
 }

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

@@ -1,13 +1,17 @@
 package io.github.wulkanowy.data.db.entities
 
+import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
 
 @Entity
-data class StudentNick(
+data class StudentNickAndAvatar(
 
-    val nick: String
+    val nick: String,
+
+    @ColumnInfo(name = "avatar_color")
+    var avatarColor: Long
 
 ) : Serializable {
 

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

@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+import java.time.LocalDate
+
+@Entity(tableName = "TimetableHeaders")
+data class TimetableHeader(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
+
+    val date: LocalDate,
+
+    val content: String,
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

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

@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.core.database.getLongOrNull
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import io.github.wulkanowy.utils.AppInfo
+
+class Migration35(private val appInfo: AppInfo) : Migration(34, 35) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN `avatar_color` INTEGER NOT NULL DEFAULT 0")
+
+        val studentsCursor = database.query("SELECT * FROM Students")
+
+        while (studentsCursor.moveToNext()) {
+            val studentId = studentsCursor.getLongOrNull(0)
+            database.execSQL(
+                """UPDATE Students 
+                SET avatar_color = ${appInfo.defaultColorsForAvatar.random()} 
+                WHERE id = $studentId"""
+            )
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration36 : Migration(35, 36) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Exams ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE Homework ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+    }
+}

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

@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration37 : Migration(36, 37) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS TimetableHeaders (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                diary_id INTEGER NOT NULL,
+                date INTEGER NOT NULL,
+                content TEXT NOT NULL
+            )
+        """
+        )
+    }
+}

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

@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration38 : Migration(37, 38) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS `SchoolAnnouncements` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `student_id` INTEGER NOT NULL,
+                `date` INTEGER NOT NULL,
+                `subject` TEXT NOT NULL,
+                `content` TEXT NOT NULL
+            )
+        """)
+    }
+}

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

@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration39 : Migration(38, 39) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Conferences ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE SchoolAnnouncements ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+    }
+}

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

@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.pojo.DirectorInformation as SdkDirectorInformation
+
+fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
+    SchoolAnnouncement(
+        studentId = student.studentId,
+        date = it.date,
+        subject = it.subject,
+        content = it.content,
+    )
+}

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

@@ -5,10 +5,9 @@ import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
-import io.github.wulkanowy.sdk.pojo.GradeStatisticsSubject as SdkGradeStatisticsSubject
-import io.github.wulkanowy.sdk.pojo.GradeStatisticsSemester as SdkGradeStatisticsSemester
 import io.github.wulkanowy.sdk.pojo.GradePointsStatistics as SdkGradePointsStatistics
+import io.github.wulkanowy.sdk.pojo.GradeStatisticsSemester as SdkGradeStatisticsSemester
+import io.github.wulkanowy.sdk.pojo.GradeStatisticsSubject as SdkGradeStatisticsSubject
 
 @JvmName("mapToEntitiesSubject")
 fun List<SdkGradeStatisticsSubject>.mapToEntities(semester: Semester) = map {
@@ -51,7 +50,7 @@ fun List<SdkGradePointsStatistics>.mapToEntities(semester: Semester) = map {
 
 fun List<GradePartialStatistics>.mapPartialToStatisticItems() = filterNot { it.classAmounts.isEmpty() }.map {
     GradeStatisticsItem(
-        type = ViewType.PARTIAL,
+        type = GradeStatisticsItem.DataType.PARTIAL,
         average = it.classAverage,
         partial = it,
         points = null,
@@ -61,7 +60,7 @@ fun List<GradePartialStatistics>.mapPartialToStatisticItems() = filterNot { it.c
 
 fun List<GradeSemesterStatistics>.mapSemesterToStatisticItems() = filterNot { it.amounts.isEmpty() }.map {
     GradeStatisticsItem(
-        type = ViewType.SEMESTER,
+        type = GradeStatisticsItem.DataType.SEMESTER,
         partial = null,
         points = null,
         average = "",
@@ -71,7 +70,7 @@ fun List<GradeSemesterStatistics>.mapSemesterToStatisticItems() = filterNot { it
 
 fun List<GradePointsStatistics>.mapPointsToStatisticsItems() = map {
     GradeStatisticsItem(
-        type = ViewType.POINTS,
+        type = GradeStatisticsItem.DataType.POINTS,
         partial = null,
         semester = null,
         average = "",

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

@@ -4,14 +4,14 @@ import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
-import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import java.time.LocalDateTime
 import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
+import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
+import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
 fun List<SdkMessage>.mapToEntities(student: Student) = map {
     Message(
-        studentId = student.id.toInt(),
+        studentId = student.id,
         realId = it.id ?: 0,
         messageId = it.messageId ?: 0,
         sender = it.sender?.name.orEmpty(),

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

@@ -5,7 +5,7 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
 fun List<SdkRecipient>.mapToEntities(userLoginId: Int) = map {
     Recipient(
-        userLoginId = userLoginId,
+        studentId = userLoginId,
         realId = it.id,
         realName = it.name,
         name = it.shortName,

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

@@ -6,7 +6,7 @@ import io.github.wulkanowy.sdk.pojo.ReportingUnit as SdkReportingUnit
 
 fun List<SdkReportingUnit>.mapToEntities(student: Student) = map {
     ReportingUnit(
-        studentId = student.studentId,
+        studentId = student.id.toInt(),
         unitId = it.id,
         roles = it.roles,
         senderId = it.senderId,

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

@@ -5,7 +5,7 @@ import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import java.time.LocalDateTime
 import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
 
-fun List<SdkStudent>.mapToEntities(password: String = "") = map {
+fun List<SdkStudent>.mapToEntities(password: String = "", colors: List<Long>) = map {
     StudentWithSemesters(
         student = Student(
             email = it.email,
@@ -28,8 +28,10 @@ fun List<SdkStudent>.mapToEntities(password: String = "") = map {
             mobileBaseUrl = it.mobileBaseUrl,
             privateKey = it.privateKey,
             certificateKey = it.certificateKey,
-            loginMode = it.loginMode.name
-        ),
+            loginMode = it.loginMode.name,
+        ).apply {
+            avatarColor = colors.random()
+        },
         semesters = it.semesters.mapToEntities(it.studentId)
     )
 }

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

@@ -3,9 +3,19 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.db.entities.TimetableHeader
+import io.github.wulkanowy.data.pojos.TimetableFull
+import io.github.wulkanowy.sdk.pojo.TimetableFull as SdkTimetableFull
+import io.github.wulkanowy.sdk.pojo.TimetableDayHeader as SdkTimetableHeader
 import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
 import io.github.wulkanowy.sdk.pojo.TimetableAdditional as SdkTimetableAdditional
 
+fun SdkTimetableFull.mapToEntities(semester: Semester) = TimetableFull(
+    lessons = lessons.mapToEntities(semester),
+    additional = additional.mapToEntities(semester),
+    headers = headers.mapToEntities(semester)
+)
+
 fun List<SdkTimetable>.mapToEntities(semester: Semester) = map {
     Timetable(
         studentId = semester.studentId,
@@ -39,3 +49,13 @@ fun List<SdkTimetableAdditional>.mapToEntities(semester: Semester) = map {
         end = it.end
     )
 }
+
+@JvmName("mapToEntitiesTimetableHeaders")
+fun List<SdkTimetableHeader>.mapToEntities(semester: Semester) = map {
+    TimetableHeader(
+        studentId = semester.studentId,
+        diaryId = semester.diaryId,
+        date = it.date,
+        content = it.content
+    )
+}

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

@@ -3,11 +3,10 @@ package io.github.wulkanowy.data.pojos
 import io.github.wulkanowy.data.db.entities.GradePartialStatistics
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
-import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
 
 data class GradeStatisticsItem(
 
-    val type: ViewType,
+    val type: DataType,
 
     val average: String,
 
@@ -16,4 +15,11 @@ data class GradeStatisticsItem(
     val semester: GradeSemesterStatistics?,
 
     val points: GradePointsStatistics?
-)
+
+) {
+    enum class DataType {
+        SEMESTER,
+        PARTIAL,
+        POINTS,
+    }
+}

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

@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.pojos
+
+import com.squareup.moshi.JsonClass
+import io.github.wulkanowy.ui.modules.message.send.RecipientChipItem
+
+@JsonClass(generateAdapter = true)
+data class MessageDraft(
+    val recipients: List<RecipientChipItem>,
+    val subject: String,
+    val content: String,
+)

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

@@ -0,0 +1,36 @@
+package io.github.wulkanowy.data.pojos
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.PluralsRes
+import androidx.annotation.StringRes
+import io.github.wulkanowy.services.sync.notifications.NotificationType
+import io.github.wulkanowy.ui.modules.main.MainView
+
+sealed interface Notification {
+    val type: NotificationType
+    val startMenu: MainView.Section
+    val icon: Int
+    val titleStringRes: Int
+    val contentStringRes: Int
+}
+
+data class MultipleNotifications(
+    override val type: NotificationType,
+    override val startMenu: MainView.Section,
+    @DrawableRes override val icon: Int,
+    @PluralsRes override val titleStringRes: Int,
+    @PluralsRes override val contentStringRes: Int,
+
+    @PluralsRes val summaryStringRes: Int,
+    val lines: List<String>,
+) : Notification
+
+data class OneNotification(
+    override val type: NotificationType,
+    override val startMenu: MainView.Section,
+    @DrawableRes override val icon: Int,
+    @StringRes override val titleStringRes: Int,
+    @StringRes override val contentStringRes: Int,
+
+    val contentValues: List<String>,
+) : Notification

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

@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.pojos
+
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.db.entities.TimetableHeader
+
+data class TimetableFull(
+    val lessons: List<Timetable>,
+    val additional: List<TimetableAdditional>,
+    val headers: List<TimetableHeader>,
+)

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

@@ -15,6 +15,7 @@ class AppCreatorRepository @Inject constructor(
     private val dispatchers: DispatchersProvider
 ) {
 
+    @Suppress("BlockingMethodInNonBlockingContext")
     suspend fun getAppCreators() = withContext(dispatchers.backgroundThread) {
         val moshi = Moshi.Builder().build()
         val type = Types.newParameterizedType(List::class.java, Contributor::class.java)

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

@@ -14,6 +14,7 @@ import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
@@ -27,9 +28,12 @@ class AttendanceRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "attendance"
 
     fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday) },
         fetch = {

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

@@ -10,6 +10,7 @@ import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -20,10 +21,21 @@ class AttendanceSummaryRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "attendance_summary"
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
+    fun getAttendanceSummary(
+        student: Student,
+        semester: Semester,
+        subjectId: Int,
+        forceRefresh: Boolean
+    ) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        shouldFetch = {
+            it.isEmpty() || forceRefresh
+                || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester))
+        },
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)

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

@@ -12,6 +12,7 @@ import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -23,9 +24,12 @@ class CompletedLessonsRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "completed"
 
     fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
         query = { completedLessonsDb.loadAll(semester.studentId, semester.diaryId, start.monday, end.sunday) },
         fetch = {

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

@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.ConferenceDao
+import io.github.wulkanowy.data.db.entities.Conference
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
@@ -10,6 +11,11 @@ import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.sync.Mutex
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -20,20 +26,48 @@ class ConferenceRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "conference"
 
-    fun getConferences(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
-        query = { conferenceDb.loadAll(semester.diaryId, student.studentId) },
+    fun getConferences(
+        student: Student,
+        semester: Semester,
+        forceRefresh: Boolean,
+        notify: Boolean = false,
+        startDate: LocalDateTime = LocalDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC)
+    ) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        shouldFetch = {
+            it.isEmpty() || forceRefresh
+                || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester))
+        },
+        query = {
+            conferenceDb.loadAll(semester.diaryId, student.studentId, startDate)
+        },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
                 .getConferences()
                 .mapToEntities(semester)
+                .filter { it.date >= startDate }
         },
         saveFetchResult = { old, new ->
+            val conferencesToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
             conferenceDb.deleteAll(old uniqueSubtract new)
-            conferenceDb.insertAll(new uniqueSubtract old)
+            conferenceDb.insertAll(conferencesToSave)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )
+
+    fun getConferenceFromDatabase(semester: Semester): Flow<List<Conference>> =
+        conferenceDb.loadAll(
+            diaryId = semester.diaryId,
+            studentId = semester.studentId,
+            startDate = LocalDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC)
+        )
+
+    suspend fun updateConference(conference: List<Conference>) = conferenceDb.updateAll(conference)
 }

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

@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.ExamDao
+import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
@@ -12,6 +13,8 @@ import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.startExamsDay
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -23,21 +26,58 @@ class ExamRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "exam"
 
-    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { examDb.loadAll(semester.diaryId, semester.studentId, start.startExamsDay, start.endExamsDay) },
+    fun getExams(
+        student: Student,
+        semester: Semester,
+        start: LocalDate,
+        end: LocalDate,
+        forceRefresh: Boolean,
+        notify: Boolean = false
+    ) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        shouldFetch = {
+            val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed(
+                key = getRefreshKey(cacheKey, semester, start, end)
+            )
+            it.isEmpty() || forceRefresh || isShouldBeRefreshed
+        },
+        query = {
+            examDb.loadAll(
+                diaryId = semester.diaryId,
+                studentId = semester.studentId,
+                from = start.startExamsDay,
+                end = start.endExamsDay
+            )
+        },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
                 .getExams(start.startExamsDay, start.endExamsDay, semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
+            val examsToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
             examDb.deleteAll(old uniqueSubtract new)
-            examDb.insertAll(new uniqueSubtract old)
+            examDb.insertAll(examsToSave)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }
     )
+
+    fun getExamsFromDatabase(semester: Semester, start: LocalDate): Flow<List<Exam>> {
+        return examDb.loadAll(
+            diaryId = semester.diaryId,
+            studentId = semester.studentId,
+            from = start.startExamsDay,
+            end = start.endExamsDay
+        )
+    }
+
+    suspend fun updateExam(exam: List<Exam>) = examDb.updateAll(exam)
 }

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

@@ -16,6 +16,7 @@ import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDateTime
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -28,14 +29,26 @@ class GradeRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "grade"
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { (details, summaries) -> details.isEmpty() || summaries.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
+    fun getGrades(
+        student: Student,
+        semester: Semester,
+        forceRefresh: Boolean,
+        notify: Boolean = false
+    ) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        shouldFetch = { (details, summaries) ->
+            val isShouldBeRefreshed =
+                refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester))
+            details.isEmpty() || summaries.isEmpty() || forceRefresh || isShouldBeRefreshed
+        },
         query = {
-            gradeDb.loadAll(semester.semesterId, semester.studentId).combine(gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)) { details, summaries ->
-                details to summaries
-            }
+            val detailsFlow = gradeDb.loadAll(semester.semesterId, semester.studentId)
+            val summaryFlow = gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
+            detailsFlow.combine(summaryFlow) { details, summaries -> details to summaries }
         },
         fetch = {
             val (details, summary) = sdk.init(student)
@@ -52,8 +65,14 @@ class GradeRepository @Inject constructor(
         }
     )
 
-    private suspend fun refreshGradeDetails(student: Student, oldGrades: List<Grade>, newDetails: List<Grade>, notify: Boolean) {
-        val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date ?: student.registrationDate.toLocalDate()
+    private suspend fun refreshGradeDetails(
+        student: Student,
+        oldGrades: List<Grade>,
+        newDetails: List<Grade>,
+        notify: Boolean
+    ) {
+        val notifyBreakDate =
+            oldGrades.maxByOrNull { it.date }?.date ?: student.registrationDate.toLocalDate()
         gradeDb.deleteAll(oldGrades uniqueSubtract newDetails)
         gradeDb.insertAll((newDetails uniqueSubtract oldGrades).onEach {
             if (it.date >= notifyBreakDate) it.apply {
@@ -63,10 +82,15 @@ class GradeRepository @Inject constructor(
         })
     }
 
-    private suspend fun refreshGradeSummaries(oldSummaries: List<GradeSummary>, newSummary: List<GradeSummary>, notify: Boolean) {
+    private suspend fun refreshGradeSummaries(
+        oldSummaries: List<GradeSummary>,
+        newSummary: List<GradeSummary>,
+        notify: Boolean
+    ) {
         gradeSummaryDb.deleteAll(oldSummaries uniqueSubtract newSummary)
         gradeSummaryDb.insertAll((newSummary uniqueSubtract oldSummaries).onEach { summary ->
-            val oldSummary = oldSummaries.find { oldSummary -> oldSummary.subject == summary.subject }
+            val oldSummary =
+                oldSummaries.find { oldSummary -> oldSummary.subject == summary.subject }
             summary.isPredictedGradeNotified = when {
                 summary.predictedGrade.isEmpty() -> true
                 notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
@@ -92,19 +116,21 @@ class GradeRepository @Inject constructor(
     }
 
     fun getUnreadGrades(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { grade -> !grade.isRead } }
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).map {
+            it.filter { grade -> !grade.isRead }
+        }
     }
 
-    fun getNotNotifiedGrades(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { grade -> !grade.isNotified } }
+    fun getGradesFromDatabase(semester: Semester): Flow<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId)
     }
 
-    fun getNotNotifiedPredictedGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }
+    fun getGradesPredictedFromDatabase(semester: Semester): Flow<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
     }
 
-    fun getNotNotifiedFinalGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }
+    fun getGradesFinalFromDatabase(semester: Semester): Flow<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
     }
 
     suspend fun updateGrade(grade: Grade) {

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

@@ -17,6 +17,7 @@ import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.sync.Mutex
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -30,11 +31,16 @@ class GradeStatisticsRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val partialMutex = Mutex()
+    private val semesterMutex = Mutex()
+    private val pointsMutex = Mutex()
+
     private val partialCacheKey = "grade_stats_partial"
     private val semesterCacheKey = "grade_stats_semester"
     private val pointsCacheKey = "grade_stats_points"
 
     fun getGradesPartialStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
+        mutex = partialMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(partialCacheKey, semester)) },
         query = { gradePartialStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
@@ -71,6 +77,7 @@ class GradeStatisticsRepository @Inject constructor(
     )
 
     fun getGradesSemesterStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
+        mutex = semesterMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(semesterCacheKey, semester)) },
         query = { gradeSemesterStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {
@@ -112,6 +119,7 @@ class GradeStatisticsRepository @Inject constructor(
     )
 
     fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
+        mutex = pointsMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(pointsCacheKey, semester)) },
         query = { gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId) },
         fetch = {

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

@@ -13,6 +13,7 @@ import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -24,19 +25,42 @@ class HomeworkRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "homework"
 
-    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { homeworkDb.loadAll(semester.semesterId, semester.studentId, start.monday, end.sunday) },
+    fun getHomework(
+        student: Student, semester: Semester,
+        start: LocalDate, end: LocalDate,
+        forceRefresh: Boolean, notify: Boolean = false
+    ) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        shouldFetch = {
+            val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed(
+                key = getRefreshKey(cacheKey, semester, start, end)
+            )
+            it.isEmpty() || forceRefresh || isShouldBeRefreshed
+        },
+        query = {
+            homeworkDb.loadAll(
+                semesterId = semester.semesterId,
+                studentId = semester.studentId,
+                from = start.monday,
+                end = end.sunday
+            )
+        },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
                 .getHomework(start.monday, end.sunday)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
+            val homeWorkToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
             homeworkDb.deleteAll(old uniqueSubtract new)
-            homeworkDb.insertAll(new uniqueSubtract old)
+            homeworkDb.insertAll(homeWorkToSave)
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         }
@@ -47,4 +71,9 @@ class HomeworkRepository @Inject constructor(
             isDone = !isDone
         }))
     }
+
+    fun getHomeworkFromDatabase(semester: Semester, start: LocalDate, end: LocalDate) =
+        homeworkDb.loadAll(semester.semesterId, semester.studentId, start.monday, end.sunday)
+
+    suspend fun updateHomework(homework: List<Homework>) = homeworkDb.updateAll(homework)
 }

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

@@ -9,6 +9,8 @@ import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.sync.Mutex
+import java.time.LocalDate
 import java.time.LocalDate.now
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -19,7 +21,10 @@ class LuckyNumberRepository @Inject constructor(
     private val sdk: Sdk
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     fun getLuckyNumber(student: Student, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+        mutex = saveFetchResultMutex,
         shouldFetch = { it == null || forceRefresh },
         query = { luckyNumberDb.load(student.studentId, now()) },
         fetch = { sdk.init(student).getLuckyNumber(student.schoolShortName)?.mapToEntity(student) },
@@ -33,6 +38,9 @@ class LuckyNumberRepository @Inject constructor(
         }
     )
 
+    fun getLuckyNumberHistory(student: Student, start: LocalDate, end: LocalDate) =
+        luckyNumberDb.getAll(student.studentId, start, end)
+
     suspend fun getNotNotifiedLuckyNumber(student: Student) = luckyNumberDb.load(student.studentId, now()).map {
         if (it?.isNotified == false) it else null
     }.first()

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

@@ -1,8 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
+import android.content.Context
+import com.squareup.moshi.Moshi
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
@@ -10,6 +17,8 @@ import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.pojos.MessageDraft
+import io.github.wulkanowy.data.pojos.MessageDraftJsonAdapter
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.sdk.pojo.SentMessage
@@ -19,7 +28,7 @@ import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.sync.Mutex
 import timber.log.Timber
 import java.time.LocalDateTime.now
 import javax.inject.Inject
@@ -30,27 +39,65 @@ class MessageRepository @Inject constructor(
     private val messagesDb: MessagesDao,
     private val messageAttachmentDao: MessageAttachmentDao,
     private val sdk: Sdk,
+    @ApplicationContext private val context: Context,
     private val refreshHelper: AutoRefreshHelper,
+    private val sharedPrefProvider: SharedPrefProvider,
+    private val moshi: Moshi,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "message"
 
     @Suppress("UNUSED_PARAMETER")
-    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student, folder)) },
+    fun getMessages(
+        student: Student, semester: Semester,
+        folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false
+    ): Flow<Resource<List<Message>>> = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        shouldFetch = {
+            it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(
+                getRefreshKey(cacheKey, student, folder)
+            )
+        },
         query = { messagesDb.loadAll(student.id.toInt(), folder.id) },
-        fetch = { sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).mapToEntities(student) },
+        fetch = {
+            sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now())
+                .mapToEntities(student)
+        },
         saveFetchResult = { old, new ->
             messagesDb.deleteAll(old uniqueSubtract new)
             messagesDb.insertAll((new uniqueSubtract old).onEach {
                 it.isNotified = !notify
             })
+            messagesDb.updateAll(getMessagesWithReadByChange(old, new, !notify))
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder))
         }
     )
 
-    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource(
+    private fun getMessagesWithReadByChange(
+        old: List<Message>, new: List<Message>,
+        setNotified: Boolean
+    ): List<Message> {
+        val oldMeta = old.map { Triple(it, it.readBy, it.unreadBy) }
+        val newMeta = new.map { Triple(it, it.readBy, it.unreadBy) }
+
+        val updatedItems = newMeta uniqueSubtract oldMeta
+
+        return updatedItems.map {
+            val oldItem = old.find { item -> item.messageId == it.first.messageId }
+            it.first.apply {
+                id = oldItem?.id ?: 0
+                isNotified = oldItem?.isNotified ?: setNotified
+                content = oldItem?.content.orEmpty()
+            }
+        }
+    }
+
+    fun getMessage(
+        student: Student, message: Message, markAsRead: Boolean = false
+    ): Flow<Resource<MessageWithAttachment?>> = networkBoundResource(
         shouldFetch = {
             checkNotNull(it, { "This message no longer exist!" })
             Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
@@ -58,14 +105,20 @@ class MessageRepository @Inject constructor(
         },
         query = { messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId) },
         fetch = {
-            sdk.init(student).getMessageDetails(it!!.message.messageId, message.folderId, markAsRead, message.realId).let { details ->
+            sdk.init(student).getMessageDetails(
+                messageId = it!!.message.messageId,
+                folderId = message.folderId,
+                read = markAsRead,
+                id = message.realId
+            ).let { details ->
                 details.content to details.attachments.mapToEntities()
             }
         },
         saveFetchResult = { old, (downloadedMessage, attachments) ->
             checkNotNull(old, { "Fetched message no longer exist!" })
-            messagesDb.updateAll(listOf(old.message.copy(unread = !markAsRead).apply {
+            messagesDb.updateAll(listOf(old.message.apply {
                 id = old.message.id
+                unread = !markAsRead
                 content = content.ifBlank { downloadedMessage }
             }))
             messageAttachmentDao.insertAttachments(attachments)
@@ -73,30 +126,42 @@ class MessageRepository @Inject constructor(
         }
     )
 
-    fun getNotNotifiedMessages(student: Student): Flow<List<Message>> {
-        return messagesDb.loadAll(student.id.toInt(), RECEIVED.id).map { it.filter { message -> !message.isNotified && message.unread } }
+    fun getMessagesFromDatabase(student: Student): Flow<List<Message>> {
+        return messagesDb.loadAll(student.id.toInt(), RECEIVED.id)
     }
 
     suspend fun updateMessages(messages: List<Message>) {
         return messagesDb.updateAll(messages)
     }
 
-    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
-        return sdk.init(student).sendMessage(
-            subject = subject,
-            content = content,
-            recipients = recipients.mapFromEntities()
-        )
-    }
+    suspend fun sendMessage(
+        student: Student, subject: String, content: String,
+        recipients: List<Recipient>
+    ): SentMessage = sdk.init(student).sendMessage(
+        subject = subject,
+        content = content,
+        recipients = recipients.mapFromEntities()
+    )
 
     suspend fun deleteMessage(student: Student, message: Message) {
-        val isDeleted = sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
+        val isDeleted = sdk.init(student).deleteMessages(
+            messages = listOf(message.messageId), message.folderId
+        )
 
-        if (message.folderId != MessageFolder.TRASHED.id) {
-            if (isDeleted) messagesDb.updateAll(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
+        if (message.folderId != MessageFolder.TRASHED.id && isDeleted) {
+            val deletedMessage = message.copy(folderId = MessageFolder.TRASHED.id).apply {
                 id = message.id
                 content = message.content
-            }))
+            }
+            messagesDb.updateAll(listOf(deletedMessage))
         } else messagesDb.deleteAll(listOf(message))
     }
+
+    var draftMessage: MessageDraft?
+        get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft))
+            ?.let { MessageDraftJsonAdapter(moshi).fromJson(it) }
+        set(value) = sharedPrefProvider.putString(
+            context.getString(R.string.pref_key_message_send_draft),
+            value?.let { MessageDraftJsonAdapter(moshi).toJson(it) }
+        )
 }

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

@@ -13,6 +13,7 @@ import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -23,9 +24,12 @@ class MobileDeviceRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "devices"
 
     fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student)) },
         query = { mobileDb.loadAll(student.userLoginId.takeIf { it != 0 } ?: student.studentId) },
         fetch = {

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

@@ -13,6 +13,7 @@ import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -23,9 +24,12 @@ class NoteRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val saveFetchResultMutex = Mutex()
+
     private val cacheKey = "note"
 
     fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
         query = { noteDb.loadAll(student.studentId) },
         fetch = {
@@ -46,8 +50,8 @@ class NoteRepository @Inject constructor(
         }
     )
 
-    fun getNotNotifiedNotes(student: Student): Flow<List<Note>> {
-        return noteDb.loadAll(student.studentId).map { it.filter { note -> !note.isNotified } }
+    fun getNotesFromDatabase(student: Student): Flow<List<Note>> {
+        return noteDb.loadAll(student.studentId)
     }
 
     suspend fun updateNote(note: Note) {

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

@@ -2,42 +2,83 @@ package io.github.wulkanowy.data.repositories
 
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.core.content.edit
+import com.fredporciuncula.flow.preferences.FlowSharedPreferences
+import com.fredporciuncula.flow.preferences.Preference
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapter
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.toLocalDate
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
 import io.github.wulkanowy.ui.modules.grade.GradeSortingMode
+import io.github.wulkanowy.utils.toTimestamp
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.utils.toTimestamp
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import java.time.LocalDate
+import java.time.LocalDateTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @Singleton
 class PreferencesRepository @Inject constructor(
     private val sharedPref: SharedPreferences,
-    @ApplicationContext val context: Context
+    private val flowSharedPref: FlowSharedPreferences,
+    @ApplicationContext val context: Context,
+    moshi: Moshi
 ) {
+
+    @OptIn(ExperimentalStdlibApi::class)
+    private val dashboardItemsPositionAdapter: JsonAdapter<Map<DashboardItem.Type, Int>> =
+        moshi.adapter()
+
     val startMenuIndex: Int
         get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
 
     val isShowPresent: Boolean
-        get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
+        get() = getBoolean(
+            R.string.pref_key_attendance_present,
+            R.bool.pref_default_attendance_present
+        )
 
     val gradeAverageMode: GradeAverageMode
-        get() = GradeAverageMode.getByValue(getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode))
+        get() = GradeAverageMode.getByValue(
+            getString(
+                R.string.pref_key_grade_average_mode,
+                R.string.pref_default_grade_average_mode
+            )
+        )
 
     val gradeAverageForceCalc: Boolean
-        get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
+        get() = getBoolean(
+            R.string.pref_key_grade_average_force_calc,
+            R.bool.pref_default_grade_average_force_calc
+        )
 
     val isGradeExpandable: Boolean
         get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
     val showAllSubjectsOnStatisticsList: Boolean
-        get() = getBoolean(R.string.pref_key_grade_statistics_list, R.bool.pref_default_grade_statistics_list)
+        get() = getBoolean(
+            R.string.pref_key_grade_statistics_list,
+            R.bool.pref_default_grade_statistics_list
+        )
 
     val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
         get() = getString(appThemeKey, R.string.pref_default_app_theme)
 
     val gradeColorTheme: String
-        get() = getString(R.string.pref_key_grade_color_scheme, R.string.pref_default_grade_color_scheme)
+        get() = getString(
+            R.string.pref_key_grade_color_scheme,
+            R.string.pref_default_grade_color_scheme
+        )
 
     val appLanguageKey = context.getString(R.string.pref_key_app_language)
     val appLanguage
@@ -55,50 +96,170 @@ class PreferencesRepository @Inject constructor(
     val isServicesOnlyWifi: Boolean
         get() = getBoolean(servicesOnlyWifiKey, R.bool.pref_default_services_wifi_only)
 
+    val notificationsEnableKey = context.getString(R.string.pref_key_notifications_enable)
     val isNotificationsEnable: Boolean
-        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
+        get() = getBoolean(notificationsEnableKey, R.bool.pref_default_notifications_enable)
 
-    val isUpcomingLessonsNotificationsEnableKey = context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
+    val isUpcomingLessonsNotificationsEnableKey =
+        context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
     val isUpcomingLessonsNotificationsEnable: Boolean
-        get() = getBoolean(isUpcomingLessonsNotificationsEnableKey, R.bool.pref_default_notification_upcoming_lessons_enable)
+        get() = getBoolean(
+            isUpcomingLessonsNotificationsEnableKey,
+            R.bool.pref_default_notification_upcoming_lessons_enable
+        )
 
     val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
         get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
 
     val gradePlusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_plus, R.string.pref_default_grade_modifier_plus).toDouble()
+        get() = getString(
+            R.string.pref_key_grade_modifier_plus,
+            R.string.pref_default_grade_modifier_plus
+        ).toDouble()
 
     val gradeMinusModifier: Double
-        get() = getString(R.string.pref_key_grade_modifier_minus, R.string.pref_default_grade_modifier_minus).toDouble()
+        get() = getString(
+            R.string.pref_key_grade_modifier_minus,
+            R.string.pref_default_grade_modifier_minus
+        ).toDouble()
 
     val fillMessageContent: Boolean
-        get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
+        get() = getBoolean(
+            R.string.pref_key_fill_message_content,
+            R.bool.pref_default_fill_message_content
+        )
 
     val showGroupsInPlan: Boolean
-        get() = getBoolean(R.string.pref_key_timetable_show_groups, R.bool.pref_default_timetable_show_groups)
+        get() = getBoolean(
+            R.string.pref_key_timetable_show_groups,
+            R.bool.pref_default_timetable_show_groups
+        )
 
     val showWholeClassPlan: String
-        get() = getString(R.string.pref_key_timetable_show_whole_class, R.string.pref_default_timetable_show_whole_class)
+        get() = getString(
+            R.string.pref_key_timetable_show_whole_class,
+            R.string.pref_default_timetable_show_whole_class
+        )
 
     val gradeSortingMode: GradeSortingMode
-        get() = GradeSortingMode.getByValue(getString(R.string.pref_key_grade_sorting_mode, R.string.pref_default_grade_sorting_mode))
+        get() = GradeSortingMode.getByValue(
+            getString(
+                R.string.pref_key_grade_sorting_mode,
+                R.string.pref_default_grade_sorting_mode
+            )
+        )
 
     val showTimetableTimers: Boolean
-        get() = getBoolean(R.string.pref_key_timetable_show_timers, R.bool.pref_default_timetable_show_timers)
+        get() = getBoolean(
+            R.string.pref_key_timetable_show_timers,
+            R.bool.pref_default_timetable_show_timers
+        )
 
     var isHomeworkFullscreen: Boolean
-        get() = getBoolean(R.string.pref_key_homework_fullscreen, R.bool.pref_default_homework_fullscreen)
+        get() = getBoolean(
+            R.string.pref_key_homework_fullscreen,
+            R.bool.pref_default_homework_fullscreen
+        )
         set(value) = sharedPref.edit().putBoolean("homework_fullscreen", value).apply()
 
     val showSubjectsWithoutGrades: Boolean
-        get() = getBoolean(R.string.pref_key_subjects_without_grades, R.bool.pref_default_subjects_without_grades)
+        get() = getBoolean(
+            R.string.pref_key_subjects_without_grades,
+            R.bool.pref_default_subjects_without_grades
+        )
+
+    val isOptionalArithmeticAverage: Boolean
+        get() = getBoolean(
+            R.string.pref_key_optional_arithmetic_average,
+            R.bool.pref_default_optional_arithmetic_average
+        )
+
+    var lasSyncDate: LocalDateTime
+        get() = getLong(
+            R.string.pref_key_last_sync_date,
+            R.string.pref_default_last_sync_date
+        ).toLocalDateTime()
+        set(value) = sharedPref.edit().putLong("last_sync_date", value.toTimestamp()).apply()
+
+    var dashboardItemsPosition: Map<DashboardItem.Type, Int>?
+        get() {
+            val json = sharedPref.getString(PREF_KEY_DASHBOARD_ITEMS_POSITION, null) ?: return null
+
+            return dashboardItemsPositionAdapter.fromJson(json)
+        }
+        set(value) = sharedPref.edit {
+            putString(
+                PREF_KEY_DASHBOARD_ITEMS_POSITION,
+                dashboardItemsPositionAdapter.toJson(value)
+            )
+        }
+
+    val selectedDashboardTilesFlow: Flow<Set<DashboardItem.Tile>>
+        get() = selectedDashboardTilesPreference.asFlow()
+            .map { set ->
+                set.map { DashboardItem.Tile.valueOf(it) }
+                    .plus(DashboardItem.Tile.ACCOUNT)
+                    .toSet()
+            }
+
+    var selectedDashboardTiles: Set<DashboardItem.Tile>
+        get() = selectedDashboardTilesPreference.get()
+            .map { DashboardItem.Tile.valueOf(it) }
+            .plus(DashboardItem.Tile.ACCOUNT)
+            .toSet()
+        set(value) {
+            val filteredValue = value.filterNot { it == DashboardItem.Tile.ACCOUNT }
+                .map { it.name }
+                .toSet()
+
+            selectedDashboardTilesPreference.set(filteredValue)
+        }
+
+    private val selectedDashboardTilesPreference: Preference<Set<String>>
+        get() {
+            val defaultSet =
+                context.resources.getStringArray(R.array.pref_default_dashboard_tiles).toSet()
+            val prefKey = context.getString(R.string.pref_key_dashboard_tiles)
+
+            return flowSharedPref.getStringSet(prefKey, defaultSet)
+        }
+
+    var inAppReviewCount: Int
+        get() = sharedPref.getInt(PREF_KEY_IN_APP_REVIEW_COUNT, 0)
+        set(value) = sharedPref.edit().putInt(PREF_KEY_IN_APP_REVIEW_COUNT, value).apply()
+
+    var inAppReviewDate: LocalDate?
+        get() = sharedPref.getLong(PREF_KEY_IN_APP_REVIEW_DATE, 0).takeIf { it != 0L }?.toLocalDate()
+        set(value) = sharedPref.edit().putLong(PREF_KEY_IN_APP_REVIEW_DATE, value!!.toTimestamp()).apply()
+
+    var isAppReviewDone: Boolean
+        get() = sharedPref.getBoolean(PREF_KEY_IN_APP_REVIEW_DONE, false)
+        set(value) = sharedPref.edit().putBoolean(PREF_KEY_IN_APP_REVIEW_DONE, value).apply()
+
+    private fun getLong(id: Int, default: Int) = getLong(context.getString(id), default)
+
+    private fun getLong(id: String, default: Int) =
+        sharedPref.getLong(id, context.resources.getString(default).toLong())
 
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
-    private fun getString(id: String, default: Int) = sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
+    private fun getString(id: String, default: Int) =
+        sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
 
     private fun getBoolean(id: Int, default: Int) = getBoolean(context.getString(id), default)
 
-    private fun getBoolean(id: String, default: Int) = sharedPref.getBoolean(id, context.resources.getBoolean(default))
+    private fun getBoolean(id: String, default: Int) =
+        sharedPref.getBoolean(id, context.resources.getBoolean(default))
+
+    private companion object {
+
+        private const val PREF_KEY_DASHBOARD_ITEMS_POSITION = "dashboard_items_position"
+
+        private const val PREF_KEY_IN_APP_REVIEW_COUNT = "in_app_review_count"
+
+        private const val PREF_KEY_IN_APP_REVIEW_DATE = "in_app_review_date"
+
+        private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done"
+    }
 }

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

@@ -19,22 +19,22 @@ class RecipientRepository @Inject constructor(
 ) {
 
     suspend fun refreshRecipients(student: Student, unit: ReportingUnit, role: Int) {
-        val new = sdk.init(student).getRecipients(unit.unitId, role).mapToEntities(unit.senderId)
-        val old = recipientDb.loadAll(unit.senderId, unit.unitId, role)
+        val new = sdk.init(student).getRecipients(unit.unitId, role).mapToEntities(unit.studentId)
+        val old = recipientDb.loadAll(unit.studentId, unit.unitId, role)
 
         recipientDb.deleteAll(old uniqueSubtract new)
         recipientDb.insertAll(new uniqueSubtract old)
     }
 
     suspend fun getRecipients(student: Student, unit: ReportingUnit, role: Int): List<Recipient> {
-        return recipientDb.loadAll(unit.senderId, unit.unitId, role).ifEmpty {
+        return recipientDb.loadAll(unit.studentId, unit.unitId, role).ifEmpty {
             refreshRecipients(student, unit, role)
 
-            recipientDb.loadAll(unit.senderId, unit.unitId, role)
+            recipientDb.loadAll(unit.studentId, unit.unitId, role)
         }
     }
 
     suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
-        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId).mapToEntities(student.userLoginId)
+        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId).mapToEntities(student.studentId)
     }
 }

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

@@ -18,25 +18,25 @@ class ReportingUnitRepository @Inject constructor(
 
     suspend fun refreshReportingUnits(student: Student) {
         val new = sdk.init(student).getReportingUnits().mapToEntities(student)
-        val old = reportingUnitDb.load(student.studentId)
+        val old = reportingUnitDb.load(student.id.toInt())
 
         reportingUnitDb.deleteAll(old.uniqueSubtract(new))
         reportingUnitDb.insertAll(new.uniqueSubtract(old))
     }
 
     suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return reportingUnitDb.load(student.studentId).ifEmpty {
+        return reportingUnitDb.load(student.id.toInt()).ifEmpty {
             refreshReportingUnits(student)
 
-            reportingUnitDb.load(student.studentId)
+            reportingUnitDb.load(student.id.toInt())
         }
     }
 
     suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
-        return reportingUnitDb.loadOne(student.studentId, unitId) ?: run {
+        return reportingUnitDb.loadOne(student.id.toInt(), unitId) ?: run {
             refreshReportingUnits(student)
 
-            return reportingUnitDb.loadOne(student.studentId, unitId)
+            return reportingUnitDb.loadOne(student.id.toInt(), unitId)
         }
     }
 }