.github/workflows/test.yml

@@ -10,14 +10,39 @@ on:
   workflow_dispatch:
 
 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
@@ -27,6 +52,11 @@ 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
@@ -35,12 +65,49 @@ jobs:
           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: [ unit-tests ]
+      needs: [ build, unit-tests, instrumentation-tests ]
       if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
       steps:
         - uses: actions/checkout@v2
@@ -53,6 +120,11 @@ 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: Decrypt keys
           env:
             ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
@@ -68,135 +140,3 @@ jobs:
             PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
             PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
           run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
-
-  deploy-appcenter:
-      name: Deploy to App Center
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      environment: app-center
-      if: github.ref != 'refs/heads/develop'
-      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: Deploy to AppDistribution
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      environment: app-distribution
-      if: github.ref == 'refs/heads/develop'
-      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

README.en.md

@@ -12,7 +12,7 @@ Unofficial android VULCAN UONET+ register client for both students and their par
 
 ## Features
 
-* logging in using the email and password
+* logging in using the email and password OR using token and pin
 * functions from the register website:
     * grades
     * grade statistics
@@ -25,19 +25,15 @@ Unofficial android VULCAN UONET+ register client for both students and their par
     * homework
     * notes
     * lucky number
-    * additional lessons
-    * school conferences
-    * student and school information
 * calculation of the average independently of school's preferences
 * notifications, e.g. about a new grade
-* support for multiple accounts with the ability to rename students 
 * dark and black (AMOLED) theme
 * offline mode
 * no ads
 
 ## Download
 
-You can download the current version from the Google Play, F-Droid or Huawei AppGallery store
+You can download the current beta version from the Google Play, F-Droid or Huawei AppGallery store
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
     alt="Get it on Google Play"
@@ -64,9 +60,6 @@ You can also download a [development version](https://wulkanowy.github.io/#downl
 
 Please contribute to the project either by creating a PR or submitting an issue on GitHub.
 
-For people interested in translating the application into different languages, we provide Crowdin
-https://crowdin.com/project/wulkanowy2
-
 ## License
 
 This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details

README.md

@@ -12,7 +12,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
 ## Funkcje
 
-* logowanie za pomocą e-maila i hasła
+* logowanie za pomocą e-maila i hasła LUB tokena i pinu
 * funkcje ze strony internetowej dziennika:
     * oceny
     * statystyki ocen
@@ -25,19 +25,15 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
     * zadania domowe
     * uwagi
     * szczęśliwy numerek
-    * dodatkowe lekcje
-    * zebrania w szkole
-    * informacje o uczniu i szkole
 * obliczanie średniej niezależnie od preferencji szkoły
 * powiadomienia np. o nowej ocenie
-* obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
 * ciemny i czarny (AMOLED) motyw
-* tryb offline
+* tryb offilne
 * brak reklam
 
 ## Pobierz
 
-Aktualną wersję możesz pobrać ze sklepu Google Play, F-Droid lub Huawei AppGallery
+Aktualną wersję beta możesz pobrać ze sklepu Google Play, F-Droid lub Huawei AppGallery
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
     alt="Pobierz z Google Play"
@@ -65,9 +61,6 @@ Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#downloa
 
 Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
 
-Dla osób zainteresowanych tłumaczeniem aplikacji na różne języki udostępniamy Crowdina
-https://crowdin.com/project/wulkanowy2
-
 ## Licencja
 
 Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)

app/build.gradle

@@ -5,8 +5,6 @@ apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.huawei.agconnect'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
@@ -20,8 +18,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
         targetSdkVersion 30
