Merge branch 'release/2.2.1'

2024-11-25 08:34:37 -06:00 · 2023-10-03 01:14:17 +02:00 · 2023-10-03 01:14:17 +02:00 · bcd305bef3
commit bcd305bef3
parent 1d8378e136 fc5ad16cb7
22 changed files with 118 additions and 85 deletions
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@ -13,7 +13,7 @@ jobs:
    environment: google-play
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
        with:
          distribution: 'zulu'
          java-version: 17
@ -49,7 +49,7 @@ jobs:
    environment: app-gallery
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
        with:
          distribution: 'zulu'
          java-version: 17
--- a/.github/workflows/deploy-test.yml
+++ b/.github/workflows/deploy-test.yml
@ -19,7 +19,7 @@ jobs:
    environment: app-center
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
        with:
          distribution: 'zulu'
          java-version: 17
@ -89,7 +89,7 @@ jobs:
    if: github.event_name != 'pull_request_target'
    steps:
      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
        with:
          distribution: 'zulu'
          java-version: 17
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -19,7 +19,7 @@ jobs:
        - uses: fkirc/skip-duplicate-actions@master
        - uses: actions/checkout@v3
        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v2
+        - uses: actions/setup-java@v3
          with:
            distribution: 'zulu'
            java-version: 17
@ -45,7 +45,7 @@ jobs:
        - uses: fkirc/skip-duplicate-actions@master
        - uses: actions/checkout@v3
        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v2
+        - uses: actions/setup-java@v3
          with:
            distribution: 'zulu'
            java-version: 17
@ -71,7 +71,7 @@ jobs:
        - uses: fkirc/skip-duplicate-actions@master
        - uses: actions/checkout@v3
        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v2
+        - uses: actions/setup-java@v3
          with:
            distribution: 'zulu'
            java-version: 17
