Merge branch 'hotfix/messages-send'

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
(cherry picked from commit 022a4d1ea2)

.github/workflows/deploy-store.yml

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

.github/workflows/deploy-test.yml

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

.github/workflows/test.yml

@@ -1,13 +1,11 @@
-name: Test and deploy
+name: Tests
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ master, develop ]
     tags: [ '*' ]
   pull_request:
-    branches: [ develop ]
+    branches: [ master, develop ]
-
-  workflow_dispatch:
 
 jobs:
   unit-tests:
@@ -34,169 +32,3 @@ jobs:
         - uses: codecov/codecov-action@v1
           with:
               flags: unit
-
-  deploy-google-play:
-      name: Deploy to google play
-      runs-on: ubuntu-latest
-      timeout-minutes: 10
-      environment: google-play
-      needs: [ unit-tests ]
-      if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
-      steps:
-        - uses: actions/checkout@v2
-        - uses: actions/setup-java@v1
-          with:
-            java-version: 11
-        - uses: actions/cache@v2
-          with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
-        - name: Decrypt keys
-          env:
-            ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-            SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }}
-          run: |
-            gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg
-            gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg
-            gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg
-        - name: Upload apk to google play
-          env:
-            PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }}
-            PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }}
-            PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }}
-            PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }}
-          run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
-
-  deploy-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

.gitignore

@@ -117,3 +117,4 @@ Thumbs.db
 
 
 app/src/release/agconnect-services.json
+app/src/release/agconnect-credentials.json

README.md

@@ -32,7 +32,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 * powiadomienia np. o nowej ocenie
 * obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
 * ciemny i czarny (AMOLED) motyw
-* tryb offilne
+* tryb offline
 * brak reklam
 
 ## Pobierz

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.huawei.agconnect'
@@ -20,8 +21,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
         targetSdkVersion 30
-        versionCode 87
+        versionCode 92
-        versionName "1.1.1"
+        versionName "1.1.6"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -60,7 +61,7 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
@@ -140,17 +141,27 @@ play {
     updatePriority = 5
 }
 