-        versionCode 89
-        versionName "1.1.3"
+        versionCode 83
+        versionName "0.25.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -43,8 +41,7 @@ android {
     }
 
     sourceSets {
-        // https://github.com/robolectric/robolectric/issues/3928#issuecomment-395309991
-        debug.assets.srcDirs += files("$projectDir/schemas".toString())
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     signingConfigs {
@@ -106,10 +103,6 @@ android {
         disable 'HardwareIds'
     }
 
-    testOptions.unitTests {
-        includeAndroidResources = true
-    }
-
     compileOptions {
         coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -117,7 +110,6 @@ android {
     }
 
     kotlinOptions {
-        useIR = true
         jvmTarget = "1.8"
         freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
@@ -136,33 +128,33 @@ play {
     serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
     serviceAccountCredentials = file('key.p12')
     defaultToAppBundles = false
-    track = 'production'
+    track = 'alpha'
     updatePriority = 3
 }
 
 ext {
     work_manager = "2.5.0"
-    work_hilt = "1.0.0-beta01"
-    room = "2.3.0-rc01"
+    work_hilt = "1.0.0-alpha03"
+    room = "2.3.0-beta01"
     chucker = "3.4.0"
-    mockk = "1.11.0"
+    mockk = "1.10.5"
     moshi = "1.11.0"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.1.3"
+    implementation "io.github.wulkanowy:sdk:0.25.1"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
 
     implementation "androidx.core:core-ktx:1.3.2"
-    implementation "androidx.activity:activity-ktx:1.2.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.3.2"
-    implementation "androidx.annotation:annotation:1.2.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
+    implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
@@ -171,15 +163,14 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.3.0"
-    implementation "com.github.wulkanowy:material-chips-input:2.2.0"
+    implementation "com.google.android.material:material:1.3.0-rc01"
+    implementation "com.github.wulkanowy:material-chips-input:2.1.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.mikhaellopez: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.3.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -206,36 +197,35 @@ dependencies {
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.3.1'
 
-    playImplementation platform('com.google.firebase:firebase-bom:26.7.0')
+    playImplementation platform('com.google.firebase:firebase-bom:26.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-ktx:1.8.1'
+    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:5.2.0.301'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.5.1.200'
+    hmsImplementation 'com.huawei.hms:hianalytics:5.1.0.301'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.5.0.200'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
     debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
-    testImplementation "junit:junit:4.13.2"
+    testImplementation "junit:junit:4.13.1"
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.5.1'
-    testImplementation "androidx.test:runner:1.3.0"
-    testImplementation "androidx.test.ext:junit:1.1.2"
-    testImplementation "androidx.test:core:1.3.0"
-    testImplementation "androidx.room:room-testing:$room"
-    testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
-    kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
-
     androidTestImplementation "androidx.test:core:1.3.0"
     androidTestImplementation "androidx.test:runner:1.3.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.2"
     androidTestImplementation "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/proguard-rules.pro

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

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt

@@ -9,7 +9,6 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.platform.app.InstrumentationRegistry
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.utils.AppInfo
 import org.junit.Rule
 
 abstract class AbstractMigrationTest {
@@ -25,16 +24,12 @@ abstract class AbstractMigrationTest {
 
     fun getMigratedRoomDatabase(): AppDatabase {
         val context = ApplicationProvider.getApplicationContext<Context>()
-        val database = Room.databaseBuilder(
-            ApplicationProvider.getApplicationContext(),
-            AppDatabase::class.java,
-            dbName
-        ).addMigrations(
-            *AppDatabase.getMigrations(
-                SharedPrefProvider(PreferenceManager.getDefaultSharedPreferences(context)),
-                AppInfo()
+        val database = Room.databaseBuilder(ApplicationProvider.getApplicationContext(),
+            AppDatabase::class.java, dbName)
+            .addMigrations(*AppDatabase.getMigrations(SharedPrefProvider(PreferenceManager
+                .getDefaultSharedPreferences(context)))
             )
-        ).build()
+            .build()
         // close the database and release any stream resources when the test finishes
         helper.closeWhenFinished(database)
         return database

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt

@@ -2,20 +2,14 @@ package io.github.wulkanowy.data.db.migrations
 
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
-import android.os.Build
 import androidx.sqlite.db.SupportSQLiteDatabase
-import dagger.hilt.android.testing.HiltAndroidTest
-import dagger.hilt.android.testing.HiltTestApplication
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 
-@HiltAndroidTest
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
+@RunWith(AndroidJUnit4::class)
 class Migration12Test : AbstractMigrationTest() {
 
     @Test

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt

@@ -2,26 +2,17 @@ package io.github.wulkanowy.data.db.migrations
 
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
-import android.os.Build
 import androidx.sqlite.db.SupportSQLiteDatabase
-import dagger.hilt.android.testing.HiltAndroidTest
-import dagger.hilt.android.testing.HiltTestApplication
 import io.github.wulkanowy.data.db.Converters
 import io.github.wulkanowy.data.db.entities.Semester
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import java.time.LocalDate.of
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-@HiltAndroidTest
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
 class Migration13Test : AbstractMigrationTest() {
 
     @Test

app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt

@@ -2,21 +2,12 @@ package io.github.wulkanowy.data.db.migrations
 
 import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase
-import android.os.Build
 import androidx.sqlite.db.SupportSQLiteDatabase
-import dagger.hilt.android.testing.HiltAndroidTest
-import dagger.hilt.android.testing.HiltTestApplication
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import kotlin.random.Random
 
-@HiltAndroidTest
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
 class Migration27Test : AbstractMigrationTest() {
 
     @Test

app/src/main/AndroidManifest.xml

@@ -56,7 +56,7 @@
             android:name=".ui.modules.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login_title"
-            android:theme="@style/WulkanowyTheme.Login"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.main.MainActivity"
@@ -68,7 +68,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.MessageSend"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"

app/src/main/assets/contributors.json

@@ -38,13 +38,5 @@
   {
     "displayName": "MRmlik12",
     "githubUsername": "MRmlik12"
-  },
-  {
-    "displayName": "Damian Czupryn",
-    "githubUsername": "Daxxxis"
-  },
-  {
-    "displayName": "Kamil Studziński",
-    "githubUsername": "studzinskik"
   }
 ]

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

@@ -1,13 +1,11 @@
 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
@@ -48,10 +46,9 @@ class WulkanowyApp : Application(), Configuration.Provider {
         MultiDex.install(this)
     }
 
-    @SuppressLint("UnsafeOptInUsageWarning")
     override fun onCreate() {
         super.onCreate()
-        FragmentManager.enableNewStateManager(false)
+
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
         initLogging()

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

@@ -17,7 +17,6 @@ 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 timber.log.Timber
 import javax.inject.Singleton
 
@@ -61,8 +60,7 @@ internal class RepositoryModule {
     fun provideDatabase(
         @ApplicationContext context: Context,
         sharedPrefProvider: SharedPrefProvider,
-        appInfo: AppInfo
-    ) = AppDatabase.newInstance(context, sharedPrefProvider, appInfo)
+    ) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides

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

@@ -6,6 +6,7 @@ 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
@@ -84,15 +85,12 @@ import io.github.wulkanowy.data.db.migrations.Migration30
 import io.github.wulkanowy.data.db.migrations.Migration31
 import io.github.wulkanowy.data.db.migrations.Migration32
 import io.github.wulkanowy.data.db.migrations.Migration33
-import io.github.wulkanowy.data.db.migrations.Migration34
-import io.github.wulkanowy.data.db.migrations.Migration35
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
 import io.github.wulkanowy.data.db.migrations.Migration6
 import io.github.wulkanowy.data.db.migrations.Migration7
 import io.github.wulkanowy.data.db.migrations.Migration8
 import io.github.wulkanowy.data.db.migrations.Migration9
-import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Singleton
 
 @Singleton
@@ -132,55 +130,53 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 35
+        const val VERSION_SCHEMA = 33
 
-        fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
-            Migration2(),
-            Migration3(),
-            Migration4(),
-            Migration5(),
-            Migration6(),
-            Migration7(),
-            Migration8(),
-            Migration9(),
-            Migration10(),
-            Migration11(),
-            Migration12(),
-            Migration13(),
-            Migration14(),
-            Migration15(),
-            Migration16(),
-            Migration17(),
-            Migration18(),
-            Migration19(sharedPrefProvider),
-            Migration20(),
-            Migration21(),
-            Migration22(),
-            Migration23(),
-            Migration24(),
-            Migration25(),
-            Migration26(),
-            Migration27(),
-            Migration28(),
-            Migration29(),
-            Migration30(),
-            Migration31(),
-            Migration32(),
-            Migration33(),
-            Migration34(),
-            Migration35(appInfo)
-        )
+        fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
+            return arrayOf(
+                Migration2(),
+                Migration3(),
+                Migration4(),
+                Migration5(),
+                Migration6(),
+                Migration7(),
+                Migration8(),
+                Migration9(),
+                Migration10(),
+                Migration11(),
+                Migration12(),
+                Migration13(),
+                Migration14(),
+                Migration15(),
+                Migration16(),
+                Migration17(),
+                Migration18(),
+                Migration19(sharedPrefProvider),
+                Migration20(),
+                Migration21(),
+                Migration22(),
+                Migration23(),
+                Migration24(),
+                Migration25(),
+                Migration26(),
+                Migration27(),
+                Migration28(),
+                Migration29(),
+                Migration30(),
+                Migration31(),
+                Migration32(),
+                Migration33()
+            )
+        }
 
-        fun newInstance(
-            context: Context,
-            sharedPrefProvider: SharedPrefProvider,
-            appInfo: AppInfo
-        ) = Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
-            .setJournalMode(TRUNCATE)
-            .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
-            .fallbackToDestructiveMigrationOnDowngrade()
-            .addMigrations(*getMigrations(sharedPrefProvider, appInfo))
-            .build()
+        fun newInstance(context: Context, sharedPrefProvider: SharedPrefProvider): AppDatabase {
+            return Room.databaseBuilder(context, AppDatabase::class.java, "wulkanowy_database")
+                .setJournalMode(TRUNCATE)
+                .fallbackToDestructiveMigrationFrom(VERSION_SCHEMA + 1)
+                .fallbackToDestructiveMigrationOnDowngrade()
+                .addMigrations(*getMigrations(sharedPrefProvider))
+                .build()
+        }
     }
 
     abstract val studentDao: StudentDao

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

@@ -13,7 +13,4 @@ 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 = :studentId AND unit_id = :unitId AND role = :role")
-    suspend fun loadAll(studentId: Int, unitId: Int, role: Int): List<Recipient>
+    @Query("SELECT * FROM Recipients WHERE student_id = :userLoginId AND unit_id = :unitId AND role = :role")
+    suspend fun loadAll(userLoginId: Int, unitId: Int, role: Int): List<Recipient>
 }

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.StudentNickAndAvatar
+import io.github.wulkanowy.data.db.entities.StudentNick
 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(studentNickAndAvatar: StudentNickAndAvatar)
+    suspend fun update(studentNick: StudentNick)
 
     @Query("SELECT * FROM Students WHERE is_current = 1")
     suspend fun loadCurrent(): Student?
 
     @Query("SELECT * FROM Students WHERE id = :id")
-    suspend fun loadById(id: Long): Student?
+    suspend fun loadById(id: Int): Student?
 
     @Query("SELECT * FROM Students")
     suspend fun loadAll(): List<Student>

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: Long,
+    val studentId: Int,
 
     @ColumnInfo(name = "real_id")
     val realId: Int,

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

@@ -9,7 +9,7 @@ import java.io.Serializable
 data class Recipient(
 
     @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    val userLoginId: Int,
 
     @ColumnInfo(name = "real_id")
     val realId: String,

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

@@ -81,7 +81,4 @@ 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/StudentNick.kt

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

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

@@ -1,13 +0,0 @@
-package io.github.wulkanowy.data.db.migrations
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-class Migration34 : Migration(33, 34) {
-
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DELETE FROM ReportingUnits")
-        database.execSQL("DELETE FROM Recipients")
-    }
-}
-

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

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

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

@@ -5,9 +5,10 @@ import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
-import io.github.wulkanowy.sdk.pojo.GradePointsStatistics as SdkGradePointsStatistics
-import io.github.wulkanowy.sdk.pojo.GradeStatisticsSemester as SdkGradeStatisticsSemester
+import io.github.wulkanowy.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
 
 @JvmName("mapToEntitiesSubject")
 fun List<SdkGradeStatisticsSubject>.mapToEntities(semester: Semester) = map {
@@ -50,7 +51,7 @@ fun List<SdkGradePointsStatistics>.mapToEntities(semester: Semester) = map {
 
 fun List<GradePartialStatistics>.mapPartialToStatisticItems() = filterNot { it.classAmounts.isEmpty() }.map {
     GradeStatisticsItem(
-        type = GradeStatisticsItem.DataType.PARTIAL,
+        type = ViewType.PARTIAL,
         average = it.classAverage,
         partial = it,
         points = null,
@@ -60,7 +61,7 @@ fun List<GradePartialStatistics>.mapPartialToStatisticItems() = filterNot { it.c
 
 fun List<GradeSemesterStatistics>.mapSemesterToStatisticItems() = filterNot { it.amounts.isEmpty() }.map {
     GradeStatisticsItem(
-        type = GradeStatisticsItem.DataType.SEMESTER,
+        type = ViewType.SEMESTER,
         partial = null,
         points = null,
         average = "",
@@ -70,7 +71,7 @@ fun List<GradeSemesterStatistics>.mapSemesterToStatisticItems() = filterNot { it
 
 fun List<GradePointsStatistics>.mapPointsToStatisticsItems() = map {
     GradeStatisticsItem(
-        type = GradeStatisticsItem.DataType.POINTS,
+        type = ViewType.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,
+        studentId = student.id.toInt(),
         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(
-        studentId = userLoginId,
+        userLoginId = 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.id.toInt(),
+        studentId = student.studentId,
         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 = "", colors: List<Long>) = map {
+fun List<SdkStudent>.mapToEntities(password: String = "") = map {
     StudentWithSemesters(
         student = Student(
             email = it.email,
@@ -28,10 +28,8 @@ fun List<SdkStudent>.mapToEntities(password: String = "", colors: List<Long>) =
             mobileBaseUrl = it.mobileBaseUrl,
             privateKey = it.privateKey,
             certificateKey = it.certificateKey,
-            loginMode = it.loginMode.name,
-        ).apply {
-            avatarColor = colors.random()
-        },
+            loginMode = it.loginMode.name
+        ),
         semesters = it.semesters.mapToEntities(it.studentId)
     )
 }

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

@@ -3,10 +3,11 @@ 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: DataType,
+    val type: ViewType,
 
     val average: String,
 
@@ -15,11 +16,4 @@ data class GradeStatisticsItem(
     val semester: GradeSemesterStatistics?,
 
     val points: GradePointsStatistics?
-
-) {
-    enum class DataType {
-        SEMESTER,
-        PARTIAL,
-        POINTS,
-    }
-}
+)

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

@@ -14,7 +14,6 @@ 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
@@ -28,12 +27,9 @@ 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,7 +10,6 @@ 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
 
@@ -21,12 +20,9 @@ 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(
-        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {

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

@@ -12,7 +12,6 @@ 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,12 +23,9 @@ 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

@@ -10,7 +10,6 @@ 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
 
@@ -21,12 +20,9 @@ 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(
-        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
         query = { conferenceDb.loadAll(semester.diaryId, student.studentId) },
         fetch = {

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

@@ -12,7 +12,6 @@ import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.startExamsDay
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -24,12 +23,9 @@ 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(
-        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
         query = { examDb.loadAll(semester.diaryId, semester.studentId, start.startExamsDay, start.endExamsDay) },
         fetch = {

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

@@ -16,7 +16,6 @@ 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
@@ -29,20 +28,14 @@ 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(
-        mutex = saveFetchResultMutex,
-        shouldFetch = { (details, summaries) ->
-            val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester))
-            details.isEmpty() || summaries.isEmpty() || forceRefresh || isShouldBeRefreshed
-        },
+        shouldFetch = { (details, summaries) -> details.isEmpty() || summaries.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
         query = {
-            val detailsFlow = gradeDb.loadAll(semester.semesterId, semester.studentId)
-            val summaryFlow = gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
-            detailsFlow.combine(summaryFlow) { details, summaries -> details to summaries }
+            gradeDb.loadAll(semester.semesterId, semester.studentId).combine(gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)) { details, summaries ->
+                details to summaries
+            }
         },
         fetch = {
             val (details, summary) = sdk.init(student)
@@ -99,27 +92,19 @@ 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 }
-        }
+        return gradeDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { grade -> !grade.isNotified } }
     }
 
     fun getNotNotifiedPredictedGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified }
-        }
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }
     }
 
     fun getNotNotifiedFinalGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified }
-        }
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }
     }
 
     suspend fun updateGrade(grade: Grade) {

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

@@ -17,7 +17,6 @@ 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
@@ -31,16 +30,11 @@ 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 = {
@@ -77,7 +71,6 @@ 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 = {
@@ -119,7 +112,6 @@ 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,7 +13,6 @@ 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
@@ -25,12 +24,9 @@ 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(
-        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
         query = { homeworkDb.loadAll(semester.semesterId, semester.studentId, start.monday, end.sunday) },
         fetch = {

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

@@ -9,8 +9,6 @@ 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
@@ -21,10 +19,7 @@ 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) },
@@ -38,9 +33,6 @@ 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

@@ -20,7 +20,6 @@ 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
@@ -34,13 +33,10 @@ class MessageRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
-    private val saveFetchResultMutex = Mutex()
-
     private val cacheKey = "message"
 
     @Suppress("UNUSED_PARAMETER")
     fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student, folder)) },
         query = { messagesDb.loadAll(student.id.toInt(), folder.id) },
         fetch = { sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).mapToEntities(student) },

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

@@ -13,7 +13,6 @@ 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
 
@@ -24,12 +23,9 @@ 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,7 +13,6 @@ 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
 
@@ -24,12 +23,9 @@ 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 = {

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

@@ -2,7 +2,6 @@ package io.github.wulkanowy.data.repositories
 
 import android.content.Context
 import android.content.SharedPreferences
-import androidx.core.content.edit
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
@@ -19,43 +18,26 @@ class PreferencesRepository @Inject constructor(
         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
@@ -73,90 +55,50 @@ 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(notificationsEnableKey, R.bool.pref_default_notifications_enable)
+        get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
-    val isUpcomingLessonsNotificationsEnableKey =
-        context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
+    val 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
-        )
-
-    var isKitkatDialogDisabled: Boolean
-        get() = sharedPref.getBoolean("kitkat_dialog_disabled", false)
-        set(value) = sharedPref.edit { putBoolean("kitkat_dialog_disabled", value) }
+        get() = getBoolean(R.string.pref_key_subjects_without_grades, R.bool.pref_default_subjects_without_grades)
 
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
-    private fun getString(id: String, default: Int) =
-        sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
+    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))
 }

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.studentId)
-        val old = recipientDb.loadAll(unit.studentId, unit.unitId, role)
+        val new = sdk.init(student).getRecipients(unit.unitId, role).mapToEntities(unit.senderId)
+        val old = recipientDb.loadAll(unit.senderId, unit.unitId, role)
 
         recipientDb.deleteAll(old uniqueSubtract new)
         recipientDb.insertAll(new uniqueSubtract old)
     }
 
     suspend fun getRecipients(student: Student, unit: ReportingUnit, role: Int): List<Recipient> {
-        return recipientDb.loadAll(unit.studentId, unit.unitId, role).ifEmpty {
+        return recipientDb.loadAll(unit.senderId, unit.unitId, role).ifEmpty {
             refreshRecipients(student, unit, role)
 
-            recipientDb.loadAll(unit.studentId, unit.unitId, role)
+            recipientDb.loadAll(unit.senderId, unit.unitId, role)
         }
     }
 
     suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
-        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId).mapToEntities(student.studentId)
+        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId).mapToEntities(student.userLoginId)
     }
 }

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.id.toInt())
+        val old = reportingUnitDb.load(student.studentId)
 
         reportingUnitDb.deleteAll(old.uniqueSubtract(new))
         reportingUnitDb.insertAll(new.uniqueSubtract(old))
     }
 
     suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return reportingUnitDb.load(student.id.toInt()).ifEmpty {
+        return reportingUnitDb.load(student.studentId).ifEmpty {
             refreshReportingUnits(student)
 
-            reportingUnitDb.load(student.id.toInt())
+            reportingUnitDb.load(student.studentId)
         }
     }
 
     suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
-        return reportingUnitDb.loadOne(student.id.toInt(), unitId) ?: run {
+        return reportingUnitDb.loadOne(student.studentId, unitId) ?: run {
             refreshReportingUnits(student)
 
-            return reportingUnitDb.loadOne(student.id.toInt(), unitId)
+            return reportingUnitDb.loadOne(student.studentId, unitId)
         }
     }
 }

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

@@ -7,7 +7,6 @@ import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -17,11 +16,8 @@ class SchoolRepository @Inject constructor(
     private val sdk: Sdk
 ) {
 
-    private val saveFetchResultMutex = Mutex()
-
     fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean) =
         networkBoundResource(
-            mutex = saveFetchResultMutex,
             shouldFetch = { it == null || forceRefresh },
             query = { schoolDb.load(semester.studentId, semester.classId) },
             fetch = {

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

@@ -7,7 +7,6 @@ import io.github.wulkanowy.data.mappers.mapToEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
-import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -17,11 +16,8 @@ class StudentInfoRepository @Inject constructor(
     private val sdk: Sdk
 ) {
 
-    private val saveFetchResultMutex = Mutex()
-
     fun getStudentInfo(student: Student, semester: Semester, forceRefresh: Boolean) =
         networkBoundResource(
-            mutex = saveFetchResultMutex,
             shouldFetch = { it == null || forceRefresh },
             query = { studentInfoDao.loadStudentInfo(student.studentId) },
             fetch = {

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

@@ -5,12 +5,11 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
+import io.github.wulkanowy.data.db.entities.StudentNick
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
@@ -24,8 +23,7 @@ class StudentRepository @Inject constructor(
     private val dispatchers: DispatchersProvider,
     private val studentDb: StudentDao,
     private val semesterDb: SemesterDao,
-    private val sdk: Sdk,
-    private val appInfo: AppInfo
+    private val sdk: Sdk
 ) {
 
     suspend fun isStudentSaved() = getSavedStudents(false).isNotEmpty()
@@ -37,8 +35,7 @@ class StudentRepository @Inject constructor(
         symbol: String,
         token: String
     ): List<StudentWithSemesters> =
-        sdk.getStudentsFromMobileApi(token, pin, symbol, "")
-            .mapToEntities(colors = appInfo.defaultColorsForAvatar)
+        sdk.getStudentsFromMobileApi(token, pin, symbol, "").mapToEntities()
 
     suspend fun getStudentsScrapper(
         email: String,
@@ -47,7 +44,7 @@ class StudentRepository @Inject constructor(
         symbol: String
     ): List<StudentWithSemesters> =
         sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol)
-            .mapToEntities(password, appInfo.defaultColorsForAvatar)
+            .mapToEntities(password)
 
     suspend fun getStudentsHybrid(
         email: String,
@@ -55,58 +52,46 @@ class StudentRepository @Inject constructor(
         scrapperBaseUrl: String,
         symbol: String
     ): List<StudentWithSemesters> =
-        sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
-            .mapToEntities(password, appInfo.defaultColorsForAvatar)
+        sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).mapToEntities(password)
 
     suspend fun getSavedStudents(decryptPass: Boolean = true) =
-        studentDb.loadStudentsWithSemesters()
-            .map {
+        withContext(dispatchers.backgroundThread) {
+            studentDb.loadStudentsWithSemesters().map {
                 it.apply {
                     if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-                        student.password = withContext(dispatchers.backgroundThread) {
-                            decrypt(student.password)
-                        }
+                        student.password = decrypt(student.password)
                     }
                 }
             }
+        }
 
-    suspend fun getStudentById(id: Long, decryptPass: Boolean = true): Student {
-        val student = studentDb.loadById(id) ?: throw NoCurrentStudentException()
-
-        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-            student.password = withContext(dispatchers.backgroundThread) {
-                decrypt(student.password)
+    suspend fun getStudentById(id: Int) = withContext(dispatchers.backgroundThread) {
+        studentDb.loadById(id)?.apply {
+            if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) {
+                password = decrypt(password)
             }
         }
-        return student
-    }
+    } ?: throw NoCurrentStudentException()
 
-    suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
-        val student = studentDb.loadCurrent() ?: throw NoCurrentStudentException()
-
-        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-            student.password = withContext(dispatchers.backgroundThread) {
-                decrypt(student.password)
+    suspend fun getCurrentStudent(decryptPass: Boolean = true) =
+        withContext(dispatchers.backgroundThread) {
+            studentDb.loadCurrent()?.apply {
+                if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) {
+                    password = decrypt(password)
+                }
             }
-        }
-        return student
-    }
+        } ?: throw NoCurrentStudentException()
 
     suspend fun saveStudents(studentsWithSemesters: List<StudentWithSemesters>): List<Long> {
-        val semesters = studentsWithSemesters.flatMap { it.semesters }
-        val students = studentsWithSemesters.map { it.student }
-            .map {
-                it.apply {
-                    if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) {
-                        password = withContext(dispatchers.backgroundThread) {
-                            encrypt(password, context)
-                        }
-                    }
-                }
-            }
+        semesterDb.insertSemesters(studentsWithSemesters.flatMap { it.semesters })
 
-        semesterDb.insertSemesters(semesters)
-        return studentDb.insertAll(students)
+        return withContext(dispatchers.backgroundThread) {
+            studentDb.insertAll(studentsWithSemesters.map { it.student }.map {
+                if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) {
+                    it.copy(password = encrypt(it.password, context))
+                } else it
+            })
+        }
     }
 
     suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
@@ -118,6 +103,5 @@ class StudentRepository @Inject constructor(
 
     suspend fun logoutStudent(student: Student) = studentDb.delete(student)
 
-    suspend fun updateStudentNickAndAvatar(studentNickAndAvatar: StudentNickAndAvatar) =
-        studentDb.update(studentNickAndAvatar)
+    suspend fun updateStudentNick(studentNick: StudentNick) = studentDb.update(studentNick)
 }

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

@@ -8,7 +8,6 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -18,10 +17,7 @@ class SubjectRepository @Inject constructor(
     private val sdk: Sdk
 ) {
 
-    private val saveFetchResultMutex = Mutex()
-
     fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh },
         query = { subjectDao.loadAll(semester.diaryId, semester.studentId) },
         fetch = {

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

@@ -8,7 +8,6 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -18,10 +17,7 @@ class TeacherRepository @Inject constructor(
     private val sdk: Sdk
 ) {
 
-    private val saveFetchResultMutex = Mutex()
-
     fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
-        mutex = saveFetchResultMutex,
         shouldFetch = { it.isEmpty() || forceRefresh },
         query = { teacherDb.loadAll(semester.studentId, semester.classId) },
         fetch = {

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

@@ -18,7 +18,6 @@ import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -32,12 +31,9 @@ class TimetableRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
 ) {
 
-    private val saveFetchResultMutex = Mutex()
-
     private val cacheKey = "timetable"
 
     fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean, refreshAdditional: Boolean = false) = networkBoundResource(
-        mutex = saveFetchResultMutex,
         shouldFetch = { (timetable, additional) -> timetable.isEmpty() || (additional.isEmpty() && refreshAdditional) || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
         query = {
             timetableDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)

app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt

@@ -37,7 +37,6 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
     abstract var presenter: T
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        inject()
         themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
@@ -45,9 +44,7 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
         if (SDK_INT >= LOLLIPOP) {
             @Suppress("DEPRECATION")
-            setTaskDescription(
-                ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface))
-            )
+            setTaskDescription(ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface)))
         }
     }
 
@@ -87,9 +84,4 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         invalidateOptionsMenu()
         presenter.onDetachView()
     }
-
-    //https://github.com/google/dagger/releases/tag/dagger-2.33
-    protected open fun inject() {
-        throw UnsupportedOperationException()
-    }
 }