--- a/app/build.gradle
+++ b/app/build.gradle
@ -27,8 +27,8 @@ android {
        testApplicationId "io.github.tests.wulkanowy"
        minSdkVersion 21
        targetSdkVersion 33
-        versionCode 132
-        versionName "2.2.0"
+        versionCode 133
+        versionName "2.2.1"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        resValue "string", "app_name", "Wulkanowy"
@ -162,7 +162,7 @@ play {
    track = 'production'
    releaseStatus = ReleaseStatus.IN_PROGRESS
    userFraction = 0.01d
-    updatePriority = 1
+    updatePriority = 3
    enabled.set(false)
 }

@ -192,7 +192,7 @@ ext {
 }

 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.2.0'
+    implementation 'io.github.wulkanowy:sdk:2.2.1'

    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.db.dao

 import androidx.room.*
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
@ -33,12 +34,12 @@ abstract class StudentDao {
    abstract suspend fun loadAll(): List<Student>

    @Transaction
-    @Query("SELECT * FROM Students")
-    abstract suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
+    @Query("SELECT * FROM Students JOIN Semesters ON Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id")
+    abstract suspend fun loadStudentsWithSemesters(): Map<Student, List<Semester>>

    @Transaction
-    @Query("SELECT * FROM Students WHERE id = :id")
-    abstract suspend fun loadStudentWithSemestersById(id: Long): StudentWithSemesters?
+    @Query("SELECT * FROM Students JOIN Semesters ON Students.student_id = Semesters.student_id AND Students.class_id = Semesters.class_id WHERE Students.id = :id")
+    abstract suspend fun loadStudentWithSemestersById(id: Long): Map<Student, List<Semester>>

    @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
    abstract suspend fun updateCurrent(id: Long)
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
@ -1,13 +1,8 @@
 package io.github.wulkanowy.data.db.entities

-import androidx.room.Embedded
-import androidx.room.Relation
 import java.io.Serializable

 data class StudentWithSemesters(
-    @Embedded
    val student: Student,
-
-    @Relation(parentColumn = "student_id", entityColumn = "student_id")
    val semesters: List<Semester>
 ) : Serializable
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@ -62,20 +62,28 @@ class StudentRepository @Inject constructor(
        .getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
        .mapToPojo(password)

-    suspend fun getSavedStudents(decryptPass: Boolean = true) =
-        studentDb.loadStudentsWithSemesters()
-            .map {
-                it.apply {
+    suspend fun getSavedStudents(decryptPass: Boolean = true): List<StudentWithSemesters> {
+        return studentDb.loadStudentsWithSemesters().map { (student, semesters) ->
+            StudentWithSemesters(
+                student = student.apply {
                    if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                        student.password = withContext(dispatchers.io) {
                            decrypt(student.password)
                        }
                    }
-                }
-            }
+                },
+                semesters = semesters,
+            )
+        }
+    }

-    suspend fun getSavedStudentById(id: Long, decryptPass: Boolean = true) =
-        studentDb.loadStudentWithSemestersById(id)?.apply {
+    suspend fun getSavedStudentById(id: Long, decryptPass: Boolean = true): StudentWithSemesters? =
+        studentDb.loadStudentWithSemestersById(id).let { res ->
+            StudentWithSemesters(
+                student = res.keys.firstOrNull() ?: return null,
+                semesters = res.values.first(),
+            )
+        }.apply {
            if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                student.password = withContext(dispatchers.io) {
                    decrypt(student.password)
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@ -98,11 +98,13 @@ class LoginStudentSelectPresenter @Inject constructor(
                }
            }
        }
-        return students.filter { student ->
-            student.student.semesters.any { semester ->
-                semester.isCurrent()
+        return students
+            .filter { it.isEnabled }
+            .filter { student ->
+                student.student.semesters.any { semester ->
+                    semester.isCurrent()
+                }
            }
-        }
    }

    private fun createItems(): List<LoginStudentSelectItem> = buildList {
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportDialog.kt
@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.login.support

 import android.os.Bundle
+import android.util.Patterns
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@ -64,21 +65,36 @@ class LoginSupportDialog : BaseDialogFragment<DialogLoginSupportBinding>() {
                    error = null
                }
            }
-            dialogLoginSupportSubmit.setOnClickListener {
-                if (dialogLoginSupportSchoolInput.text.isNullOrBlank()) {
-                    with(dialogLoginSupportSchoolLayout) {
-                        isErrorEnabled = true
-                        error = getString(R.string.error_field_required)
-                    }
-                } else {
-                    onSubmitClick()
-                    dismiss()
-                }
-            }
+            dialogLoginSupportSubmit.setOnClickListener { onSubmitClick() }
        }
    }

    private fun onSubmitClick() {
+        when {
+            binding.dialogLoginSupportSchoolInput.text.isNullOrBlank() -> {
+                with(binding.dialogLoginSupportSchoolLayout) {
+                    isErrorEnabled = true
+                    error = getString(R.string.error_field_required)
+                }
+            }
+
+            Patterns.EMAIL_ADDRESS.matcher(
+                binding.dialogLoginSupportSchoolInput.text.toString()
+            ).matches() -> {
+                with(binding.dialogLoginSupportSchoolLayout) {
+                    isErrorEnabled = true
+                    error = getString(R.string.login_support_school_invalid)
+                }
+            }
+
+            else -> {
+                openEmailClientWithFilledTemplate()
+                dismiss()
+            }
+        }
+    }
+
+    private fun openEmailClientWithFilledTemplate() {
        with(binding) {
            context?.openEmailClient(
                chooserTitle = requireContext().getString(R.string.login_email_intent_title),
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@ -1,5 +1,6 @@
-Wersja 2.2.0
+Wersja 2.2.1

-Dokonaliśmy drobnych usprawnień w obszarze logowania, które powinny pomóc Wam i nam
+– dokonaliśmy kilka poprawek na ekranie logowania
+– naprawiliśmy przypadek z błędnym wyświetlaniem starej klasy ucznia po zalogowaniu się na konto z nowej klasy

 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -44,7 +44,7 @@
    <string name="login_token_hint">Token</string>
    <string name="login_pin_hint">PIN</string>
    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
+    <string name="login_symbol_placeholder">Např. „lodz“ nebo „powiatjaroslawski“</string>
    <string name="login_sign_in">Přihlásit</string>
    <string name="login_invalid_password">Toto heslo je příliš krátké</string>
    <string name="login_incorrect_password_default">Přihlašovací údaje jsou nesprávné</string>
@ -55,8 +55,8 @@
    <string name="login_invalid_email">Neplatný e-mail</string>
    <string name="login_invalid_login">Místo e-mailu použijte přiřazené přihlašovací údaje</string>
    <string name="login_invalid_custom_email">Použijte přiřazené přihlašovací nebo e-mail v @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
-    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
+    <string name="login_invalid_symbol">Neplatný symbol. Pokud jej nemůžete najít, kontaktujte školu</string>
+    <string name="login_invalid_symbol_definitely">Nevymýšlejte si! Pokud symbol nemůžete najít, kontaktujte školu</string>
    <string name="login_incorrect_symbol">Žák nebyl nalezen. Zkontrolujte správnost symbolu a vybrané varianty deníku UONET+</string>
    <string name="login_duplicate_student">Vybraný žák je už přihlášen</string>
    <string name="login_symbol_helper">Symbol najdete na stránce deníku v &#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nUjistěte se, že jste nastavili správnou variantu deníku v poli <b>Variace deníku UONET+</b> na první přihlašovací obrazovce</string>
@ -71,7 +71,7 @@
    <string name="login_contact_discord">Discord</string>
    <string name="login_email_intent_title">Poslat e-mail</string>
    <string name="login_recover_warning">Ujistěte se, že jste vybrali správnou variantu deníku UONET+!</string>
-    <string name="login_recover_button">Reset password</string>
+    <string name="login_recover_button">Obnovit heslo</string>
    <string name="login_recover_title">Obnovte svůj účet</string>
    <string name="login_recover">Obnovit</string>
    <string name="login_signed_in">Žák je už přihlášen</string>
@ -79,12 +79,13 @@
    <string name="login_other_search_locations">Jiná místa vyhledávání</string>
    <string name="login_no_active_student">Nebyli nalezeni žádní aktivní žáci</string>
    <string name="login_symbol_enter">Zadejte jiný symbol</string>
-    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
-    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
-    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
-    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
-    <string name="login_support_submit">Submit</string>
+    <string name="login_support_title">Získat pomoc</string>
+    <string name="login_support_school_hint">Celý název školy s městem (povinný)</string>
+    <string name="login_support_school_placeholder">Např. ZSTiO Jarosław nebo SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Zadejte správný název školy</string>
+    <string name="login_support_additional_hint">Dodatečné informace v polštině (volitelné)</string>
+    <string name="login_support_additional_placeholder">Např. „Ostatnio zmieniłem szkołę i…“ (Nedávno jsem změnil školu a…) nebo „Jestem rodzicem i nie widzę drugiego dziecka…“ (Jsem rodič a nevidím žádné další dítě…)</string>
+    <string name="login_support_submit">Odeslat</string>
    <!--Notifications-->
    <string name="notifications_header_title">Povolit oznámení</string>
    <string name="notifications_header_description">Povolit upozornění, abyste nezmeškali zprávu od učitele nebo o nové známce</string>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -80,8 +80,9 @@
    <string name="login_no_active_student">No active students found</string>
    <string name="login_symbol_enter">Enter a different symbol</string>
    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
    <string name="login_support_submit">Submit</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -80,8 +80,9 @@
    <string name="login_no_active_student">Keine aktiven Schüler gefunden</string>
    <string name="login_symbol_enter">Geben Sie ein anderes Symbol ein</string>
    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
    <string name="login_support_submit">Submit</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -80,8 +80,9 @@
    <string name="login_no_active_student">No active students found</string>
    <string name="login_symbol_enter">Enter a different symbol</string>
    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
    <string name="login_support_submit">Submit</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -80,8 +80,9 @@
    <string name="login_no_active_student">No active students found</string>
    <string name="login_symbol_enter">Enter a different symbol</string>
    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
    <string name="login_support_submit">Submit</string>
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@ -52,7 +52,7 @@
        <item>Średnia wszystkich ocen z całego roku</item>
    </string-array>
    <string-array name="timetable_show_gaps_entries">
-        <item>Nie pokauj</item>
+        <item>Nie pokazuj</item>
        <item>Tylko między lekcjami</item>
        <item>Przed i między lekcjami</item>
    </string-array>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -80,8 +80,9 @@
    <string name="login_no_active_student">Nie znaleziono aktywnych uczniów</string>
    <string name="login_symbol_enter">Wprowadź inny symbol</string>
    <string name="login_support_title">Uzyskaj pomoc</string>
-    <string name="login_support_school_hint">Pełna nazwa szkoły (wymagana)</string>
+    <string name="login_support_school_hint">Pełna nazwa szkoły z miastem (wymagana)</string>
    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Wprowadź poprawną nazwę szkoły</string>
    <string name="login_support_additional_hint">Dodatkowe informacje (po polsku) (nieobowiązkowo)</string>
    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
    <string name="login_support_submit">Wyślij</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -80,8 +80,9 @@
    <string name="login_no_active_student">Не найдено активных учеников</string>
    <string name="login_symbol_enter">Введите другой symbol</string>
    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
    <string name="login_support_submit">Submit</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -44,7 +44,7 @@
    <string name="login_token_hint">Token</string>
    <string name="login_pin_hint">PIN</string>
    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
+    <string name="login_symbol_placeholder">Napr. „lodz“ alebo „powiatjaroslawski“</string>
    <string name="login_sign_in">Prihlásiť</string>
    <string name="login_invalid_password">Toto heslo je príliš krátke</string>
    <string name="login_incorrect_password_default">Prihlasovacie údaje sú nesprávne</string>
@ -55,8 +55,8 @@
    <string name="login_invalid_email">Neplatný e-mail</string>
    <string name="login_invalid_login">Namiesto e-mailu použite priradené prihlasovacie údaje</string>
    <string name="login_invalid_custom_email">Použite priradené prihlasovacie alebo e-mail v @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
-    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
+    <string name="login_invalid_symbol">Neplatný symbol. Pokiaľ ho nemôžete nájsť, kontaktujte školu</string>
+    <string name="login_invalid_symbol_definitely">Nevymýšľajte si! Pokiaľ symbol nemôžete nájsť, kontaktujte školu</string>
    <string name="login_incorrect_symbol">Žiak nebol nájdený. Skontrolujte správnosť symbolu a vybrané varianty denníka UONET+</string>
    <string name="login_duplicate_student">Vybraný žiak už je prihlásený</string>
    <string name="login_symbol_helper">Symbol nájdete na stránke denníka v &#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nUistite sa, že ste nastavili správny variant denníka v poli <b>Variácia denníka UONET+</b> na prvej prihlasovacej obrazovke</string>
@ -71,7 +71,7 @@
    <string name="login_contact_discord">Discord</string>
    <string name="login_email_intent_title">Poslať e-mail</string>
    <string name="login_recover_warning">Uistite sa, že ste vybrali správny variant denníka UONET+!</string>
-    <string name="login_recover_button">Reset password</string>
+    <string name="login_recover_button">Obnoviť heslo</string>
    <string name="login_recover_title">Obnovte svoj účet</string>
    <string name="login_recover">Obnoviť</string>
    <string name="login_signed_in">Žiak je už prihlásený</string>
@ -79,12 +79,13 @@
    <string name="login_other_search_locations">Iné miesta vyhľadávania</string>
    <string name="login_no_active_student">Neboli nájdení žiadni aktívni žiaci</string>
    <string name="login_symbol_enter">Zadajte iný symbol</string>
-    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
-    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
-    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
-    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
-    <string name="login_support_submit">Submit</string>
+    <string name="login_support_title">Získať pomoc</string>
+    <string name="login_support_school_hint">Celý názov školy s mestom (povinný)</string>
+    <string name="login_support_school_placeholder">Napr. ZSTiO Jarosław alebo SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Zadajte správny názov školy</string>
+    <string name="login_support_additional_hint">Dodatočné informácie v poľštine (voliteľné)</string>
+    <string name="login_support_additional_placeholder">Napr. „Ostatnio zmieniłem szkołę i…“ (Nedávno som zmenil školu a…) alebo „Jestem rodzicem i nie widzę drugiego dziecka…“ (Som rodič a nevidím žiadne ďalšie dieťa…)</string>
+    <string name="login_support_submit">Odoslať</string>
    <!--Notifications-->
    <string name="notifications_header_title">Povoliť oznámenia</string>
    <string name="notifications_header_description">Povoliť oznámenia, aby ste nezmeškali správu od učiteľa alebo o novej známke</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -44,7 +44,7 @@
    <string name="login_token_hint">Token</string>
    <string name="login_pin_hint">PIN</string>
    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_symbol_placeholder">E.g. \"lodz\" or \"powiatjaroslawski\"</string>
+    <string name="login_symbol_placeholder">Напр. \"lodz\" чи \"powiatjaroslawski\"</string>
    <string name="login_sign_in">Увійти</string>
    <string name="login_invalid_password">Занадто короткий пароль</string>
    <string name="login_incorrect_password_default">Вказані невірні дані</string>
@ -55,8 +55,8 @@
    <string name="login_invalid_email">Недійсна адреса e-mail</string>
    <string name="login_invalid_login">Використовуйте призначений логін замість адреси e-mail</string>
    <string name="login_invalid_custom_email">Використовуйте призначений логін або адресу e-mail в @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol. If you cannot find it, please contact the school</string>
-    <string name="login_invalid_symbol_definitely">Don\'t make this up! If you cannot find it, please contact the school</string>
+    <string name="login_invalid_symbol">Некоректний символ. Якщо ви не можете знайти його, будь ласка, зв\'яжіться зі школою</string>
+    <string name="login_invalid_symbol_definitely">Не вигадуйте! Якщо ви не можете знайти його, будь ласка, зв\'яжіться зі школою</string>
    <string name="login_incorrect_symbol">Студента не знайдено. Перевірте symbol та обраний тип щоденника UONET+</string>
    <string name="login_duplicate_student">Цього учня вже авторизовано</string>
    <string name="login_symbol_helper">Symbol можно знайти на сторінці щоденника у&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nПереконайтеся, що ви вказали відповідний щоденник у полі <b>Тип щоденника UONET+</b> на першому екрані логування</string>
@ -71,7 +71,7 @@
    <string name="login_contact_discord">Discord</string>
    <string name="login_email_intent_title">Надіслати електронний лист</string>
    <string name="login_recover_warning">Переконайтеся, що ви вибрали правильний тип щоденника UONET+!</string>
-    <string name="login_recover_button">Reset password</string>
+    <string name="login_recover_button">Скинути пароль</string>
    <string name="login_recover_title">Відновіть свій обліковий запис</string>
    <string name="login_recover">Відновити</string>
    <string name="login_signed_in">Учня вже авторизовано</string>
@ -79,12 +79,13 @@
    <string name="login_other_search_locations">Інші розташування пошуку</string>
    <string name="login_no_active_student">Активних учнів не знайдено</string>
    <string name="login_symbol_enter">Введіть інший symbol</string>
-    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
-    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
-    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
-    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
-    <string name="login_support_submit">Submit</string>
+    <string name="login_support_title">Отримати допомогу</string>
+    <string name="login_support_school_hint">Повна назва школи з містом (обов\'язково)</string>
+    <string name="login_support_school_placeholder">Напр. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Введіть правильну назву школи</string>
+    <string name="login_support_additional_hint">Додаткова інформація польською мовою (за бажанням)</string>
+    <string name="login_support_additional_placeholder">Напр. \"Я нещодавно змінив школу і...\" або \"Я батько і не бачу другу дитину...\"</string>
+    <string name="login_support_submit">Надіслати</string>
    <!--Notifications-->
    <string name="notifications_header_title">Увімкнути сповіщення</string>
    <string name="notifications_header_description">Увімкнути сповіщення, щоб не пропустити лист від вчителя або нову оцінку</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -87,8 +87,9 @@
    <string name="login_no_active_student">No active students found</string>
    <string name="login_symbol_enter">Enter a different symbol</string>
    <string name="login_support_title">Get help</string>
-    <string name="login_support_school_hint">Full school name (required)</string>
+    <string name="login_support_school_hint">Full school name with the town (required)</string>
    <string name="login_support_school_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</string>
+    <string name="login_support_school_invalid">Enter correct name of the school</string>
    <string name="login_support_additional_hint">Additional information in Polish (optional)</string>
    <string name="login_support_additional_placeholder">Np. \"Ostatnio zmieniłem szkołę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
    <string name="login_support_submit">Submit</string>
--- a/build.gradle
+++ b/build.gradle
@ -14,14 +14,14 @@ buildscript {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
        classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.13"
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
        classpath 'com.google.gms:google-services:4.4.0'
        classpath 'com.huawei.agconnect:agcp:1.9.1.301'
        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
        classpath "com.github.triplet.gradle:play-publisher:3.8.4"
        classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.1.3277"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.0.3356"
        classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
    }