+huaweiPublish {
+    instances {
+        hmsRelease {
+            credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
+            buildFormat = "apk"
+            deployType = "draft"
+        }
+    }
+}
+
 ext {
     work_manager = "2.5.0"
     work_hilt = "1.0.0-beta01"
-    room = "2.3.0-beta03"
+    room = "2.3.0-rc01"
     chucker = "3.4.0"
-    mockk = "1.10.6"
+    mockk = "1.11.0"
     moshi = "1.11.0"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.1.1"
+    implementation "io.github.wulkanowy:sdk:1.1.6"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
@@ -158,11 +169,11 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
 
     implementation "androidx.core:core-ktx:1.3.2"
-    implementation "androidx.activity:activity-ktx:1.2.1"
+    implementation "androidx.activity:activity-ktx:1.2.2"
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.appcompat:appcompat-resources:1.2.0"
-    implementation "androidx.fragment:fragment-ktx:1.3.1"
+    implementation "androidx.fragment:fragment-ktx:1.3.2"
-    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.annotation:annotation:1.2.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
@@ -179,7 +190,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -208,15 +219,12 @@ dependencies {
 
     playImplementation platform('com.google.firebase:firebase-bom:26.7.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.300'
+    hmsImplementation 'com.huawei.hms:hianalytics:5.2.0.301'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.5.0.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.5.1.200'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

app/proguard-rules.pro

@@ -23,4 +23,4 @@
 
 
 #Config for Material Components
--keep class com.google.android.material.tabs.** { *; }
+-keep class com.google.android.material.tabs.** { *; }

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

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ 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
@@ -145,6 +146,10 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_subjects_without_grades
         )
 
+    var isKitkatDialogDisabled: Boolean
+        get() = sharedPref.getBoolean("kitkat_dialog_disabled", false)
+        set(value) = sharedPref.edit { putBoolean("kitkat_dialog_disabled", value) }
+
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
     private fun getString(id: String, default: Int) =

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

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

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

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

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

@@ -1,20 +1,25 @@
 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<Pair<Student, Boolean>>()
+    var items = emptyList<StudentWithSemesters>()
+
+    var selectedId = -1L
 
     var onClickListener: (Student) -> Unit = {}
 
@@ -26,17 +31,33 @@ class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter<Widget
 
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (student, isCurrent) = items[position]
+        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
 
         with(holder.binding) {
-            accountItemName.text = "${student.nickOrName} ${student.className}"
+            accountItemName.text = "${student.nickOrName} ${semester?.diaryName.orEmpty()}"
             accountItemSchool.text = student.schoolName
+            accountItemImage.setImageDrawable(avatar)
 
-            with(accountItemImage) {
+            with(accountItemAccountType) {
-                val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                setText(if (student.isParent) R.string.account_type_parent else R.string.account_type_student)
-                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
+                isVisible = isDuplicatedStudent
+            }
 
-                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
+            with(accountItemCheck) {
+                isVisible = student.id == selectedId
+                borderColor = checkBackgroundColor
+                circleColor = checkBackgroundColor
             }
 
             root.setOnClickListener { onClickListener(student) }

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

@@ -74,9 +74,8 @@ class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.V
         studentWithSemesters: StudentWithSemesters
     ) {
         val context = binding.root.context
-        val student = studentWithSemesters.student
+        val (student, semesters) = studentWithSemesters
-        val semesters = studentWithSemesters.semesters
+        val semester = semesters.maxByOrNull { it.semesterId }
-        val diary = 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)
@@ -90,7 +89,7 @@ class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.V
         }.size > 1 && isAccountQuickDialogMode
 
         with(binding) {
-            accountItemName.text = "${student.nickOrName} ${diary?.diaryName.orEmpty()}"
+            accountItemName.text = "${student.nickOrName} ${semester?.diaryName.orEmpty()}"
             accountItemSchool.text = studentWithSemesters.student.schoolName
             accountItemImage.setImageDrawable(avatar)
 

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

@@ -68,7 +68,7 @@ class GradeAverageProvider @Inject constructor(
         forceRefresh: Boolean,
         averageMode: GradeAverageMode
     ): Flow<Resource<List<GradeSubject>>> {
-        val gradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
+        val isGradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester =
             semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
@@ -78,8 +78,7 @@ class GradeAverageProvider @Inject constructor(
 
         if (selectedSemester == firstSemester) return selectedSemesterGradeSubjects
 
-        val firstSemesterGradeSubjects =
+        val firstSemesterGradeSubjects = getGradeSubjects(student, firstSemester, forceRefresh)
-            getGradeSubjects(student, firstSemester, forceRefresh)
 
         return selectedSemesterGradeSubjects.combine(firstSemesterGradeSubjects) { secondSemesterGradeSubject, firstSemesterGradeSubject ->
             if (firstSemesterGradeSubject.status == Status.ERROR) {
@@ -87,9 +86,9 @@ class GradeAverageProvider @Inject constructor(
             }
 
             val isAnyVulcanAverageInFirstSemester =
-                firstSemesterGradeSubject.data.orEmpty().any { it.average != .0 }
+                firstSemesterGradeSubject.data.orEmpty().any { it.isVulcanAverage }
             val isAnyVulcanAverageInSecondSemester =
-                secondSemesterGradeSubject.data.orEmpty().any { it.average != .0 }
+                secondSemesterGradeSubject.data.orEmpty().any { it.isVulcanAverage }
 
             val updatedData = secondSemesterGradeSubject.data?.map { secondSemesterSubject ->
                 val firstSemesterSubject = firstSemesterGradeSubject.data.orEmpty()
@@ -99,7 +98,7 @@ class GradeAverageProvider @Inject constructor(
                     calculateAllYearAverage(
                         student = student,
                         isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
-                        gradeAverageForceCalc = gradeAverageForceCalc,
+                        isGradeAverageForceCalc = isGradeAverageForceCalc,
                         secondSemesterSubject = secondSemesterSubject,
                         firstSemesterSubject = firstSemesterSubject
                     )
@@ -107,7 +106,7 @@ class GradeAverageProvider @Inject constructor(
                     calculateBothSemestersAverage(
                         student = student,
                         isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
-                        gradeAverageForceCalc = gradeAverageForceCalc,
+                        isGradeAverageForceCalc = isGradeAverageForceCalc,
                         secondSemesterSubject = secondSemesterSubject,
                         firstSemesterSubject = firstSemesterSubject
                     )
@@ -121,10 +120,10 @@ class GradeAverageProvider @Inject constructor(
     private fun calculateAllYearAverage(
         student: Student,
         isAnyVulcanAverage: Boolean,
-        gradeAverageForceCalc: Boolean,
+        isGradeAverageForceCalc: Boolean,
         secondSemesterSubject: GradeSubject,
         firstSemesterSubject: GradeSubject?
-    ) = if (!isAnyVulcanAverage || gradeAverageForceCalc) {
+    ) = if (!isAnyVulcanAverage || isGradeAverageForceCalc) {
         val updatedSecondSemesterGrades =
             secondSemesterSubject.grades.updateModifiers(student)
         val updatedFirstSemesterGrades =
@@ -138,13 +137,13 @@ class GradeAverageProvider @Inject constructor(
     private fun calculateBothSemestersAverage(
         student: Student,
         isAnyVulcanAverage: Boolean,
-        gradeAverageForceCalc: Boolean,
+        isGradeAverageForceCalc: Boolean,
         secondSemesterSubject: GradeSubject,
         firstSemesterSubject: GradeSubject?
     ): Double {
         val divider = if (secondSemesterSubject.grades.any { it.weightValue > .0 }) 2 else 1
 
-        return if (!isAnyVulcanAverage || gradeAverageForceCalc) {
+        return if (!isAnyVulcanAverage || isGradeAverageForceCalc) {
             val secondSemesterAverage =
                 secondSemesterSubject.grades.updateModifiers(student).calcAverage()
             val firstSemesterAverage = firstSemesterSubject?.grades?.updateModifiers(student)
@@ -161,7 +160,7 @@ class GradeAverageProvider @Inject constructor(
         semester: Semester,
         forceRefresh: Boolean
     ): Flow<Resource<List<GradeSubject>>> {
-        val gradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
+        val isGradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
 
         return gradeRepository.getGrades(student, semester, forceRefresh = forceRefresh)
             .map { res ->
@@ -170,20 +169,21 @@ class GradeAverageProvider @Inject constructor(
                 val allGrades = details.orEmpty().groupBy { it.subject }
 
                 val items = summaries?.emulateEmptySummaries(
-                    student,
+                    student = student,
-                    semester,
+                    semester = semester,
-                    allGrades.toList(),
+                    grades = allGrades.toList(),
-                    isAnyAverage
+                    calcAverage = isAnyAverage
                 )?.map { summary ->
                     val grades = allGrades[summary.subject].orEmpty()
                     GradeSubject(
                         subject = summary.subject,
-                        average = if (!isAnyAverage || gradeAverageForceCalc) {
+                        average = if (!isAnyAverage || isGradeAverageForceCalc) {
                             grades.updateModifiers(student).calcAverage()
                         } else summary.average,
                         points = summary.pointsSum,
                         summary = summary,
-                        grades = grades
+                        grades = grades,
+                        isVulcanAverage = isAnyAverage
                     )
                 }
 

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

@@ -50,7 +50,7 @@ class GradePresenter @Inject constructor(
 
     fun onSemesterSwitch(): Boolean {
         if (semesters.isNotEmpty()) {
-            view?.showSemesterDialog(selectedIndex - 1, semesters.slice(0..1))
+            view?.showSemesterDialog(selectedIndex - 1, semesters.take(2))
         }
         return true
     }

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

@@ -8,5 +8,6 @@ data class GradeSubject(
     val average: Double,
     val points: String,
     val summary: GradeSummary,
-    val grades: List<Grade>
+    val grades: List<Grade>,
+    val isVulcanAverage: Boolean
 )

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

@@ -162,7 +162,7 @@ class LoginFormPresenter @Inject constructor(
                 view?.setErrorEmailRequired()
                 isCorrect = false
             }
-            if ("@" in login && "login" !in host && "email" !in host) {
+            if ("@" in login && "||" !in login && "login" !in host && "email" !in host) {
                 val emailHost = login.substringAfter("@")
                 val emailDomain = URL(host).host
                 if (emailHost != emailDomain) {

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

@@ -9,6 +9,7 @@ import android.view.View.VISIBLE
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -42,10 +43,12 @@ 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()
@@ -82,7 +85,9 @@ 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() }
         }
     }
@@ -127,6 +132,7 @@ class LoginRecoverFragment :
 
     override fun showErrorView(show: Boolean) {
         bindingLocal.loginRecoverError.visibility = if (show) VISIBLE else GONE
+        bindingLocal.loginRecoverErrorDetails.isVisible = true
     }
 
     override fun setErrorDetails(message: String) {
@@ -166,7 +172,7 @@ class LoginRecoverFragment :
         with(bindingLocal.loginRecoverWebView) {
             settings.javaScriptEnabled = true
             webViewClient = object : WebViewClient() {
-                private var recoverWebViewSuccess: Boolean = true
+                private var recoverWebViewSuccess = true
 
                 override fun onPageFinished(view: WebView?, url: String?) {
                     if (recoverWebViewSuccess) {
@@ -175,10 +181,16 @@ 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/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt

@@ -11,7 +11,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
@@ -38,7 +38,9 @@ class LuckyNumberWidgetConfigureActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setContentView(
+            ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root
+        )
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
@@ -70,8 +72,9 @@ class LuckyNumberWidgetConfigureActivity :
             .show()
     }
 
-    override fun updateData(data: List<Pair<Student, Boolean>>) {
+    override fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long) {
         with(configureAdapter) {
+            selectedId = selectedStudentId
             items = data
             notifyDataSetChanged()
         }

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt

@@ -51,16 +51,17 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
             when (it.status) {
                 Status.LOADING -> Timber.d("Lucky number widget configure students data load")
                 Status.SUCCESS -> {
-                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
+                    val selectedStudentId = appWidgetId?.let { id ->
+                        sharedPref.getLong(getStudentWidgetKey(id), 0)
+                    } ?: -1
+
                     when {
                         it.data!!.isEmpty() -> view?.openLoginView()
                         it.data.size == 1 -> {
                             selectedStudent = it.data.single().student
                             view?.showThemeDialog()
                         }
-                        else -> view?.updateData(it.data.map { entity ->
+                        else -> view?.updateData(it.data, selectedStudentId)
-                            entity.student to (entity.student.id == widgetId)
-                        })
                     }
                 }
                 Status.ERROR -> errorHandler.dispatch(it.error!!)

app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt

@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LuckyNumberWidgetConfigureView : BaseView {
@@ -9,7 +9,7 @@ interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun showThemeDialog()
 
-    fun updateData(data: List<Pair<Student, Boolean>>)
+    fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long)
 
     fun updateLuckyNumberWidget(widgetId: Int)
 

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

@@ -324,9 +324,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     }
 
     override fun showAccountPicker(studentWithSemesters: List<StudentWithSemesters>) {
-        if (supportFragmentManager.isStateSaved) return
+        showDialogFragment(AccountQuickDialog.newInstance(studentWithSemesters))
-
-        navController.showDialogFragment(AccountQuickDialog.newInstance(studentWithSemesters))
     }
 
     override fun showActionBarElevation(show: Boolean) {
@@ -342,9 +340,18 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentChanged()
     }
 
+    @Suppress("DEPRECATION")
     fun showDialogFragment(dialog: DialogFragment) {
         if (supportFragmentManager.isStateSaved) return
 
+        //Deprecated method is used here to avoid fragnav bug
+        if (navController.currentDialogFrag?.fragmentManager == null) {
+            FragNavController::class.java.getDeclaredField("mCurrentDialogFrag").apply {
+                isAccessible = true
+                set(navController, null)
+            }
+        }
+
         navController.showDialogFragment(dialog)
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt

@@ -3,17 +3,23 @@ package io.github.wulkanowy.ui.modules.splash
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.appcompat.app.AlertDialog
 import androidx.viewbinding.ViewBinding
 import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView {
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     @Inject
     override lateinit var presenter: SplashPresenter
 
@@ -40,4 +46,14 @@ class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView
     override fun showError(text: String, error: Throwable) {
         Toast.makeText(this, text, LENGTH_LONG).show()
     }
+
+    override fun showKitkatView() {
+        AlertDialog.Builder(this)
+            .setTitle(R.string.drop_kitkat_title)
+            .setMessage(R.string.drop_kitkat_content)
+            .setPositiveButton(android.R.string.ok, null)
+            .setNeutralButton(R.string.drop_kitkat_again) { _, _ -> presenter.onNeutralButtonSelected() }
+            .setOnDismissListener { presenter.onKitkatViewDismissed() }
+            .show()
+    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt

@@ -1,9 +1,12 @@
 package io.github.wulkanowy.ui.modules.splash
 
+import android.os.Build
 import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.flowWithResource
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -11,25 +14,47 @@ import javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
     errorHandler: ErrorHandler,
-    studentRepository: StudentRepository
+    studentRepository: StudentRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val appInfo: AppInfo
 ) : BasePresenter<SplashView>(errorHandler, studentRepository) {
 
+    private var externalUrl: String? = null
+
     fun onAttachView(view: SplashView, externalUrl: String?) {
         super.onAttachView(view)
+        this.externalUrl = externalUrl
 
+        if (appInfo.systemVersion < Build.VERSION_CODES.LOLLIPOP && !preferencesRepository.isKitkatDialogDisabled) {
+            view.showKitkatView()
+        } else {
+            loadCorrectDataOrUser()
+        }
+    }
+
+    private fun loadCorrectDataOrUser() {
         if (!externalUrl.isNullOrBlank()) {
-            return view.openExternalUrlAndFinish(externalUrl)
+            view?.openExternalUrlAndFinish(externalUrl!!)
+            return
         }
 
         flowWithResource { studentRepository.isCurrentStudentSet() }.onEach {
             when (it.status) {
                 Status.LOADING -> Timber.d("Is current user set check started")
-                Status.SUCCESS -> with(view) {
+                Status.SUCCESS -> {
-                    if (it.data!!) openMainView()
+                    if (it.data!!) view?.openMainView()
-                    else openLoginView()
+                    else view?.openLoginView()
                 }
                 Status.ERROR -> errorHandler.dispatch(it.error!!)
             }
         }.launch()
     }
+
+    fun onKitkatViewDismissed() {
+        loadCorrectDataOrUser()
+    }
+
+    fun onNeutralButtonSelected() {
+        preferencesRepository.isKitkatDialogDisabled = true
+    }
 }

app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt

@@ -9,4 +9,6 @@ interface SplashView : BaseView {
     fun openMainView()
 
     fun openExternalUrlAndFinish(url: String)
+
+    fun showKitkatView()
 }

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt

@@ -57,6 +57,7 @@ class AdditionalLessonsFragment :
             additionalLessonsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
             additionalLessonsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
             additionalLessonsErrorRetry.setOnClickListener { presenter.onRetry() }
+            additionalLessonsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
             additionalLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
             additionalLessonsNavDate.setOnClickListener { presenter.onPickDate() }

app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt

@@ -80,6 +80,10 @@ class AdditionalLessonsPresenter @Inject constructor(
         loadData(currentDate, true)
     }
 
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
     private fun setBaseDateOnHolidays() {
         flow {
             val student = studentRepository.getCurrentStudent()

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt

@@ -12,7 +12,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
@@ -37,13 +37,19 @@ class TimetableWidgetConfigureActivity :
 
     private var dialog: AlertDialog? = null
 
-    override public fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setContentView(
+            ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root
+        )
 
         intent.extras.let {
-            presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
+            presenter.onAttachView(
+                this,
+                it?.getInt(EXTRA_APPWIDGET_ID),
+                it?.getBoolean(EXTRA_FROM_PROVIDER)
+            )
         }
     }
 
@@ -61,6 +67,7 @@ class TimetableWidgetConfigureActivity :
             getString(R.string.widget_timetable_theme_light),
             getString(R.string.widget_timetable_theme_dark)
         )
+
         if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += getString(R.string.widget_timetable_theme_system)
 
         dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
@@ -72,8 +79,9 @@ class TimetableWidgetConfigureActivity :
             .show()
     }
 
-    override fun updateData(data: List<Pair<Student, Boolean>>) {
+    override fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long) {
         with(configureAdapter) {
+            selectedId = selectedStudentId
             items = data
             notifyDataSetChanged()
         }

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt

@@ -25,7 +25,11 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
 
     private var selectedStudent: Student? = null
 
-    fun onAttachView(view: TimetableWidgetConfigureView, appWidgetId: Int?, isFromProvider: Boolean?) {
+    fun onAttachView(
+        view: TimetableWidgetConfigureView,
+        appWidgetId: Int?,
+        isFromProvider: Boolean?
+    ) {
         super.onAttachView(view)
         this.appWidgetId = appWidgetId
         this.isFromProvider = isFromProvider ?: false
@@ -56,16 +60,17 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
             when (it.status) {
                 Status.LOADING -> Timber.d("Timetable widget configure students data load")
                 Status.SUCCESS -> {
-                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
+                    val selectedStudentId = appWidgetId?.let { id ->
+                        sharedPref.getLong(getStudentWidgetKey(id), 0)
+                    } ?: -1
+
                     when {
                         it.data!!.isEmpty() -> view?.openLoginView()
                         it.data.size == 1 && !isFromProvider -> {
                             selectedStudent = it.data.single().student
                             view?.showThemeDialog()
                         }
-                        else -> view?.updateData(it.data.map { entity ->
+                        else -> view?.updateData(it.data, selectedStudentId)
-                            entity.student to (entity.student.id == widgetId)
-                        })
                     }
                 }
                 Status.ERROR -> errorHandler.dispatch(it.error!!)

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt

@@ -1,13 +1,13 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface TimetableWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<Student, Boolean>>)
+    fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long)
 
     fun updateTimetableWidget(widgetId: Int)
 

app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt

@@ -13,6 +13,8 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.widget.RemoteViews
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -25,6 +27,8 @@ import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.createNameInitialsDrawable
+import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.nickOrName
@@ -72,7 +76,8 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
 
         fun getThemeWidgetKey(appWidgetId: Int) = "timetable_widget_theme_$appWidgetId"
 
-        fun getCurrentThemeWidgetKey(appWidgetId: Int) = "timetable_widget_current_theme_$appWidgetId"
+        fun getCurrentThemeWidgetKey(appWidgetId: Int) =
+            "timetable_widget_current_theme_$appWidgetId"
     }
 
     override fun onReceive(context: Context, intent: Intent) {
@@ -88,21 +93,29 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
     private suspend fun onUpdate(context: Context, intent: Intent) {
         if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
             intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
-                val student = getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
+                val student =
+                    getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
                 updateWidget(context, appWidgetId, now().nextOrSameSchoolDay, student)
             }
         } else {
             val buttonType = intent.getStringExtra(EXTRA_BUTTON_TYPE)
             val toggledWidgetId = intent.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)
-            val student = getStudent(sharedPref.getLong(getStudentWidgetKey(toggledWidgetId), 0), toggledWidgetId)
+            val student = getStudent(
-            val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
+                sharedPref.getLong(getStudentWidgetKey(toggledWidgetId), 0),
+                toggledWidgetId
+            )
+            val savedDate =
+                LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
             val date = when (buttonType) {
                 BUTTON_RESET -> now().nextOrSameSchoolDay
                 BUTTON_NEXT -> savedDate.nextSchoolDay
                 BUTTON_PREV -> savedDate.previousSchoolDay
                 else -> now().nextOrSameSchoolDay
             }
-            if (!buttonType.isNullOrBlank()) analytics.logEvent("changed_timetable_widget_day", "button" to buttonType)
+            if (!buttonType.isNullOrBlank()) analytics.logEvent(
+                "changed_timetable_widget_day",
+                "button" to buttonType
+            )
             updateWidget(context, toggledWidgetId, date, student)
         }
     }
@@ -121,9 +134,15 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
     }
 
     @SuppressLint("DefaultLocale")
-    private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
+    private fun updateWidget(
+        context: Context,
+        appWidgetId: Int,
+        date: LocalDate,
+        student: Student?
+    ) {
         val savedConfigureTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        val isSystemDarkMode =
+            context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
         var currentTheme = 0L
         var layoutId = R.layout.widget_timetable
 
@@ -134,21 +153,28 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
 
         val nextNavIntent = createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT)
         val prevNavIntent = createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV)
-        val resetNavIntent = createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET)
+        val resetNavIntent =
+            createNavIntent(context, Int.MAX_VALUE - appWidgetId, appWidgetId, BUTTON_RESET)
         val adapterIntent = Intent(context, TimetableWidgetService::class.java)
             .apply {
                 putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
                 //make Intent unique
                 action = appWidgetId.toString()
             }
-        val accountIntent = PendingIntent.getActivity(context, -Int.MAX_VALUE + appWidgetId,
+        val accountIntent = PendingIntent.getActivity(
+            context, -Int.MAX_VALUE + appWidgetId,
             Intent(context, TimetableWidgetConfigureActivity::class.java).apply {
                 addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)
                 putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
                 putExtra(EXTRA_FROM_PROVIDER, true)
-            }, FLAG_UPDATE_CURRENT)
+            }, FLAG_UPDATE_CURRENT
-        val appIntent = PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
+        )
-            MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT)
+        val appIntent = PendingIntent.getActivity(
+            context,
+            MainView.Section.TIMETABLE.id,
+            MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true),
+            FLAG_UPDATE_CURRENT
+        )
 
         val remoteView = RemoteViews(context.packageName, layoutId).apply {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
@@ -160,6 +186,11 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
                 R.id.timetableWidgetName,
                 student?.nickOrName ?: context.getString(R.string.all_no_data)
             )
+
+            student?.let {
+                setImageViewBitmap(R.id.timetableWidgetAccount, context.createAvatarBitmap(it))
+            }
+
             setRemoteAdapter(R.id.timetableWidgetList, adapterIntent)
             setOnClickPendingIntent(R.id.timetableWidgetNext, nextNavIntent)
             setOnClickPendingIntent(R.id.timetableWidgetPrev, prevNavIntent)
@@ -181,13 +212,20 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
         }
     }
 
-    private fun createNavIntent(context: Context, code: Int, appWidgetId: Int, buttonType: String): PendingIntent {
+    private fun createNavIntent(
-        return PendingIntent.getBroadcast(context, code,
+        context: Context,
+        code: Int,
+        appWidgetId: Int,
+        buttonType: String
+    ): PendingIntent {
+        return PendingIntent.getBroadcast(
+            context, code,
             Intent(context, TimetableWidgetProvider::class.java).apply {
                 action = ACTION_APPWIDGET_UPDATE
                 putExtra(EXTRA_BUTTON_TYPE, buttonType)
                 putExtra(EXTRA_TOGGLED_WIDGET_ID, appWidgetId)
-            }, FLAG_UPDATE_CURRENT)
+            }, FLAG_UPDATE_CURRENT
+        )
     }
 
     private suspend fun getStudent(studentId: Long, appWidgetId: Int) = try {
@@ -208,4 +246,29 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
         }
         null
     }
+
+    private fun Context.createAvatarBitmap(student: Student): Bitmap {
+        val avatarColor = if (student.avatarColor == -2937041L) {
+            getCompatColor(R.color.colorPrimaryLight).toLong()
+        } else {
+            student.avatarColor
+        }
+        val avatarDrawable = createNameInitialsDrawable(student.nickOrName, avatarColor, 0.5f)
+
+        val avatarBitmap =
+            if (avatarDrawable.intrinsicWidth <= 0 || avatarDrawable.intrinsicHeight <= 0) {
+                Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+            } else {
+                Bitmap.createBitmap(
+                    avatarDrawable.intrinsicWidth,
+                    avatarDrawable.intrinsicHeight,
+                    Bitmap.Config.ARGB_8888
+                )
+            }
+
+        val canvas = Canvas(avatarBitmap)
+        avatarDrawable.setBounds(0, 0, canvas.width, canvas.height)
+        avatarDrawable.draw(canvas)
+        return avatarBitmap
+    }
 }

app/src/main/play/release-notes/pl-PL/default.txt

@@ -1,6 +1,6 @@
-Wersja 1.1.1
+Wersja 1.1.6
 
-- naprawiliśmy wyświetlanie planu lekcji
+- naprawiliśmy błąd przy wysyłaniu wiadomości
-- naprawiliśmy kilka rzadkich problemów ze stabilnością
+- naprawiliśmy oznaczanie odwołanych lekcji jako zastępstwa
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

app/src/main/res/layout/fragment_login_recover.xml

@@ -25,8 +25,7 @@
             android:id="@+id/loginRecoverFormContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="16dp"
+            android:paddingBottom="16dp">
-            android:visibility="visible">
 
             <TextView
                 android:id="@+id/loginFormHeader"
@@ -85,9 +84,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="emailAddress"
+                    android:imeOptions="actionDone"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
-                    android:imeOptions="actionDone"
                     tools:targetApi="o" />
 
                 <requestFocus />
@@ -156,7 +155,7 @@
         android:orientation="vertical"
         android:visibility="invisible"
         tools:ignore="UseCompoundDrawables"
-        tools:visibility="invisible">
+        tools:visibility="visible">
 
         <ImageView
             android:layout_width="100dp"
@@ -175,12 +174,10 @@
             android:text="@string/error_unknown"
             android:textSize="20sp" />
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="16dp">
-            android:gravity="center"
-            android:orientation="horizontal">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginRecoverErrorDetails"
@@ -189,14 +186,21 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
-                android:text="@string/all_details" />
+                android:text="@string/all_details"
+                app:layout_constraintEnd_toStartOf="@id/loginRecoverErrorRetry"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginRecoverErrorRetry"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/all_retry" />
+                android:text="@string/all_retry"
-        </LinearLayout>
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/loginRecoverErrorDetails"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
@@ -206,7 +210,7 @@
         android:fillViewport="true"
         android:scrollbars="none"
         android:visibility="invisible"
-        tools:visibility="invisible">
+        tools:visibility="gone">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -253,6 +257,5 @@
                 android:layout_marginBottom="30dp"
                 android:text="@android:string/ok" />
         </LinearLayout>
-
     </androidx.core.widget.NestedScrollView>
 </FrameLayout>

app/src/main/res/values-cs/strings.xml

@@ -506,6 +506,10 @@
     <string name="channel_push">Push upozornění</string>
     <string name="channel_upcoming_lessons">Nadcházející lekce</string>
     <string name="channel_debug">Ladění</string>
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">Konec podpory</string>
+    <string name="drop_kitkat_content">Ukončujeme podporu pro vaše zařízení. V Wulkanovým už pro něj nebudou žádné nové funkce. Kritické opravy však budeme vydávat až do konce roku 2021, abyste měli čas přejít na novější model</string>
+    <string name="drop_kitkat_again">Nezobrazovat znovu</string>
     <!--Colors-->
     <string name="all_black">Černý</string>
     <string name="all_red">Červený</string>

app/src/main/res/values-de/strings.xml

@@ -176,7 +176,7 @@
     </plurals>
     <string name="attendance_excuse_dialog_reason">Abwesenheitsgrund (optional)</string>
     <string name="attendance_excuse_dialog_submit">Senden</string>
-    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_success">Abwesenheitsentschuldigungsanfrage erfolgreich gesendet!</string>
     <string name="attendance_excuse_no_selection">Sie müssen mindestens eine Abwesenheit auswählen!</string>
     <string name="attendance_excuse_title">Verzeihung</string>
     <!--Attendance summary-->
@@ -466,6 +466,10 @@
     <string name="channel_push">Push-Benachrichtigungen</string>
     <string name="channel_upcoming_lessons">Bevorstehende Lektionen</string>
     <string name="channel_debug">Debuggen</string>
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">Ende der Unterstützung</string>
+    <string name="drop_kitkat_content">Wir beenden die Unterstützung für dein Gerät. Es werden keine neuen Funktionen mehr in Wulkanowy erscheinen. Allerdings werden wir bis Ende 2021 kritische Patches veröffentlichen, so dass du Zeit hast, zu einem neueren Modell zu wechseln</string>
+    <string name="drop_kitkat_again">Nicht mehr fragen</string>
     <!--Colors-->
     <string name="all_black">Schwarz</string>
     <string name="all_red">Rot</string>

app/src/main/res/values-lt/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--Activity/Fragment title-->
-    <string name="login_title">Login</string>
+    <string name="login_title">Prisijungti</string>
     <string name="main_title">Wulkanowy</string>
     <string name="grade_title">Laipsnis</string>
     <string name="attendance_title">Attendance</string>
@@ -506,6 +506,10 @@
     <string name="channel_push">Push notifications</string>
     <string name="channel_upcoming_lessons">Upcoming lessons</string>
     <string name="channel_debug">Debug</string>
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">End of support</string>
+    <string name="drop_kitkat_content">We are ending support for your device. No more new features will appear for it in Wulkanowy. However, we will be releasing critical patches until the end of 2021 so you have time to switch to a newer model</string>
+    <string name="drop_kitkat_again">Don\'t show again</string>
     <!--Colors-->
     <string name="all_black">Black</string>
     <string name="all_red">Red</string>

app/src/main/res/values-night/styles.xml

@@ -49,4 +49,12 @@
         <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
     </style>
+
+    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Dialog">
+        <item name="colorPrimary">@color/colorPrimaryLight</item>
+        <item name="colorSecondary">@color/colorPrimaryLight</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
+    </style>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -506,6 +506,10 @@
     <string name="channel_push">Powiadomienia push</string>
     <string name="channel_upcoming_lessons">Nadchodzące lekcje</string>
     <string name="channel_debug">Debugowanie</string>
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">Koniec wsparcia</string>
+    <string name="drop_kitkat_content">Kończymy wsparcie dla Twojego urządzenia. Nie pojawią się już dla niego żadne nowe funkcje w Wulkanowym. Będziemy jednak wypuszczać krytyczne poprawki do końca 2021 roku, abyś miał czas na przeniesienie się na nowszy model</string>
+    <string name="drop_kitkat_again">Nie pokazuj ponownie</string>
     <!--Colors-->
     <string name="all_black">Czarny</string>
     <string name="all_red">Czerwony</string>

app/src/main/res/values-ru/strings.xml

@@ -192,7 +192,7 @@
     </plurals>
     <string name="attendance_excuse_dialog_reason">Причина отсутствия (необязательно)</string>
     <string name="attendance_excuse_dialog_submit">Послать</string>
-    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_success">Запрос на освобождение оправдания успешно отправлен!</string>
     <string name="attendance_excuse_no_selection">Выберите хотя-бы одно отсутствие</string>
     <string name="attendance_excuse_title">Изменить статус</string>
     <!--Attendance summary-->
@@ -506,6 +506,10 @@
     <string name="channel_push">Показывать push-уведомления</string>
     <string name="channel_upcoming_lessons">Будущие уроки</string>
     <string name="channel_debug">Дебаг</string>
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">Конец поддержки</string>
+    <string name="drop_kitkat_content">Поддержка заканчивается на вашем устройстве. В Wulkanowy больше не появятся новые возможности. Однако до конца 2021 года мы выпустим критические патчи, чтобы у вас было время перейти на новую модель</string>
+    <string name="drop_kitkat_again">Не показывать снова</string>
     <!--Colors-->
     <string name="all_black">Чёрный</string>
     <string name="all_red">Красный</string>

app/src/main/res/values-sk/strings.xml

@@ -506,6 +506,10 @@
     <string name="channel_push">Push upozornenia</string>
     <string name="channel_upcoming_lessons">Nadchádzajúce lekcie</string>
     <string name="channel_debug">Ladenie</string>
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">Koniec podpory</string>
+    <string name="drop_kitkat_content">Ukončujeme podporu pre vaše zariadenie. V Wulkanovým už pre neho nebudú žiadne nové funkcie. Kritické opravy však budeme vydávať až do konca roka 2021, aby ste mali čas prejsť na novší model</string>
+    <string name="drop_kitkat_again">Nezobrazovať znovu</string>
     <!--Colors-->
     <string name="all_black">Čierny</string>
     <string name="all_red">Červený</string>

app/src/main/res/values-uk/strings.xml

@@ -46,7 +46,7 @@
     <string name="login_expired_token">Минув термін дії токену</string>
     <string name="login_invalid_email">Недійсна адреса електронної пошти</string>
     <string name="login_invalid_login">Використовуйте призначений логін замість електронної пошти</string>
-    <string name="login_invalid_custom_email">Використовуйте призначений логін або електронну адресу в @% 1 $ s</string>
+    <string name="login_invalid_custom_email">Використовуйте призначений логін або електронну адресу в @%1$s</string>
     <string name="login_invalid_symbol">Неправильний симбвол</string>
     <string name="login_incorrect_symbol">Студента не знайдено Перевірте символ та обраний варіант реєстру UONET+</string>
     <string name="login_field_required">Обов\'язкове поле</string>
@@ -192,7 +192,7 @@
     </plurals>
     <string name="attendance_excuse_dialog_reason">Причина відсутності (необов’язково)</string>
     <string name="attendance_excuse_dialog_submit">Надіслати</string>
-    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_success">Запит на виправдання відсутності успішно надіслано!</string>
     <string name="attendance_excuse_no_selection">Оберіть хоча б одну відсутність</string>
     <string name="attendance_excuse_title">Змінити статус</string>
     <!--Attendance summary-->
@@ -506,6 +506,10 @@
     <string name="channel_push">Показувати push-повідомлення</string>
     <string name="channel_upcoming_lessons">Наступні уроки</string>
     <string name="channel_debug">Дебаг</string>
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">Кінець підтримки</string>
+    <string name="drop_kitkat_content">Ми завершуємо підтримку вашого пристрою. Більше нових функцій не з\'явиться у Wulkanowy. Однак ми виробляємо критичні патчі до кінця 2021, тому у вас буде час перейти на новішу модель</string>
+    <string name="drop_kitkat_again">Не показувати знову</string>
     <!--Colors-->
     <string name="all_black">Чорний</string>
     <string name="all_red">Червоний</string>

app/src/main/res/values/strings.xml

@@ -541,6 +541,12 @@
     <string name="channel_debug">Debug</string>
 
 
+    <!--Drop kitkat alert dialog strings-->
+    <string name="drop_kitkat_title">End of support</string>
+    <string name="drop_kitkat_content">We are ending support for your device. No more new features will appear for it in Wulkanowy. However, we will be releasing critical patches until the end of 2021 so you have time to switch to a newer model</string>
+    <string name="drop_kitkat_again">Don\'t show again</string>
+
+
     <!--Colors-->
     <string name="all_black">Black</string>
     <string name="all_red">Red</string>
@@ -554,6 +560,7 @@
     <string name="all_copied">Copied</string>
     <string name="all_undo">Undo</string>
 
+
     <!--Update helper-->
     <string name="update_download_started">Download of updates has started…</string>
     <string name="update_download_success">An update has just been downloaded.</string>

app/src/main/res/values/styles.xml

@@ -26,7 +26,7 @@
         <item name="android:windowBackground">@drawable/layer_splash_background</item>
     </style>
 
-    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.DayNight.Dialog">
+    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Light.Dialog">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorSecondary">@color/colorPrimary</item>
         <item name="windowActionBar">false</item>

app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt

@@ -54,7 +54,7 @@ class RecipientLocalTest {
         coEvery { recipientDb.deleteAll(any()) } just Runs
 
         // execute
-        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(1, 123, "", 4, "", listOf()), 7) }
+        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(4, 123, "", 4, "", listOf()), 7) }
 
         // verify
         assertEquals(3, res.size)
@@ -73,7 +73,7 @@ class RecipientLocalTest {
         coEvery { recipientDb.deleteAll(any()) } just Runs
 
         // execute
-        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(1, 123, "", 4, "", listOf()), 7) }
+        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(4, 123, "", 4, "", listOf()), 7) }
 
         // verify
         assertEquals(3, res.size)

app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt

@@ -440,15 +440,71 @@ class GradeAverageProviderTest {
             )
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
         assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
+            3.0,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(
+            3.25,
+            items.single { it.subject == "Fizyka" }.average,
+            .0
+        ) // (from details): 3,5  + 3,0 → 3,25
     }
 
     @Test
-    fun `calc full year average when current is second with load from cache sequence`() {
+    fun `calc all year average`() {
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalc } returns false
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[1],
+                true
+            )
+        } returns flowWithResource {
+            firstGrades to listOf(
+                getSummary(22, "Matematyka", .0),
+                getSummary(22, "Fizyka", .0)
+            )
+        }
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                true
+            )
+        } returns flowWithResource {
+            secondGrades to listOf(
+                getSummary(22, "Matematyka", .0),
+                getSummary(22, "Fizyka", .0)
+            )
+        }
+
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
+
+        assertEquals(2, items.size)
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0)
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0)
+    }
+
+    @Test
+    fun `force calc full year average when current is second with load from cache sequence`() {
         every { preferencesRepository.gradeAverageForceCalc } returns true
         every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
         coEvery { semesterRepository.getSemesters(student) } returns semesters
@@ -490,17 +546,39 @@ class GradeAverageProviderTest {
     }
 
     @Test
-    fun `calc both semesters average when no summaries`() {
+    fun `force calc both semesters average when no summaries`() {
         every { preferencesRepository.gradeAverageForceCalc } returns true
         every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
 
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList() }
+        coEvery {
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList() }
+            gradeRepository.getGrades(
+                student,
+                semesters[1],
+                true
+            )
+        } returns flowWithResource { firstGrades to emptyList() }
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                true
+            )
+        } returns flowWithResource { secondGrades to emptyList() }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
         assertEquals(2, items.size)
-        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(
+            3.0,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // (from details): 3,5 + 2,5 → 3,0
         assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5 + 3,0 → 3,25
     }
 

app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt

@@ -1,10 +1,13 @@
 package io.github.wulkanowy.ui.modules.splash
 
 import io.github.wulkanowy.MainCoroutineRule
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AppInfo
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify
 import org.junit.Before
@@ -22,6 +25,12 @@ class SplashPresenterTest {
     @MockK
     lateinit var studentRepository: StudentRepository
 
+    @MockK
+    lateinit var preferencesRepository: PreferencesRepository
+
+    @MockK
+    lateinit var appInfo: AppInfo
+
     @MockK(relaxed = true)
     lateinit var errorHandler: ErrorHandler
 
@@ -30,19 +39,25 @@ class SplashPresenterTest {
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
-        presenter = SplashPresenter(errorHandler, studentRepository)
+        presenter = SplashPresenter(errorHandler, studentRepository, preferencesRepository, appInfo)
     }
 
     @Test
     fun testOpenLoginView() {
+        every { appInfo.systemVersion } returns 30
+        every { preferencesRepository.isKitkatDialogDisabled } returns true
         coEvery { studentRepository.isCurrentStudentSet() } returns false
+
         presenter.onAttachView(splashView, null)
         verify { splashView.openLoginView() }
     }
 
     @Test
     fun testMainMainView() {
+        every { appInfo.systemVersion } returns 30
+        every { preferencesRepository.isKitkatDialogDisabled } returns true
         coEvery { studentRepository.isCurrentStudentSet() } returns true
+
         presenter.onAttachView(splashView, null)
         verify { splashView.openMainView() }
     }

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.4.31'
+        kotlin_version = '1.4.32'
         about_libraries = '8.8.4'
         hilt_version = "2.33-beta"
     }
@@ -13,12 +13,13 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.huawei.agconnect:agcp:1.5.0.300'
+        classpath 'com.huawei.agconnect:agcp:1.5.1.200'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
         classpath "com.github.triplet.gradle:play-publisher:2.8.0"
+        classpath "ru.cian:huawei-publish-gradle-plugin:1.2.4"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"