app/src/main/java/io/github/wulkanowy/ui/base/BaseFragmentPagerAdapter.kt

@@ -4,7 +4,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 
-//TODO  Use ViewPager2
 class BaseFragmentPagerAdapter(private val fragmentManager: FragmentManager) :
     FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 

app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt

@@ -42,8 +42,10 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
     companion object {
         private const val ARGUMENT_KEY = "Data"
 
-        fun newInstance(error: Throwable) = ErrorDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, error) }
+        fun newInstance(error: Throwable): ErrorDialog {
+            return ErrorDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, error) }
+            }
         }
     }
 
@@ -55,14 +57,12 @@ class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogErrorBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return DialogErrorBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         val stringWriter = StringWriter().apply {
             error.printStackTrace(PrintWriter(this))

app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt

@@ -8,9 +8,6 @@ import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -20,13 +17,7 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
     fun applyActivityTheme(activity: AppCompatActivity) {
         if (isThemeApplicable(activity)) {
             applyDefaultTheme()
-            if (preferencesRepository.appTheme == "black") {
-                when (activity) {
-                    is MainActivity -> activity.setTheme(R.style.WulkanowyTheme_Black)
-                    is LoginActivity -> activity.setTheme(R.style.WulkanowyTheme_Login_Black)
-                    is SendMessageActivity -> activity.setTheme(R.style.WulkanowyTheme_MessageSend_Black)
-                }
-            }
+            if (preferencesRepository.appTheme == "black") activity.setTheme(R.style.WulkanowyTheme_Black)
         }
     }
 
@@ -42,13 +33,8 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
     }
 
     private fun isThemeApplicable(activity: AppCompatActivity): Boolean {
-        return activity.packageManager
-            .getPackageInfo(activity.packageName, GET_ACTIVITIES)
-            .activities.singleOrNull { it.name == activity::class.java.canonicalName }
-            ?.theme.let {
-                it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar
-                    || it == R.style.WulkanowyTheme_Login || it == R.style.WulkanowyTheme_Login_Black
-                    || it == R.style.WulkanowyTheme_MessageSend || it == R.style.WulkanowyTheme_MessageSend_Black
-            }
+        return activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
+            .activities.singleOrNull { it.name == activity::class.java.canonicalName }?.theme
+            .let { it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar }
     }
 }

app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt

@@ -1,25 +1,20 @@
 package io.github.wulkanowy.ui.base
 
 import android.annotation.SuppressLint
+import android.graphics.PorterDuff
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.nickOrName
 import javax.inject.Inject
 
-class WidgetConfigureAdapter @Inject constructor() :
-    RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
+class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
 
-    var items = emptyList<StudentWithSemesters>()
-
-    var selectedId = -1L
+    var items = emptyList<Pair<Student, Boolean>>()
 
     var onClickListener: (Student) -> Unit = {}
 
@@ -31,33 +26,17 @@ class WidgetConfigureAdapter @Inject constructor() :
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (student, semesters) = items[position]
-        val semester = semesters.maxByOrNull { it.semesterId }
-        val context = holder.binding.root.context
-        val checkBackgroundColor = context.getThemeAttrColor(R.attr.colorSurface)
-        val avatar = context.createNameInitialsDrawable(student.nickOrName, student.avatarColor)
-        val isDuplicatedStudent = items.filter {
-            val studentToCompare = it.student
-
-            studentToCompare.studentId == student.studentId
-                && studentToCompare.schoolSymbol == student.schoolSymbol
-                && studentToCompare.symbol == student.symbol
-        }.size > 1
+        val (student, isCurrent) = items[position]
 
         with(holder.binding) {
-            accountItemName.text = "${student.nickOrName} ${semester?.diaryName.orEmpty()}"
+            accountItemName.text = "${student.nickOrName} ${student.className}"
             accountItemSchool.text = student.schoolName
-            accountItemImage.setImageDrawable(avatar)
 
-            with(accountItemAccountType) {
-                setText(if (student.isParent) R.string.account_type_parent else R.string.account_type_student)
-                isVisible = isDuplicatedStudent
-            }
+            with(accountItemImage) {
+                val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
 
-            with(accountItemCheck) {
-                isVisible = student.id == selectedId
-                borderColor = checkBackgroundColor
-                circleColor = checkBackgroundColor
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
             }
 
             root.setOnClickListener { onClickListener(student) }

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

@@ -4,9 +4,9 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import androidx.appcompat.app.AlertDialog
 import androidx.core.text.parseAsHtml
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
 import dagger.hilt.android.AndroidEntryPoint
@@ -26,9 +26,14 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
     @Inject
     lateinit var licenseAdapter: LicenseAdapter
 
+    private val libs by lazy { Libs(requireContext()) }
+
     override val titleStringId get() = R.string.license_title
 
-    override val appLibraries by lazy { Libs(requireContext()).libraries }
+    override val appLibraries: ArrayList<Library>?
+        get() = context?.let {
+            libs.prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+        }
 
     companion object {
         fun newInstance() = LicenseFragment()
@@ -58,7 +63,7 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
 
     override fun openLicense(licenseHtml: String) {
         context?.let {
-            MaterialAlertDialogBuilder(it).apply {
+            AlertDialog.Builder(it).apply {
                 setTitle(R.string.license_dialog_title)
                 setMessage(licenseHtml.parseAsHtml())
                 setPositiveButton(android.R.string.ok) { _, _ -> }

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

@@ -5,7 +5,7 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface LicenseView : BaseView {
 
-    val appLibraries: List<Library>
+    val appLibraries: ArrayList<Library>?
 
     fun initView()
 

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt

@@ -1,17 +1,16 @@
 package io.github.wulkanowy.ui.modules.account
 
 import android.annotation.SuppressLint
+import android.graphics.PorterDuff
 import android.view.LayoutInflater
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
-import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.HeaderAccountBinding
 import io.github.wulkanowy.databinding.ItemAccountBinding
-import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.nickOrName
 import javax.inject.Inject
@@ -73,12 +72,9 @@ class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.V
         binding: ItemAccountBinding,
         studentWithSemesters: StudentWithSemesters
     ) {
-        val context = binding.root.context
-        val (student, semesters) = studentWithSemesters
-        val semester = semesters.maxByOrNull { it.semesterId }
-        val avatar = context.createNameInitialsDrawable(student.nickOrName, student.avatarColor)
-        val checkBackgroundColor =
-            context.getThemeAttrColor(if (isAccountQuickDialogMode) R.attr.colorBackgroundFloating else R.attr.colorSurface)
+        val student = studentWithSemesters.student
+        val semesters = studentWithSemesters.semesters
+        val diary = semesters.maxByOrNull { it.semesterId }
         val isDuplicatedStudent = items.filter {
             if (it.value !is StudentWithSemesters) return@filter false
             val studentToCompare = it.value.student
@@ -89,19 +85,17 @@ class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.V
         }.size > 1 && isAccountQuickDialogMode
 
         with(binding) {
-            accountItemName.text = "${student.nickOrName} ${semester?.diaryName.orEmpty()}"
+            accountItemName.text = "${student.nickOrName} ${diary?.diaryName.orEmpty()}"
             accountItemSchool.text = studentWithSemesters.student.schoolName
-            accountItemImage.setImageDrawable(avatar)
+            accountItemAccountType.setText(if (student.isParent) R.string.account_type_parent else R.string.account_type_student)
+            accountItemAccountType.visibility = if (isDuplicatedStudent) VISIBLE else GONE
 
-            with(accountItemAccountType) {
-                setText(if (student.isParent) R.string.account_type_parent else R.string.account_type_student)
-                isVisible = isDuplicatedStudent
-            }
+            with(accountItemImage) {
+                val colorImage =
+                    if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                    else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
 
-            with(accountItemCheck) {
-                isVisible = student.isCurrent
-                borderColor = checkBackgroundColor
-                circleColor = checkBackgroundColor
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
             }
 
             root.setOnClickListener { onClickListener(studentWithSemesters) }

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt

@@ -34,20 +34,25 @@ class AccountFragment : BaseFragment<FragmentAccountBinding>(R.layout.fragment_a
 
     override val titleStringId = R.string.account_title
 
+    override var subtitleString = ""
+
+    override val isViewEmpty get() = accountAdapter.items.isEmpty()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
         binding = FragmentAccountBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
+        binding.accountErrorRetry.setOnClickListener { presenter.onRetry() }
+        binding.accountErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
         binding.accountRecycler.apply {
             layoutManager = LinearLayoutManager(context)
             adapter = accountAdapter
@@ -55,7 +60,9 @@ class AccountFragment : BaseFragment<FragmentAccountBinding>(R.layout.fragment_a
 
         accountAdapter.onClickListener = presenter::onItemSelected
 
-        binding.accountAdd.setOnClickListener { presenter.onAddSelected() }
+        with(binding) {
+            accountAdd.setOnClickListener { presenter.onAddSelected() }
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -77,7 +84,28 @@ class AccountFragment : BaseFragment<FragmentAccountBinding>(R.layout.fragment_a
 
     override fun openAccountDetailsView(studentWithSemesters: StudentWithSemesters) {
         (activity as? MainActivity)?.pushView(
-            AccountDetailsFragment.newInstance(studentWithSemesters)
+            AccountDetailsFragment.newInstance(
+                studentWithSemesters
+            )
         )
     }
+
+    override fun showErrorView(show: Boolean) {
+        binding.accountError.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.accountErrorMessage.text = message
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.accountProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showContent(show: Boolean) {
+        with(binding) {
+            accountRecycler.visibility = if (show) View.VISIBLE else View.GONE
+            accountAdd.visibility = if (show) View.VISIBLE else View.GONE
+        }
+    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt

@@ -5,6 +5,7 @@ import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.afterLoading
 import io.github.wulkanowy.utils.flowWithResource
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -15,13 +16,28 @@ class AccountPresenter @Inject constructor(
     studentRepository: StudentRepository,
 ) : BasePresenter<AccountView>(errorHandler, studentRepository) {
 
+    private lateinit var lastError: Throwable
+
     override fun onAttachView(view: AccountView) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Account view was initialized")
+        errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
     }
 
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
+        loadData()
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
     fun onAddSelected() {
         Timber.i("Select add account")
         view?.openLoginView()
@@ -31,24 +47,6 @@ class AccountPresenter @Inject constructor(
         view?.openAccountDetailsView(studentWithSemesters)
     }
 
-    private fun loadData() {
-        flowWithResource { studentRepository.getSavedStudents(false) }
-            .onEach {
-                when (it.status) {
-                    Status.LOADING -> Timber.i("Loading account data started")
-                    Status.SUCCESS -> {
-                        Timber.i("Loading account result: Success")
-                        view?.updateData(createAccountItems(it.data!!))
-                    }
-                    Status.ERROR -> {
-                        Timber.i("Loading account result: An exception occurred")
-                        errorHandler.dispatch(it.error!!)
-                    }
-                }
-            }
-            .launch("load")
-    }
-
     private fun createAccountItems(items: List<StudentWithSemesters>): List<AccountItem<*>> {
         return items.groupBy {
             Account("${it.student.userName} (${it.student.email})", it.student.isParent)
@@ -62,4 +60,45 @@ class AccountPresenter @Inject constructor(
             }
             .flatten()
     }
+
+    private fun loadData() {
+        flowWithResource { studentRepository.getSavedStudents(false) }
+            .onEach {
+                when (it.status) {
+                    Status.LOADING -> {
+                        Timber.i("Loading account data started")
+                        view?.run {
+                            showProgress(true)
+                            showContent(false)
+                        }
+                    }
+                    Status.SUCCESS -> {
+                        Timber.i("Loading account result: Success")
+                        view?.updateData(createAccountItems(it.data!!))
+                        view?.run {
+                            showContent(true)
+                            showErrorView(false)
+                        }
+                    }
+                    Status.ERROR -> {
+                        Timber.i("Loading account result: An exception occurred")
+                        errorHandler.dispatch(it.error!!)
+                    }
+                }
+            }
+            .afterLoading { view?.showProgress(false) }
+            .launch()
+    }
+
+    private fun showErrorViewOnError(message: String, error: Throwable) {
+        view?.run {
+            if (isViewEmpty) {
+                lastError = error
+                setErrorDetails(message)
+                showErrorView(true)
+                showContent(false)
+                showProgress(false)
+            } else showError(message, error)
+        }
+    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt

@@ -5,6 +5,8 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface AccountView : BaseView {
 
+    val isViewEmpty: Boolean
+
     fun initView()
 
     fun updateData(data: List<AccountItem<*>>)
@@ -12,4 +14,13 @@ interface AccountView : BaseView {
     fun openLoginView()
 
     fun openAccountDetailsView(studentWithSemesters: StudentWithSemesters)
+
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
 }
+

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt

@@ -7,7 +7,6 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.get
-import androidx.core.view.isVisible
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
@@ -19,7 +18,6 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoFragment
 import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
-import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.nickOrName
 import javax.inject.Inject
 
@@ -33,6 +31,8 @@ class AccountDetailsFragment :
 
     override val titleStringId = R.string.account_details_title
 
+    override var subtitleString = ""
+
     companion object {
 
         private const val ARGUMENT_KEY = "Data"
@@ -88,15 +88,8 @@ class AccountDetailsFragment :
 
     override fun showAccountData(student: Student) {
         with(binding) {
-            accountDetailsCheck.isVisible = student.isCurrent
             accountDetailsName.text = student.nickOrName
             accountDetailsSchool.text = student.schoolName
-            accountDetailsAvatar.setImageDrawable(
-                requireContext().createNameInitialsDrawable(
-                    student.nickOrName,
-                    student.avatarColor
-                )
-            )
         }
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsPresenter.kt

@@ -21,7 +21,7 @@ class AccountDetailsPresenter @Inject constructor(
     private val syncManager: SyncManager
 ) : BasePresenter<AccountDetailsView>(errorHandler, studentRepository) {
 
-    private var studentWithSemesters: StudentWithSemesters? = null
+    private lateinit var studentWithSemesters: StudentWithSemesters
 
     private lateinit var lastError: Throwable
 
@@ -69,10 +69,10 @@ class AccountDetailsPresenter @Inject constructor(
                     }
                     Status.SUCCESS -> {
                         Timber.i("Loading account details view result: Success")
-                        studentWithSemesters = it.data
+                        studentWithSemesters = it.data!!
                         view?.run {
-                            showAccountData(studentWithSemesters!!.student)
-                            enableSelectStudentButton(!studentWithSemesters!!.student.isCurrent)
+                            showAccountData(studentWithSemesters.student)
+                            enableSelectStudentButton(!studentWithSemesters.student.isCurrent)
                             showContent(true)
                             showErrorView(false)
                         }
@@ -88,23 +88,17 @@ class AccountDetailsPresenter @Inject constructor(
     }
 
     fun onAccountEditSelected() {
-        studentWithSemesters?.let {
-            view?.showAccountEditDetailsDialog(it.student)
-        }
+        view?.showAccountEditDetailsDialog(studentWithSemesters.student)
     }
 
     fun onStudentInfoSelected(infoType: StudentInfoView.Type) {
-        studentWithSemesters?.let {
-            view?.openStudentInfoView(infoType, it)
-        }
+        view?.openStudentInfoView(infoType, studentWithSemesters)
     }
 
     fun onStudentSelect() {
-        if (studentWithSemesters == null) return
+        Timber.i("Select student ${studentWithSemesters.student.id}")
 
-        Timber.i("Select student ${studentWithSemesters!!.student.id}")
-
-        flowWithResource { studentRepository.switchStudent(studentWithSemesters!!) }
+        flowWithResource { studentRepository.switchStudent(studentWithSemesters) }
             .onEach {
                 when (it.status) {
                     Status.LOADING -> Timber.i("Attempt to change a student")
@@ -128,10 +122,8 @@ class AccountDetailsPresenter @Inject constructor(
     }
 
     fun onLogoutConfirm() {
-        if (studentWithSemesters == null) return
-
         flowWithResource {
-            val studentToLogout = studentWithSemesters!!.student
+            val studentToLogout = studentWithSemesters.student
 
             studentRepository.logoutStudent(studentToLogout)
             val students = studentRepository.getSavedStudents(false)
@@ -151,7 +143,7 @@ class AccountDetailsPresenter @Inject constructor(
                             syncManager.stopSyncWorker()
                             openClearLoginView()
                         }
-                        studentWithSemesters!!.student.isCurrent -> {
+                        studentWithSemesters.student.isCurrent -> {
                             Timber.i("Logout result: Logout student and switch to another")
                             recreateMainView()
                         }

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditColorAdapter.kt

@@ -1,90 +0,0 @@
-package io.github.wulkanowy.ui.modules.account.accountedit
-
-import android.annotation.SuppressLint
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
-import android.graphics.drawable.RippleDrawable
-import android.graphics.drawable.StateListDrawable
-import android.os.Build
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.databinding.ItemAccountEditColorBinding
-import javax.inject.Inject
-
-class AccountEditColorAdapter @Inject constructor() :
-    RecyclerView.Adapter<AccountEditColorAdapter.ViewHolder>() {
-
-    var items = listOf<Int>()
-
-    var selectedColor = 0
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
-        ItemAccountEditColorBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("RestrictedApi", "NewApi")
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val item = items[position]
-
-        with(holder.binding) {
-            accountEditItemColor.setImageDrawable(GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(item)
-            })
-
-            accountEditItemColorContainer.foreground = item.createForegroundDrawable()
-            accountEditCheck.isVisible = selectedColor == item
-
-            root.setOnClickListener {
-                val oldSelectedPosition = items.indexOf(selectedColor)
-                selectedColor = item
-
-                notifyItemChanged(oldSelectedPosition)
-                notifyItemChanged(position)
-            }
-        }
-    }
-
-    private fun Int.createForegroundDrawable(): Drawable =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            val mask = GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(Color.BLACK)
-            }
-            RippleDrawable(ColorStateList.valueOf(this.rippleColor), null, mask)
-        } else {
-            val foreground = StateListDrawable().apply {
-                alpha = 80
-                setEnterFadeDuration(250)
-                setExitFadeDuration(250)
-            }
-
-            val mask = GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(this@createForegroundDrawable.rippleColor)
-            }
-
-            foreground.apply {
-                addState(intArrayOf(android.R.attr.state_pressed), mask)
-                addState(intArrayOf(), ColorDrawable(Color.TRANSPARENT))
-            }
-        }
-
-    private inline val Int.rippleColor: Int
-        get() {
-            val hsv = FloatArray(3)
-            Color.colorToHSV(this, hsv)
-            hsv[2] = hsv[2] * 0.5f
-            return Color.HSVToColor(hsv)
-        }
-
-    class ViewHolder(val binding: ItemAccountEditColorBinding) :
-        RecyclerView.ViewHolder(binding.root)
-}

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt

@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.GridLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.DialogAccountEditBinding
@@ -17,9 +16,6 @@ class AccountEditDialog : BaseDialogFragment<DialogAccountEditBinding>(), Accoun
     @Inject
     lateinit var presenter: AccountEditPresenter
 
-    @Inject
-    lateinit var accountEditColorAdapter: AccountEditColorAdapter
-
     companion object {
 
         private const val ARGUMENT_KEY = "student_with_semesters"
@@ -52,30 +48,8 @@ class AccountEditDialog : BaseDialogFragment<DialogAccountEditBinding>(), Accoun
         with(binding) {
             accountEditDetailsCancel.setOnClickListener { dismiss() }
             accountEditDetailsSave.setOnClickListener {
-                presenter.changeStudentNickAndAvatar(
-                    binding.accountEditDetailsNickText.text.toString(),
-                    accountEditColorAdapter.selectedColor
-                )
+                presenter.changeStudentNick(binding.accountEditDetailsNickText.text.toString())
             }
-
-            with(binding.accountEditColors) {
-                layoutManager = GridLayoutManager(context, 4)
-                adapter = accountEditColorAdapter
-            }
-        }
-    }
-
-    override fun updateSelectedColorData(color: Int) {
-        with(accountEditColorAdapter) {
-            selectedColor = color
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun updateColorsData(colors: List<Int>) {
-        with(accountEditColorAdapter) {
-            items = colors
-            notifyDataSetChanged()
         }
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt

@@ -2,11 +2,10 @@ package io.github.wulkanowy.ui.modules.account.accountedit
 
 import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
+import io.github.wulkanowy.data.db.entities.StudentNick
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.afterLoading
 import io.github.wulkanowy.utils.flowWithResource
 import kotlinx.coroutines.flow.onEach
@@ -14,15 +13,12 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class AccountEditPresenter @Inject constructor(
-    private val appInfo: AppInfo,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
 ) : BasePresenter<AccountEditView>(errorHandler, studentRepository) {
 
     lateinit var student: Student
 
-    private val colors = appInfo.defaultColorsForAvatar.map { it.toInt() }
-
     fun onAttachView(view: AccountEditView, student: Student) {
         super.onAttachView(view)
         this.student = student
@@ -32,49 +28,27 @@ class AccountEditPresenter @Inject constructor(
             showCurrentNick(student.nick.trim())
         }
         Timber.i("Account edit dialog view was initialized")
-        loadData()
-
-        view.updateColorsData(colors)
     }
 
-    private fun loadData() {
-        flowWithResource {
-            studentRepository.getStudentById(student.id, false).avatarColor
-        }.onEach { resource ->
-            when (resource.status) {
-                Status.LOADING -> Timber.i("Attempt to load student")
-                Status.SUCCESS -> {
-                    view?.updateSelectedColorData(resource.data?.toInt()!!)
-                    Timber.i("Attempt to load student: Success")
-                }
-                Status.ERROR -> {
-                    Timber.i("Attempt to load student: An exception occurred")
-                    errorHandler.dispatch(resource.error!!)
-                }
-            }
-        }.launch("load_data")
-    }
-
-    fun changeStudentNickAndAvatar(nick: String, avatarColor: Int) {
+    fun changeStudentNick(nick: String) {
         flowWithResource {
             val studentNick =
-                StudentNickAndAvatar(nick = nick.trim(), avatarColor = avatarColor.toLong())
-                    .apply { id = student.id }
-            studentRepository.updateStudentNickAndAvatar(studentNick)
+                StudentNick(nick = nick.trim()).apply { id = student.id }
+            studentRepository.updateStudentNick(studentNick)
         }.onEach {
             when (it.status) {
-                Status.LOADING -> Timber.i("Attempt to change a student nick and avatar")
+                Status.LOADING -> Timber.i("Attempt to change a student nick")
                 Status.SUCCESS -> {
-                    Timber.i("Change a student nick and avatar result: Success")
+                    Timber.i("Change a student nick result: Success")
                     view?.recreateMainView()
                 }
                 Status.ERROR -> {
-                    Timber.i("Change a student nick and avatar result: An exception occurred")
+                    Timber.i("Change a student result: An exception occurred")
                     errorHandler.dispatch(it.error!!)
                 }
             }
         }
             .afterLoading { view?.popView() }
-            .launch("update_student")
+            .launch()
     }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditView.kt

@@ -11,8 +11,4 @@ interface AccountEditView : BaseView {
     fun recreateMainView()
 
     fun showCurrentNick(nick: String)
-
-    fun updateSelectedColorData(color: Int)
-
-    fun updateColorsData(colors: List<Int>)
 }

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt

@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.DialogAccountQuickBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.ui.modules.account.AccountAdapter
@@ -25,15 +24,7 @@ class AccountQuickDialog : BaseDialogFragment<DialogAccountQuickBinding>(), Acco
     lateinit var presenter: AccountQuickPresenter
 
     companion object {
-
-        private const val STUDENTS_ARGUMENT_KEY = "students"
-
-        fun newInstance(studentsWithSemesters: List<StudentWithSemesters>) =
-            AccountQuickDialog().apply {
-                arguments = Bundle().apply {
-                    putSerializable(STUDENTS_ARGUMENT_KEY, studentsWithSemesters.toTypedArray())
-                }
-            }
+        fun newInstance() = AccountQuickDialog()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,12 +38,8 @@ class AccountQuickDialog : BaseDialogFragment<DialogAccountQuickBinding>(), Acco
         savedInstanceState: Bundle?
     ) = DialogAccountQuickBinding.inflate(inflater).apply { binding = this }.root
 
-    @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val studentsWithSemesters =
-            (requireArguments()[STUDENTS_ARGUMENT_KEY] as Array<StudentWithSemesters>).toList()
-
-        presenter.onAttachView(this, studentsWithSemesters)
+        presenter.onAttachView(this)
     }
 
     override fun initView() {

app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickPresenter.kt

@@ -17,15 +17,11 @@ class AccountQuickPresenter @Inject constructor(
     studentRepository: StudentRepository
 ) : BasePresenter<AccountQuickView>(errorHandler, studentRepository) {
 
-    private lateinit var studentsWithSemesters: List<StudentWithSemesters>
-
-    fun onAttachView(view: AccountQuickView, studentsWithSemesters: List<StudentWithSemesters>) {
+    override fun onAttachView(view: AccountQuickView) {
         super.onAttachView(view)
-        this.studentsWithSemesters = studentsWithSemesters
-
         view.initView()
         Timber.i("Account quick dialog view was initialized")
-        view.updateData(createAccountItems(studentsWithSemesters))
+        loadData()
     }
 
     fun onManagerSelected() {
@@ -61,6 +57,22 @@ class AccountQuickPresenter @Inject constructor(
             .launch("switch")
     }
 
+    private fun loadData() {
+        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading account data started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading account result: Success")
+                    view?.updateData(createAccountItems(it.data!!))
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading account result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch()
+    }
+
     private fun createAccountItems(items: List<StudentWithSemesters>) = items.map {
         AccountItem(it, AccountItem.ViewType.ITEM)
     }

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

@@ -18,11 +18,12 @@ class AttendanceDialog : DialogFragment() {
     private lateinit var attendance: Attendance
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Attendance) = AttendanceDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(exam: Attendance): AttendanceDialog {
+            return AttendanceDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
         }
     }
 
@@ -34,14 +35,12 @@ class AttendanceDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             attendanceDialogSubject.text = attendance.subject

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

@@ -192,7 +192,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showContent(show: Boolean) {
-        binding.attendanceRecycler.visibility = if (show) VISIBLE else GONE
+        binding. attendanceRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showRefresh(show: Boolean) {

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

@@ -190,48 +190,35 @@ class AttendancePresenter @Inject constructor(
         flowWithResourceIn {
             val student = studentRepository.getCurrentStudent()
             val semester = semesterRepository.getCurrentSemester(student)
-            attendanceRepository.getAttendance(
-                student,
-                semester,
-                currentDate,
-                currentDate,
-                forceRefresh
-            )
+            attendanceRepository.getAttendance(student, semester, currentDate, currentDate, forceRefresh)
         }.onEach {
             when (it.status) {
                 Status.LOADING -> {
                     view?.showExcuseButton(false)
                     if (!it.data.isNullOrEmpty()) {
-                        val filteredAttendance = if (prefRepository.isShowPresent) {
-                            it.data
-                        } else {
-                            it.data.filter { item -> !item.presence }
-                        }
-
                         view?.run {
                             enableSwipe(true)
                             showRefresh(true)
                             showProgress(false)
-                            showEmpty(filteredAttendance.isEmpty())
-                            showContent(filteredAttendance.isNotEmpty())
-                            updateData(filteredAttendance.sortedBy { item -> item.number })
+                            showContent(true)
+                            updateData(it.data.let { items ->
+                                if (prefRepository.isShowPresent) items
+                                else items.filter { item -> !item.presence }
+                            }.sortedBy { item -> item.number })
                         }
                     }
                 }
                 Status.SUCCESS -> {
                     Timber.i("Loading attendance result: Success")
-                    val filteredAttendance = if (prefRepository.isShowPresent) {
-                        it.data.orEmpty()
-                    } else {
-                        it.data?.filter { item -> !item.presence }.orEmpty()
-                    }
-
                     view?.apply {
-                        updateData(filteredAttendance.sortedBy { item -> item.number })
-                        showEmpty(filteredAttendance.isEmpty())
+                        updateData(it.data!!.let { items ->
+                            if (prefRepository.isShowPresent) items
+                            else items.filter { item -> !item.presence }
+                        }.sortedBy { item -> item.number })
+                        showEmpty(it.data.isEmpty())
                         showErrorView(false)
-                        showContent(filteredAttendance.isNotEmpty())
-                        showExcuseButton(filteredAttendance.any { item -> item.excusable })
+                        showContent(it.data.isNotEmpty())
+                        showExcuseButton(it.data.any { item -> item.excusable })
                     }
                     analytics.logEvent(
                         "load_data",

app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt

@@ -17,11 +17,12 @@ class ExamDialog : DialogFragment() {
     private lateinit var exam: Exam
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Exam) = ExamDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(exam: Exam): ExamDialog {
+            return ExamDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            }
         }
     }
 
@@ -33,14 +34,12 @@ class ExamDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogExamBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogExamBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             examDialogSubjectValue.text = exam.subject

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

@@ -86,11 +86,7 @@ class GradeAverageProvider @Inject constructor(
                 return@combine firstSemesterGradeSubject
             }
 
-            val isAnyVulcanAverageInFirstSemester =
-                firstSemesterGradeSubject.data.orEmpty().any { it.average != .0 }
-            val isAnyVulcanAverageInSecondSemester =
-                secondSemesterGradeSubject.data.orEmpty().any { it.average != .0 }
-
+            val isAnyAverage = secondSemesterGradeSubject.data.orEmpty().any { it.average != .0 }
             val updatedData = secondSemesterGradeSubject.data?.map { secondSemesterSubject ->
                 val firstSemesterSubject = firstSemesterGradeSubject.data.orEmpty()
                     .singleOrNull { it.subject == secondSemesterSubject.subject }
@@ -98,7 +94,7 @@ class GradeAverageProvider @Inject constructor(
                 val updatedAverage = if (averageMode == ALL_YEAR) {
                     calculateAllYearAverage(
                         student = student,
-                        isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
+                        isAnyAverage = isAnyAverage,
                         gradeAverageForceCalc = gradeAverageForceCalc,
                         secondSemesterSubject = secondSemesterSubject,
                         firstSemesterSubject = firstSemesterSubject
@@ -106,7 +102,7 @@ class GradeAverageProvider @Inject constructor(
                 } else {
                     calculateBothSemestersAverage(
                         student = student,
-                        isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
+                        isAnyAverage = isAnyAverage,
                         gradeAverageForceCalc = gradeAverageForceCalc,
                         secondSemesterSubject = secondSemesterSubject,
                         firstSemesterSubject = firstSemesterSubject
@@ -120,11 +116,11 @@ class GradeAverageProvider @Inject constructor(
 
     private fun calculateAllYearAverage(
         student: Student,
-        isAnyVulcanAverage: Boolean,
+        isAnyAverage: Boolean,
         gradeAverageForceCalc: Boolean,
         secondSemesterSubject: GradeSubject,
         firstSemesterSubject: GradeSubject?
-    ) = if (!isAnyVulcanAverage || gradeAverageForceCalc) {
+    ) = if (!isAnyAverage || gradeAverageForceCalc) {
         val updatedSecondSemesterGrades =
             secondSemesterSubject.grades.updateModifiers(student)
         val updatedFirstSemesterGrades =
@@ -137,23 +133,20 @@ class GradeAverageProvider @Inject constructor(
 
     private fun calculateBothSemestersAverage(
         student: Student,
-        isAnyVulcanAverage: Boolean,
+        isAnyAverage: Boolean,
         gradeAverageForceCalc: Boolean,
         secondSemesterSubject: GradeSubject,
         firstSemesterSubject: GradeSubject?
-    ): Double {
+    ) = if (!isAnyAverage || gradeAverageForceCalc) {
+        val secondSemesterAverage =
+            secondSemesterSubject.grades.updateModifiers(student).calcAverage()
+        val firstSemesterAverage = firstSemesterSubject?.grades?.updateModifiers(student)
+            ?.calcAverage() ?: secondSemesterAverage
         val divider = if (secondSemesterSubject.grades.any { it.weightValue > .0 }) 2 else 1
 
-        return if (!isAnyVulcanAverage || gradeAverageForceCalc) {
-            val secondSemesterAverage =
-                secondSemesterSubject.grades.updateModifiers(student).calcAverage()
-            val firstSemesterAverage = firstSemesterSubject?.grades?.updateModifiers(student)
-                ?.calcAverage() ?: secondSemesterAverage
-
-            (secondSemesterAverage + firstSemesterAverage) / divider
-        } else {
-            (secondSemesterSubject.average + (firstSemesterSubject?.average ?: secondSemesterSubject.average)) / divider
-        }
+        (secondSemesterAverage + firstSemesterAverage) / divider
+    } else {
+        (secondSemesterSubject.average + (firstSemesterSubject?.average ?: secondSemesterSubject.average)) / 2
     }
 
     private fun getGradeSubjects(

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

@@ -10,7 +10,6 @@ import android.view.View.VISIBLE
 import androidx.appcompat.app.AlertDialog
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.databinding.FragmentGradeBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
@@ -64,13 +63,11 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     override fun initView() {
         with(pagerAdapter) {
             containerId = binding.gradeViewPager.id
-            addFragmentsWithTitle(
-                mapOf(
-                    GradeDetailsFragment.newInstance() to getString(R.string.all_details),
-                    GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
-                    GradeStatisticsFragment.newInstance() to getString(R.string.grade_menu_statistics)
-                )
-            )
+            addFragmentsWithTitle(mapOf(
+                GradeDetailsFragment.newInstance() to getString(R.string.all_details),
+                GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
+                GradeStatisticsFragment.newInstance() to getString(R.string.grade_menu_statistics)
+            ))
         }
 
         with(binding.gradeViewPager) {
@@ -122,9 +119,11 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
         semesterSwitchMenu?.isVisible = show
     }
 
-    override fun showSemesterDialog(selectedIndex: Int, semesters: List<Semester>) {
-        val choices = semesters.map { getString(R.string.grade_semester, it.semesterName) }
-            .toTypedArray()
+    override fun showSemesterDialog(selectedIndex: Int) {
+        val choices = arrayOf(
+            getString(R.string.grade_semester, 1),
+            getString(R.string.grade_semester, 2)
+        )
 
         AlertDialog.Builder(requireContext())
             .setSingleChoiceItems(choices, selectedIndex) { dialog, which ->
@@ -138,10 +137,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override fun setCurrentSemesterName(semester: Int, schoolYear: Int) {
         subtitleString = getString(R.string.grade_subtitle, semester, schoolYear, schoolYear + 1)
-
-        if (isVisible) {
-            (activity as MainView?)?.setViewSubTitle(subtitleString)
-        }
+        (activity as MainView).setViewSubTitle(subtitleString)
     }
 
     fun onChildRefresh() {
@@ -153,8 +149,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
     }
 
     override fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean) {
-        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)
-            ?.onParentLoadData(semesterId, forceRefresh)
+        (pagerAdapter.getFragmentInstance(index) as? GradeView.GradeChildView)?.onParentLoadData(semesterId, forceRefresh)
     }
 
     override fun notifyChildParentReselected(index: Int) {

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

@@ -49,9 +49,7 @@ class GradePresenter @Inject constructor(
     }
 
     fun onSemesterSwitch(): Boolean {
-        if (semesters.isNotEmpty()) {
-            view?.showSemesterDialog(selectedIndex - 1, semesters.take(2))
-        }
+        if (semesters.isNotEmpty()) view?.showSemesterDialog(selectedIndex - 1)
         return true
     }
 
@@ -139,17 +137,11 @@ class GradePresenter @Inject constructor(
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
         Timber.d("Load grade tab child. Selected semester: $selectedIndex, semesters: ${semesters.joinToString { it.semesterName.toString() }}")
-
-        val newSelectedSemesterId = try {
-            semesters.first { it.semesterName == selectedIndex }.semesterId
-        } catch (e: NoSuchElementException) {
-            Timber.e(e, "Selected semester no exists")
-            return
-        }
-
-        if (forceRefresh || loadedSemesterId[index] != newSelectedSemesterId) {
-            Timber.i("Load grade child view index: $index")
-            view?.notifyChildLoadData(index, newSelectedSemesterId, forceRefresh)
+        semesters.first { it.semesterName == selectedIndex }.semesterId.also {
+            if (forceRefresh || loadedSemesterId[index] != it) {
+                Timber.i("Load grade child view index: $index")
+                view?.notifyChildLoadData(index, it, forceRefresh)
+            }
         }
     }
 

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

@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeView : BaseView {
@@ -19,7 +18,7 @@ interface GradeView : BaseView {
 
     fun showSemesterSwitch(show: Boolean)
 
-    fun showSemesterDialog(selectedIndex: Int, semesters: List<Semester>)
+    fun showSemesterDialog(selectedIndex: Int)
 
     fun setCurrentSemesterName(semester: Int, schoolYear: Int)
 

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

@@ -24,18 +24,17 @@ class GradeDetailsDialog : DialogFragment() {
     private lateinit var colorScheme: String
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
-
         private const val COLOR_SCHEME_KEY = "Scheme"
 
-        fun newInstance(grade: Grade, colorScheme: String) =
-            GradeDetailsDialog().apply {
+        fun newInstance(grade: Grade, colorScheme: String): GradeDetailsDialog {
+            return GradeDetailsDialog().apply {
                 arguments = Bundle().apply {
                     putSerializable(ARGUMENT_KEY, grade)
                     putString(COLOR_SCHEME_KEY, colorScheme)
                 }
             }
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,14 +46,12 @@ class GradeDetailsDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogGradeBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogGradeBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
 
         with(binding) {
             gradeDialogSubject.text = grade.subject

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

@@ -22,7 +22,6 @@ import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeSemesterStatistics
 import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.databinding.ItemGradeStatisticsBarBinding
-import io.github.wulkanowy.databinding.ItemGradeStatisticsHeaderBinding
 import io.github.wulkanowy.databinding.ItemGradeStatisticsPieBinding
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
@@ -30,16 +29,12 @@ import javax.inject.Inject
 class GradeStatisticsAdapter @Inject constructor() :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    var currentDataType = GradeStatisticsItem.DataType.PARTIAL
-
     var items = emptyList<GradeStatisticsItem>()
 
     var theme: String = "vulcan"
 
     var showAllSubjectsOnList: Boolean = false
 
-    var onDataTypeChangeListener: () -> Unit = {}
-
     private val vulcanGradeColors = listOf(
         6 to R.color.grade_vulcan_six,
         5 to R.color.grade_vulcan_five,
@@ -67,90 +62,37 @@ class GradeStatisticsAdapter @Inject constructor() :
         "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
     )
 
-    override fun getItemCount() =
-        (if (showAllSubjectsOnList) items.size else (if (items.isEmpty()) 0 else 1)) + 1
+    override fun getItemCount() = if (showAllSubjectsOnList) items.size else (if (items.isEmpty()) 0 else 1)
 
-    override fun getItemViewType(position: Int) =
-        if (position == 0) {
-            ViewType.HEADER.id
-        } else {
-            when (items[position - 1].type) {
-                GradeStatisticsItem.DataType.PARTIAL -> ViewType.PARTIAL.id
-                GradeStatisticsItem.DataType.POINTS -> ViewType.POINTS.id
-                GradeStatisticsItem.DataType.SEMESTER -> ViewType.SEMESTER.id
-            }
-        }
+    override fun getItemViewType(position: Int) = items[position].type.id
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
         return when (viewType) {
-            ViewType.PARTIAL.id -> PartialViewHolder(
-                ItemGradeStatisticsPieBinding.inflate(inflater, parent, false)
-            )
-            ViewType.SEMESTER.id -> SemesterViewHolder(
-                ItemGradeStatisticsPieBinding.inflate(inflater, parent, false)
-            )
-            ViewType.POINTS.id -> PointsViewHolder(
-                ItemGradeStatisticsBarBinding.inflate(inflater, parent, false)
-            )
-            ViewType.HEADER.id -> HeaderViewHolder(
-                ItemGradeStatisticsHeaderBinding.inflate(inflater, parent, false)
-            )
+            ViewType.PARTIAL.id -> PartialViewHolder(ItemGradeStatisticsPieBinding.inflate(inflater, parent, false))
+            ViewType.SEMESTER.id -> SemesterViewHolder(ItemGradeStatisticsPieBinding.inflate(inflater, parent, false))
+            ViewType.POINTS.id -> PointsViewHolder(ItemGradeStatisticsBarBinding.inflate(inflater, parent, false))
             else -> throw IllegalStateException()
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val index = position - 1
-
         when (holder) {
-            is PartialViewHolder -> bindPartialChart(holder.binding, items[index].partial!!)
-            is SemesterViewHolder -> bindSemesterChart(holder.binding, items[index].semester!!)
-            is PointsViewHolder -> bindBarChart(holder.binding, items[index].points!!)
-            is HeaderViewHolder -> bindHeader(holder.binding)
+            is PartialViewHolder -> bindPartialChart(holder.binding, items[position].partial!!)
+            is SemesterViewHolder -> bindSemesterChart(holder.binding, items[position].semester!!)
+            is PointsViewHolder -> bindBarChart(holder.binding, items[position].points!!)
         }
     }
 
-    private fun bindHeader(binding: ItemGradeStatisticsHeaderBinding) {
-        binding.gradeStatisticsTypeSwitch.check(
-            when (currentDataType) {
-                GradeStatisticsItem.DataType.PARTIAL -> R.id.gradeStatisticsTypePartial
-                GradeStatisticsItem.DataType.SEMESTER -> R.id.gradeStatisticsTypeSemester
-                GradeStatisticsItem.DataType.POINTS -> R.id.gradeStatisticsTypePoints
-            }
-        )
-
-        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-            currentDataType = when (checkedId) {
-                R.id.gradeStatisticsTypePartial -> GradeStatisticsItem.DataType.PARTIAL
-                R.id.gradeStatisticsTypeSemester -> GradeStatisticsItem.DataType.SEMESTER
-                R.id.gradeStatisticsTypePoints -> GradeStatisticsItem.DataType.POINTS
-                else -> GradeStatisticsItem.DataType.PARTIAL
-            }
-            onDataTypeChangeListener()
-        }
-    }
-
-    private fun bindPartialChart(
-        binding: ItemGradeStatisticsPieBinding,
-        partials: GradePartialStatistics
-    ) {
+    private fun bindPartialChart(binding: ItemGradeStatisticsPieBinding, partials: GradePartialStatistics) {
         bindPieChart(binding, partials.subject, partials.classAverage, partials.classAmounts)
     }
 
-    private fun bindSemesterChart(
-        binding: ItemGradeStatisticsPieBinding,
-        semester: GradeSemesterStatistics
-    ) {
+    private fun bindSemesterChart(binding: ItemGradeStatisticsPieBinding, semester: GradeSemesterStatistics) {
         bindPieChart(binding, semester.subject, semester.average, semester.amounts)
     }
 
-    private fun bindPieChart(
-        binding: ItemGradeStatisticsPieBinding,
-        subject: String,
-        average: String,
-        amounts: List<Int>
-    ) {
+    private fun bindPieChart(binding: ItemGradeStatisticsPieBinding, subject: String, average: String, amounts: List<Int>) {
         with(binding.gradeStatisticsPieTitle) {
             text = subject
             visibility = if (items.size == 1 || !showAllSubjectsOnList) GONE else VISIBLE
@@ -172,8 +114,7 @@ class GradeStatisticsAdapter @Inject constructor() :
             valueTextSize = 12f
             sliceSpace = 1f
             valueTextColor = Color.WHITE
-            val grades = amounts.mapIndexed { grade, amount -> (grade + 1) to amount }
-                .filterNot { it.second == 0 }
+            val grades = amounts.mapIndexed { grade, amount -> (grade + 1) to amount }.filterNot { it.second == 0 }
             setColors(grades.reversed().map { (grade, _) ->
                 gradeColors.single { color -> color.first == grade }.second
             }.toIntArray(), binding.root.context)
@@ -185,11 +126,7 @@ class GradeStatisticsAdapter @Inject constructor() :
             data = PieData(dataset).apply {
                 setValueFormatter(object : ValueFormatter() {
                     override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
-                        return resources.getQuantityString(
-                            R.plurals.grade_number_item,
-                            value.toInt(),
-                            value.toInt()
-                        )
+                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
                     }
                 })
             }
@@ -206,14 +143,11 @@ class GradeStatisticsAdapter @Inject constructor() :
 
             val numberOfGradesString = amounts.fold(0) { acc, it -> acc + it }
                 .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
-            val averageString =
-                binding.root.context.getString(R.string.grade_statistics_average, average)
+            val averageString = binding.root.context.getString(R.string.grade_statistics_average, average)
 
             minAngleForSlices = 25f
             description.isEnabled = false
-            centerText =
-                numberOfGradesString + ("\n\n" + averageString).takeIf { average.isNotBlank() }
-                    .orEmpty()
+            centerText = numberOfGradesString + ("\n\n" + averageString).takeIf { average.isNotBlank() }.orEmpty()
 
             setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
             setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
@@ -221,21 +155,16 @@ class GradeStatisticsAdapter @Inject constructor() :
         }
     }
 
-    private fun bindBarChart(
-        binding: ItemGradeStatisticsBarBinding,
-        points: GradePointsStatistics
-    ) {
+    private fun bindBarChart(binding: ItemGradeStatisticsBarBinding, points: GradePointsStatistics) {
         with(binding.gradeStatisticsBarTitle) {
             text = points.subject
             visibility = if (items.size == 1) GONE else VISIBLE
         }
 
-        val dataset = BarDataSet(
-            listOf(
-                BarEntry(1f, points.others.toFloat()),
-                BarEntry(2f, points.student.toFloat())
-            ), binding.root.context.getString(R.string.grade_statistics_legend)
-        )
+        val dataset = BarDataSet(listOf(
+            BarEntry(1f, points.others.toFloat()),
+            BarEntry(2f, points.student.toFloat())
+        ), binding.root.context.getString(R.string.grade_statistics_legend))
 
         with(dataset) {
             valueTextSize = 12f
@@ -260,8 +189,7 @@ class GradeStatisticsAdapter @Inject constructor() :
                     form = Legend.LegendForm.SQUARE
                 },
                 LegendEntry().apply {
-                    label =
-                        binding.root.context.getString(R.string.grade_statistics_average_student)
+                    label = binding.root.context.getString(R.string.grade_statistics_average_student)
                     formColor = gradePointsColors[1]
                     form = Legend.LegendForm.SQUARE
                 }
@@ -298,7 +226,4 @@ class GradeStatisticsAdapter @Inject constructor() :
 
     private class PointsViewHolder(val binding: ItemGradeStatisticsBarBinding) :
         RecyclerView.ViewHolder(binding.root)
-
-    private class HeaderViewHolder(val binding: ItemGradeStatisticsHeaderBinding) :
-        RecyclerView.ViewHolder(binding.root)
 }

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

@@ -38,28 +38,27 @@ class GradeStatisticsFragment :
 
     override val isViewEmpty get() = statisticsAdapter.items.isEmpty()
 
-    override val currentType get() = statisticsAdapter.currentDataType
+    override val currentType
+        get() = when (binding.gradeStatisticsTypeSwitch.checkedRadioButtonId) {
+            R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
+            R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
+            else -> ViewType.POINTS
+        }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentGradeStatisticsBinding.bind(view)
         messageContainer = binding.gradeStatisticsSwipe
-        presenter.onAttachView(
-            this,
-            savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? GradeStatisticsItem.DataType
-        )
+        presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
     }
 
     override fun initView() {
-        statisticsAdapter.onDataTypeChangeListener = presenter::onTypeChange
-
         with(binding.gradeStatisticsRecycler) {
             layoutManager = LinearLayoutManager(requireContext())
             adapter = statisticsAdapter
         }
 
-        subjectsAdapter =
-            ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
+        subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
         with(binding.gradeStatisticsSubjects) {
@@ -72,9 +71,7 @@ class GradeStatisticsFragment :
 
             gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
             gradeStatisticsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            gradeStatisticsSwipe.setProgressBackgroundColorSchemeColor(
-                requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh)
-            )
+            gradeStatisticsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
             gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -88,15 +85,11 @@ class GradeStatisticsFragment :
         }
     }
 
-    override fun updateData(
-        newItems: List<GradeStatisticsItem>,
-        newTheme: String,
-        showAllSubjectsOnStatisticsList: Boolean
-    ) {
+    override fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean) {
         with(statisticsAdapter) {
-            showAllSubjectsOnList = showAllSubjectsOnStatisticsList
-            theme = newTheme
-            items = newItems
+            this.showAllSubjectsOnList = showAllSubjectsOnStatisticsList
+            this.theme = theme
+            this.items = items
             notifyDataSetChanged()
         }
     }
@@ -110,7 +103,11 @@ class GradeStatisticsFragment :
     }
 
     override fun resetView() {
-        binding.gradeStatisticsRecycler.scrollToPosition(0)
+        binding.gradeStatisticsScroll.scrollTo(0, 0)
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.gradeStatisticsRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showEmpty(show: Boolean) {
@@ -157,6 +154,11 @@ class GradeStatisticsFragment :
         (parentFragment as? GradeFragment)?.onChildRefresh()
     }
 
+    override fun onResume() {
+        super.onResume()
+        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putSerializable(SAVED_CHART_TYPE, presenter.currentType)

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

@@ -35,12 +35,12 @@ class GradeStatisticsPresenter @Inject constructor(
 
     private lateinit var lastError: Throwable
 
-    var currentType: GradeStatisticsItem.DataType = GradeStatisticsItem.DataType.PARTIAL
+    var currentType: ViewType = ViewType.PARTIAL
         private set
 
-    fun onAttachView(view: GradeStatisticsView, type: GradeStatisticsItem.DataType?) {
+    fun onAttachView(view: GradeStatisticsView, type: ViewType?) {
         super.onAttachView(view)
-        currentType = type ?: GradeStatisticsItem.DataType.PARTIAL
+        currentType = type ?: ViewType.PARTIAL
         view.initView()
         errorHandler.showErrorMessage = ::showErrorViewOnError
     }
@@ -59,11 +59,11 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     fun onParentViewChangeSemester() {
-        clearDataInView()
         view?.run {
             showProgress(true)
             enableSwipe(false)
             showRefresh(false)
+            showContent(false)
             showErrorView(false)
             showEmpty(false)
             clearView()
@@ -90,8 +90,8 @@ class GradeStatisticsPresenter @Inject constructor(
 
     fun onSubjectSelected(name: String?) {
         Timber.i("Select grade stats subject $name")
-        clearDataInView()
         view?.run {
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -104,11 +104,11 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     fun onTypeChange() {
-        val type = view?.currentType ?: GradeStatisticsItem.DataType.POINTS
+        val type = view?.currentType ?: ViewType.POINTS
         Timber.i("Select grade stats semester: $type")
         cancelJobs("load")
-        clearDataInView()
         view?.run {
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -143,16 +143,10 @@ class GradeStatisticsPresenter @Inject constructor(
         }.launch("subjects")
     }
 
-    private fun loadDataByType(
-        semesterId: Int,
-        subjectName: String,
-        type: GradeStatisticsItem.DataType,
-        forceRefresh: Boolean = false
-    ) {
+    private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
         Timber.i("Loading grade stats data started")
 
-        currentSubjectName =
-            if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
+        currentSubjectName = if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
         currentType = type
 
         flowWithResourceIn {
@@ -162,30 +156,9 @@ class GradeStatisticsPresenter @Inject constructor(
 
             with(gradeStatisticsRepository) {
                 when (type) {
-                    GradeStatisticsItem.DataType.PARTIAL -> {
-                        getGradesPartialStatistics(
-                            student = student,
-                            semester = semester,
-                            subjectName = currentSubjectName,
-                            forceRefresh = forceRefresh
-                        )
-                    }
-                    GradeStatisticsItem.DataType.SEMESTER -> {
-                        getGradesSemesterStatistics(
-                            student = student,
-                            semester = semester,
-                            subjectName = currentSubjectName,
-                            forceRefresh = forceRefresh
-                        )
-                    }
-                    GradeStatisticsItem.DataType.POINTS -> {
-                        getGradesPointsStatistics(
-                            student = student,
-                            semester = semester,
-                            subjectName = currentSubjectName,
-                            forceRefresh = forceRefresh
-                        )
-                    }
+                    ViewType.PARTIAL -> getGradesPartialStatistics(student, semester, currentSubjectName, forceRefresh)
+                    ViewType.SEMESTER -> getGradesSemesterStatistics(student, semester, currentSubjectName, forceRefresh)
+                    ViewType.POINTS -> getGradesPointsStatistics(student, semester, currentSubjectName, forceRefresh)
                 }
             }
         }.onEach {
@@ -195,15 +168,12 @@ class GradeStatisticsPresenter @Inject constructor(
                     if (!isNoContent) {
                         view?.run {
                             showEmpty(isNoContent)
+                            showContent(!isNoContent)
                             showErrorView(false)
                             enableSwipe(true)
                             showRefresh(true)
                             showProgress(false)
-                            updateData(
-                                if (isNoContent) emptyList() else it.data!!,
-                                preferencesRepository.gradeColorTheme,
-                                preferencesRepository.showAllSubjectsOnStatisticsList
-                            )
+                            updateData(it.data!!, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
                             showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
                         }
                     }
@@ -213,12 +183,9 @@ class GradeStatisticsPresenter @Inject constructor(
                     view?.run {
                         val isNoContent = checkIsNoContent(it.data!!, type)
                         showEmpty(isNoContent)
+                        showContent(!isNoContent)
                         showErrorView(false)
-                        updateData(
-                            if (isNoContent) emptyList() else it.data,
-                            preferencesRepository.gradeColorTheme,
-                            preferencesRepository.showAllSubjectsOnStatisticsList
-                        )
+                        updateData(it.data, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
                         showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
                     }
                     analytics.logEvent(
@@ -242,31 +209,16 @@ class GradeStatisticsPresenter @Inject constructor(
         }.launch("load")
     }
 
-    private fun checkIsNoContent(
-        items: List<GradeStatisticsItem>,
-        type: GradeStatisticsItem.DataType
-    ): Boolean {
+    private fun checkIsNoContent(items: List<GradeStatisticsItem>, type: ViewType): Boolean {
         return items.isEmpty() || when (type) {
-            GradeStatisticsItem.DataType.SEMESTER -> {
-                items.firstOrNull()?.semester?.amounts.orEmpty().sum() == 0
-            }
-            GradeStatisticsItem.DataType.PARTIAL -> {
-                items.firstOrNull()?.partial?.classAmounts.orEmpty().sum() == 0
-            }
-            GradeStatisticsItem.DataType.POINTS -> {
-                items.firstOrNull()?.points?.let { points -> points.student == .0 && points.others == .0 } ?: false
-            }
+            ViewType.SEMESTER -> items.firstOrNull()?.semester?.amounts.orEmpty().sum() == 0
+            ViewType.PARTIAL -> items.firstOrNull()?.partial?.classAmounts.orEmpty().sum() == 0
+            ViewType.POINTS -> items.firstOrNull()?.points?.let { points ->
+                points.student == .0 && points.others == .0
+            } ?: false
         }
     }
 
-    private fun clearDataInView() {
-        view?.updateData(
-            emptyList(),
-            preferencesRepository.gradeColorTheme,
-            preferencesRepository.showAllSubjectsOnStatisticsList
-        )
-    }
-
     private fun showErrorViewOnError(message: String, error: Throwable) {
         view?.run {
             if (isViewEmpty) {

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

@@ -7,17 +7,13 @@ interface GradeStatisticsView : BaseView {
 
     val isViewEmpty: Boolean
 
-    val currentType: GradeStatisticsItem.DataType
+    val currentType: ViewType
 
     fun initView()
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updateData(
-        newItems: List<GradeStatisticsItem>,
-        newTheme: String,
-        showAllSubjectsOnStatisticsList: Boolean
-    )
+    fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean)
 
     fun showSubjects(show: Boolean)
 
@@ -29,6 +25,8 @@ interface GradeStatisticsView : BaseView {
 
     fun resetView()
 
+    fun showContent(show: Boolean)
+
     fun showEmpty(show: Boolean)
 
     fun showErrorView(show: Boolean)

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

@@ -3,6 +3,5 @@ package io.github.wulkanowy.ui.modules.grade.statistics
 enum class ViewType(val id: Int) {
     SEMESTER(1),
     PARTIAL(2),
-    POINTS(3),
-    HEADER(4)
+    POINTS(3)
 }

app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt

@@ -28,11 +28,12 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
     private lateinit var homework: Homework
 
     companion object {
-
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(homework: Homework) = HomeworkDetailsDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+        fun newInstance(homework: Homework): HomeworkDetailsDialog {
+            return HomeworkDetailsDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+            }
         }
     }
 
@@ -44,22 +45,19 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
     }
 
     @SuppressLint("SetTextI18n")
     override fun initView() {
         with(binding) {
-            homeworkDialogRead.text =
-                view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+            homeworkDialogRead.text = view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
             homeworkDialogRead.setOnClickListener { presenter.toggleDone(homework) }
             homeworkDialogClose.setOnClickListener { dismiss() }
         }
@@ -89,8 +87,7 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
     }
 
     override fun updateMarkAsDoneLabel(isDone: Boolean) {
-        binding.homeworkDialogRead.text =
-            view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+        binding.homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
     }
 
     override fun onDestroyView() {

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

@@ -52,8 +52,6 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         updateHelper.onResume(this)
     }
 
-    //https://developer.android.com/guide/playcore/in-app-updates#status_callback
-    @Suppress("DEPRECATION")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         updateHelper.onActivityResult(requestCode, resultCode)
@@ -67,15 +65,13 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
 
         with(loginAdapter) {
             containerId = binding.loginViewpager.id
-            addFragments(
-                listOf(
-                    LoginFormFragment.newInstance(),
-                    LoginSymbolFragment.newInstance(),
-                    LoginStudentSelectFragment.newInstance(),
-                    LoginAdvancedFragment.newInstance(),
-                    LoginRecoverFragment.newInstance()
-                )
-            )
+            addFragments(listOf(
+                LoginFormFragment.newInstance(),
+                LoginSymbolFragment.newInstance(),
+                LoginStudentSelectFragment.newInstance(),
+                LoginAdvancedFragment.newInstance(),
+                LoginRecoverFragment.newInstance()
+            ))
         }
 
         with(binding.loginViewpager) {
@@ -103,20 +99,14 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     }
 
     override fun notifyInitSymbolFragment(loginData: Triple<String, String, String>) {
-        (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(
-            loginData
-        )
+        (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(loginData)
     }
 
     override fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
-        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)
-            ?.onParentInitStudentSelectFragment(studentsWithSemesters)
+        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(studentsWithSemesters)
     }
 
-    fun onFormFragmentAccountLogged(
-        studentsWithSemesters: List<StudentWithSemesters>,
-        loginData: Triple<String, String, String>
-    ) {
+    fun onFormFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
         presenter.onFormViewAccountLogged(studentsWithSemesters, loginData)
     }
 

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

@@ -150,13 +150,6 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         }
     }
 
-    override fun setErrorEmailInvalid(domain: String) {
-        with(binding.loginFormUsernameLayout) {
-            requestFocus()
-            error = getString(R.string.login_invalid_custom_email,domain)
-        }
-    }
-
     override fun clearUsernameError() {
         binding.loginFormUsernameLayout.error = null
     }

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

@@ -11,7 +11,6 @@ import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.ifNullOrBlank
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.net.URL
 import javax.inject.Inject
 
 class LoginFormPresenter @Inject constructor(
@@ -88,14 +87,7 @@ class LoginFormPresenter @Inject constructor(
 
         if (!validateCredentials(email, password, host)) return
 
-        flowWithResource {
-            studentRepository.getStudentsScrapper(
-                email,
-                password,
-                host,
-                symbol
-            )
-        }.onEach {
+        flowWithResource { studentRepository.getStudentsScrapper(email, password, host, symbol) }.onEach {
             when (it.status) {
                 Status.LOADING -> view?.run {
                     Timber.i("Login started")
@@ -158,18 +150,11 @@ class LoginFormPresenter @Inject constructor(
                 view?.setErrorLoginRequired()
                 isCorrect = false
             }
+
             if ("@" !in login && "email" in host) {
                 view?.setErrorEmailRequired()
                 isCorrect = false
             }
-            if ("@" in login && "||" !in login && "login" !in host && "email" !in host) {
-                val emailHost = login.substringAfter("@")
-                val emailDomain = URL(host).host
-                if (emailHost != emailDomain) {
-                    view?.setErrorEmailInvalid(domain = emailDomain)
-                    isCorrect = false
-                }
-            }
         }
 
         if (password.isEmpty()) {

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

@@ -39,8 +39,6 @@ interface LoginFormView : BaseView {
 
     fun setErrorPassIncorrect()
 
-    fun setErrorEmailInvalid(domain: String)
-
     fun clearUsernameError()
 
     fun clearPassError()

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

@@ -9,7 +9,6 @@ import android.view.View.VISIBLE
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -43,12 +42,10 @@ class LoginRecoverFragment :
     private lateinit var hostSymbols: Array<String>
 
     override val recoverHostValue: String
-        get() = hostValues.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString()))
-            .orEmpty()
+        get() = hostValues.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
 
     override val formHostSymbol: String
-        get() = hostSymbols.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString()))
-            .orEmpty()
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
 
     override val recoverNameValue: String
         get() = bindingLocal.loginRecoverName.text.toString().trim()
@@ -85,9 +82,7 @@ class LoginRecoverFragment :
 
         with(bindingLocal.loginRecoverHost) {
             setText(hostKeys.getOrNull(0).orEmpty())
-            setAdapter(
-                LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys)
-            )
+            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
             setOnClickListener { if (bindingLocal.loginRecoverFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
@@ -132,7 +127,6 @@ class LoginRecoverFragment :
 
     override fun showErrorView(show: Boolean) {
         bindingLocal.loginRecoverError.visibility = if (show) VISIBLE else GONE
-        bindingLocal.loginRecoverErrorDetails.isVisible = true
     }
 
     override fun setErrorDetails(message: String) {
@@ -172,7 +166,7 @@ class LoginRecoverFragment :
         with(bindingLocal.loginRecoverWebView) {
             settings.javaScriptEnabled = true
             webViewClient = object : WebViewClient() {
-                private var recoverWebViewSuccess = true
+                private var recoverWebViewSuccess: Boolean = true
 
                 override fun onPageFinished(view: WebView?, url: String?) {
                     if (recoverWebViewSuccess) {
@@ -181,16 +175,10 @@ class LoginRecoverFragment :
                     } else {
                         showProgress(false)
                         showErrorView(true)
-                        bindingLocal.loginRecoverErrorDetails.isVisible = false
                     }
                 }
 
-                override fun onReceivedError(
-                    view: WebView,
-                    errorCode: Int,
-                    description: String,
-                    failingUrl: String
-                ) {
+                override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
                     recoverWebViewSuccess = false
                 }
             }

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt

@@ -9,8 +9,6 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.databinding.FragmentLuckyNumberBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.luckynumber.history.LuckyNumberHistoryFragment
-import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
@@ -44,7 +42,6 @@ class LuckyNumberFragment :
             luckyNumberSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
             luckyNumberSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
             luckyNumberSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
-            luckyNumberHistoryButton.setOnClickListener { openLuckyNumberHistory() }
             luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
             luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -82,10 +79,6 @@ class LuckyNumberFragment :
         binding.luckyNumberContent.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun openLuckyNumberHistory() {
-        (activity as? MainActivity)?.pushView(LuckyNumberHistoryFragment.newInstance())
-    }
-
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt

@@ -24,6 +24,4 @@ interface LuckyNumberView : BaseView {
     fun enableSwipe(enable: Boolean)
 
     fun showContent(show: Boolean)
-
-    fun openLuckyNumberHistory()
 }

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt

@@ -1,36 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.databinding.ItemLuckyNumberHistoryBinding
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import java.util.Locale
-import javax.inject.Inject
-
-class LuckyNumberHistoryAdapter @Inject constructor() :
-    RecyclerView.Adapter<LuckyNumberHistoryAdapter.ItemViewHolder>() {
-
-    var items = emptyList<LuckyNumber>()
-
-    override fun getItemCount() = items.size
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemLuckyNumberHistoryBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("DefaultLocale")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
-        with(holder.binding) {
-            luckyNumberHistoryWeekName.text = item.date.weekDayName.capitalize()
-            luckyNumberHistoryDate.text = item.date.toFormattedString()
-            luckyNumberHistory.text = item.luckyNumber.toString()
-        }
-    }
-
-    class ItemViewHolder(val binding: ItemLuckyNumberHistoryBinding) : RecyclerView.ViewHolder(binding.root)
-}

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt

@@ -1,134 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import android.os.Bundle
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.databinding.FragmentLuckyNumberHistoryBinding
-import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.getThemeAttrColor
-import java.time.LocalDate
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class LuckyNumberHistoryFragment :
-    BaseFragment<FragmentLuckyNumberHistoryBinding>(R.layout.fragment_lucky_number_history), LuckyNumberHistoryView,
-    MainView.TitledView {
-
-    @Inject
-    lateinit var presenter: LuckyNumberHistoryPresenter
-
-    @Inject
-    lateinit var luckyNumberHistoryAdapter: LuckyNumberHistoryAdapter
-
-    companion object {
-        fun newInstance() = LuckyNumberHistoryFragment()
-    }
-
-    override val titleStringId: Int
-        get() = R.string.lucky_number_history_title
-
-    override val isViewEmpty get() = luckyNumberHistoryAdapter.items.isEmpty()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding = FragmentLuckyNumberHistoryBinding.bind(view)
-        messageContainer = binding.luckyNumberHistoryRecycler
-        presenter.onAttachView(this)
-    }
-
-    override fun initView() {
-        with(binding.luckyNumberHistoryRecycler) {
-            layoutManager = LinearLayoutManager(context)
-            adapter = luckyNumberHistoryAdapter
-            addItemDecoration(DividerItemDecoration(context))
-        }
-
-        with(binding) {
-            luckyNumberHistoryNavDate.setOnClickListener { presenter.onPickDate() }
-            luckyNumberHistoryErrorRetry.setOnClickListener { presenter.onRetry() }
-            luckyNumberHistoryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-
-            luckyNumberHistoryPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
-            luckyNumberHistoryNextButton.setOnClickListener { presenter.onNextWeek() }
-
-            luckyNumberHistoryNavContainer.setElevationCompat(requireContext().dpToPx(8f))
-        }
-    }
-
-    override fun updateData(data: List<LuckyNumber>) {
-        with(luckyNumberHistoryAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun clearData() {
-        with(luckyNumberHistoryAdapter) {
-            items = emptyList()
-            notifyDataSetChanged()
-        }
-    }
-
-    override fun showEmpty(show: Boolean) {
-        binding.luckyNumberHistoryEmpty.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showErrorView(show: Boolean) {
-        binding.luckyNumberHistoryError.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun setErrorDetails(message: String) {
-        binding.luckyNumberHistoryErrorMessage.text = message
-    }
-
-    override fun updateNavigationWeek(date: String) {
-        binding.luckyNumberHistoryNavDate.text = date
-    }
-
-    override fun showProgress(show: Boolean) {
-        binding.luckyNumberHistoryProgress.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun showPreButton(show: Boolean) {
-        binding.luckyNumberHistoryPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
-    }
-
-    override fun showNextButton(show: Boolean) {
-        binding.luckyNumberHistoryNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
-    }
-
-    override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
-
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@LuckyNumberHistoryFragment.parentFragmentManager, null)
-        }
-    }
-
-    override fun showContent(show: Boolean) {
-        binding.luckyNumberHistoryRecycler.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt

@@ -1,151 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.StudentRepository
-import io.github.wulkanowy.ui.base.BasePresenter
-import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AnalyticsHelper
-import io.github.wulkanowy.utils.afterLoading
-import io.github.wulkanowy.utils.flowWithResource
-import io.github.wulkanowy.utils.isHolidays
-import io.github.wulkanowy.utils.monday
-import io.github.wulkanowy.utils.previousOrSameSchoolDay
-import io.github.wulkanowy.utils.sunday
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.onEach
-import timber.log.Timber
-import java.time.LocalDate
-import javax.inject.Inject
-
-class LuckyNumberHistoryPresenter @Inject constructor(
-    errorHandler: ErrorHandler,
-    studentRepository: StudentRepository,
-    private val luckyNumberRepository: LuckyNumberRepository,
-    private val analytics: AnalyticsHelper
-) : BasePresenter<LuckyNumberHistoryView>(errorHandler, studentRepository) {
-
-    private lateinit var lastError: Throwable
-
-    var currentDate: LocalDate = LocalDate.now().previousOrSameSchoolDay
-
-    override fun onAttachView(view: LuckyNumberHistoryView) {
-        super.onAttachView(view)
-        view.run {
-            initView()
-            reloadNavigation()
-            showContent(false)
-        }
-        Timber.i("Lucky number history view was initialized")
-        errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData()
-    }
-
-    private fun loadData() {
-        flowWithResource {
-            val student = studentRepository.getCurrentStudent()
-            luckyNumberRepository.getLuckyNumberHistory(student, currentDate.monday, currentDate.sunday)
-        }.onEach {
-            when (it.status) {
-                Status.LOADING -> Timber.i("Loading lucky number history started")
-                Status.SUCCESS -> {
-                    if (!it.data?.first().isNullOrEmpty()) {
-                        Timber.i("Loading lucky number result: Success")
-                        view?.apply {
-                            updateData(it.data!!.first())
-                            showContent(true)
-                            showEmpty(false)
-                            showErrorView(false)
-                            showProgress(false)
-                        }
-                        analytics.logEvent(
-                            "load_items",
-                            "type" to "lucky_number_history",
-                            "numbers" to it.data
-                        )
-                    } else {
-                        Timber.i("Loading lucky number history result: No lucky numbers found")
-                        view?.run {
-                            showContent(false)
-                            showEmpty(true)
-                            showErrorView(false)
-                        }
-                    }
-                }
-                Status.ERROR -> {
-                    Timber.i("Loading lucky number history result: An exception occurred")
-                    errorHandler.dispatch(it.error!!)
-                }
-            }
-        }.afterLoading {
-            view?.run {
-                showProgress(false)
-            }
-        }.launch()
-    }
-
-    private fun showErrorViewOnError(message: String, error: Throwable) {
-        view?.run {
-            if (isViewEmpty) {
-                lastError = error
-                setErrorDetails(message)
-                showErrorView(true)
-                showEmpty(false)
-            } else showError(message, error)
-        }
-    }
-
-    private fun reloadView(date: LocalDate) {
-        currentDate = date
-        Timber.i("Reload lucky number history view with the date ${currentDate.toFormattedString()}")
-        view?.apply {
-            showProgress(true)
-            showContent(false)
-            showEmpty(false)
-            showErrorView(false)
-            clearData()
-            reloadNavigation()
-        }
-    }
-
-    fun onRetry() {
-        view?.run {
-            showErrorView(false)
-            showProgress(true)
-        }
-        loadData()
-    }
-
-    fun onDetailsClick() {
-        view?.showErrorDetailsDialog(lastError)
-    }
-
-    private fun reloadNavigation() {
-        view?.apply {
-            showPreButton(!currentDate.minusDays(7).isHolidays)
-            showNextButton(!currentDate.plusDays(7).isHolidays)
-            updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.sunday.toFormattedString("dd.MM"))
-        }
-    }
-
-    fun onDateSet(year: Int, month: Int, day: Int) {
-        reloadView(LocalDate.of(year, month, day))
-        loadData()
-    }
-
-    fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
-    }
-
-    fun onPreviousWeek() {
-        reloadView(currentDate.minusDays(7))
-        loadData()
-    }
-
-    fun onNextWeek() {
-        reloadView(currentDate.plusDays(7))
-        loadData()
-    }
-}

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryView.kt

@@ -1,36 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumber.history
-
-import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.ui.base.BaseView
-import java.time.LocalDate
-
-interface LuckyNumberHistoryView : BaseView {
-
-    val isViewEmpty: Boolean
-
-    fun initView()
-
-    fun updateData(data: List<LuckyNumber>)
-
-    fun clearData()
-
-    fun showEmpty(show: Boolean)
-
-    fun showErrorView(show: Boolean)
-
-    fun setErrorDetails(message: String)
-
-    fun updateNavigationWeek(date: String)
-
-    fun showProgress(show: Boolean)
-
-    fun showPreButton(show: Boolean)
-
-    fun showNextButton(show: Boolean)
-
-    fun showDatePickerDialog(currentDate: LocalDate)
-
-    fun showContent(show: Boolean)
-
-    fun onDestroyView()
-}