From b0885510056c8d111565b8a9fa84888e44d7c396 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 02:04:53 +0000
Subject: [PATCH 001/429] Bump hianalytics from 6.4.1.301 to 6.4.1.302 (#1832)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2f77712f..ef6749a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:20.6.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.4.1.301'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.4.1.302'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.5.200'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From 88576271e235444246e7a98289b2a6a2ab9248dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 02:05:12 +0000
Subject: [PATCH 002/429] Bump agcp from 1.6.5.200 to 1.6.5.300 (#1831)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9aa30944..a306227d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.huawei.agconnect:agcp:1.6.5.200'
+        classpath 'com.huawei.agconnect:agcp:1.6.5.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.3"

From 3caabd3e0e3a007b56d195cb49819b4b9bc58ebd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 02:06:04 +0000
Subject: [PATCH 003/429] Bump coroutines from 1.6.0 to 1.6.1 (#1828)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ef6749a2..3ec1938d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -174,7 +174,7 @@ ext {
     room = "2.4.2"
     chucker = "3.5.2"
     mockk = "1.12.2"
-    coroutines = "1.6.0"
+    coroutines = "1.6.1"
 }
 
 dependencies {

From f912aac140442ff591ccf3fde174c6a8ce102323 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 02:12:20 +0000
Subject: [PATCH 004/429] Bump gradle from 7.1.2 to 7.1.3 (#1829)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a306227d..80b2e4b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.huawei.agconnect:agcp:1.6.5.300'

From a73f39e59cbdfc0c8926e335787e16a9cffd8edc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 02:13:09 +0000
Subject: [PATCH 005/429] Bump agconnect-crash from 1.6.5.200 to 1.6.5.300
 (#1830)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3ec1938d..30c81b55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:20.6.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.4.1.302'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.5.200'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.5.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From 447ece3696efc0927bbdcd4c57f5282bd68bad15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 16 Apr 2022 12:17:22 +0200
Subject: [PATCH 006/429] Replace destination parcelable with destination json
 string (#1833)

---
 .../services/shortcuts/ShortcutsHelper.kt     | 58 ++++---------------
 .../wulkanowy/ui/modules/Destination.kt       | 17 +-----
 .../wulkanowy/ui/modules/main/MainActivity.kt | 13 +++--
 .../ui/modules/main/MainPresenter.kt          |  7 ++-
 .../ui/modules/splash/SplashActivity.kt       | 12 ++--
 .../ui/modules/splash/SplashPresenter.kt      |  7 ++-
 .../ui/modules/main/MainPresenterTest.kt      | 18 +++---
 .../ui/modules/splash/SplashPresenterTest.kt  |  3 +-
 8 files changed, 49 insertions(+), 86 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/services/shortcuts/ShortcutsHelper.kt b/app/src/main/java/io/github/wulkanowy/services/shortcuts/ShortcutsHelper.kt
index ee31af46..5e59aa54 100644
--- a/app/src/main/java/io/github/wulkanowy/services/shortcuts/ShortcutsHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/shortcuts/ShortcutsHelper.kt
@@ -15,79 +15,41 @@ import javax.inject.Singleton
 @Singleton
 class ShortcutsHelper @Inject constructor(@ApplicationContext private val context: Context) {
 
-    // Destination cannot be used here as shortcuts
-    // require their intents to only use primitive types (see PersistableBundle.isValidType).
-
-    private val destinations = mapOf(
-        "grade" to Destination.Grade,
-        "attendance" to Destination.Attendance,
-        "exam" to Destination.Exam,
-        "timetable" to Destination.Timetable()
-    )
-
-    init {
-        initializeShortcuts()
-    }
-
-    fun getDestination(intent: Intent) =
-        destinations[intent.getStringExtra(EXTRA_SHORTCUT_DESTINATION_ID)]
-
-    private fun initializeShortcuts() {
+    fun initializeShortcuts() {
         val shortcutsInfo = listOf(
             ShortcutInfoCompat.Builder(context, "grade_shortcut")
                 .setShortLabel(context.getString(R.string.grade_title))
                 .setLongLabel(context.getString(R.string.grade_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_grade))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "grade")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Grade)
+                    .apply { action = Intent.ACTION_VIEW })
                 .build(),
 
             ShortcutInfoCompat.Builder(context, "attendance_shortcut")
                 .setShortLabel(context.getString(R.string.attendance_title))
                 .setLongLabel(context.getString(R.string.attendance_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_attendance))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "attendance")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Attendance)
+                    .apply { action = Intent.ACTION_VIEW })
                 .build(),
 
             ShortcutInfoCompat.Builder(context, "exam_shortcut")
                 .setShortLabel(context.getString(R.string.exam_title))
                 .setLongLabel(context.getString(R.string.exam_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_exam))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "exam")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Exam)
+                    .apply { action = Intent.ACTION_VIEW })
                 .build(),
 
             ShortcutInfoCompat.Builder(context, "timetable_shortcut")
                 .setShortLabel(context.getString(R.string.timetable_title))
                 .setLongLabel(context.getString(R.string.timetable_title))
                 .setIcon(IconCompat.createWithResource(context, R.drawable.ic_shortcut_timetable))
-                .setIntent(SplashActivity.getStartIntent(context)
-                    .apply {
-                        action = Intent.ACTION_VIEW
-                        putExtra(EXTRA_SHORTCUT_DESTINATION_ID, "timetable")
-                    }
-                )
+                .setIntent(SplashActivity.getStartIntent(context, Destination.Timetable())
+                    .apply { action = Intent.ACTION_VIEW })
                 .build()
         )
 
         shortcutsInfo.forEach { ShortcutManagerCompat.pushDynamicShortcut(context, it) }
     }
-
-    private companion object {
-
-        private const val EXTRA_SHORTCUT_DESTINATION_ID = "shortcut_destination_id"
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
index 73a680cf..561419a0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules
 
-import android.os.Parcelable
 import androidx.fragment.app.Fragment
 import io.github.wulkanowy.data.serializers.LocalDateSerializer
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
@@ -16,12 +15,11 @@ import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
 import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
-import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import java.time.LocalDate
 
 @Serializable
-sealed class Destination : Parcelable {
+sealed class Destination {
 
     /*
     Type in children classes have to be as getter to avoid null in enums
@@ -47,35 +45,30 @@ sealed class Destination : Parcelable {
         MESSAGE(Message);
     }
 
-    @Parcelize
     @Serializable
     object Dashboard : Destination() {
         override val destinationType get() = Type.DASHBOARD
         override val destinationFragment get() = DashboardFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object Grade : Destination() {
         override val destinationType get() = Type.GRADE
         override val destinationFragment get() = GradeFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object Attendance : Destination() {
         override val destinationType get() = Type.ATTENDANCE
         override val destinationFragment get() = AttendanceFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object Exam : Destination() {
         override val destinationType get() = Type.EXAM
         override val destinationFragment get() = ExamFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     data class Timetable(
         @Serializable(with = LocalDateSerializer::class)
@@ -85,56 +78,48 @@ sealed class Destination : Parcelable {
         override val destinationFragment get() = TimetableFragment.newInstance(date)
     }
 
-    @Parcelize
     @Serializable
     object Homework : Destination() {
         override val destinationType get() = Type.HOMEWORK
         override val destinationFragment get() = HomeworkFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object Note : Destination() {
         override val destinationType get() = Type.NOTE
         override val destinationFragment get() = NoteFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object Conference : Destination() {
         override val destinationType get() = Type.CONFERENCE
         override val destinationFragment get() = ConferenceFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object SchoolAnnouncement : Destination() {
         override val destinationType get() = Type.SCHOOL_ANNOUNCEMENT
         override val destinationFragment get() = SchoolAnnouncementFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object School : Destination() {
         override val destinationType get() = Type.SCHOOL
         override val destinationFragment get() = SchoolFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object LuckyNumber : Destination() {
         override val destinationType get() = Type.LUCKY_NUMBER
         override val destinationFragment get() = LuckyNumberFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object More : Destination() {
         override val destinationType get() = Type.MORE
         override val destinationFragment get() = MoreFragment.newInstance()
     }
 
-    @Parcelize
     @Serializable
     object Message : Destination() {
         override val destinationType get() = Type.MESSAGE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index b6d41e2c..1bfc8ba5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -24,6 +24,8 @@ import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.account.accountquick.AccountQuickDialog
 import io.github.wulkanowy.utils.*
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -55,13 +57,13 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
     companion object {
 
-        private const val EXTRA_START_DESTINATION = "start_destination"
+        private const val EXTRA_START_DESTINATION = "start_destination_json"
 
         fun getStartIntent(
             context: Context,
             destination: Destination? = null,
         ) = Intent(context, MainActivity::class.java).apply {
-            putExtra(EXTRA_START_DESTINATION, destination)
+            destination?.let { putExtra(EXTRA_START_DESTINATION, Json.encodeToString(it)) }
         }
     }
 
@@ -70,9 +72,8 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     override val currentStackSize get() = navController.currentStack?.size
 
     override val currentViewTitle
-        get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let {
-            getString(it)
-        }
+        get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId
+            ?.let { getString(it) }
 
     override val currentViewSubtitle get() = (navController.currentFrag as? MainView.TitledView)?.subtitleString
 
@@ -86,7 +87,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         messageContainer = binding.mainMessageContainer
         updateHelper.messageContainer = binding.mainFragmentContainer
 
-        val destination = (intent.getParcelableExtra(EXTRA_START_DESTINATION) as Destination?)
+        val destination = intent.getStringExtra(EXTRA_START_DESTINATION)
             ?.takeIf { savedInstanceState == null }
 
         presenter.onAttachView(this, destination)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index cb414fcb..a07bdb37 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -19,6 +19,8 @@ import io.github.wulkanowy.ui.modules.message.MessageView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersView
 import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
 import io.github.wulkanowy.utils.AnalyticsHelper
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import timber.log.Timber
 import java.time.Duration
 import java.time.Instant
@@ -30,6 +32,7 @@ class MainPresenter @Inject constructor(
     private val prefRepository: PreferencesRepository,
     private val syncManager: SyncManager,
     private val analytics: AnalyticsHelper,
+    private val json: Json
 ) : BasePresenter<MainView>(errorHandler, studentRepository) {
 
     private var studentsWitSemesters: List<StudentWithSemesters>? = null
@@ -51,9 +54,11 @@ class MainPresenter @Inject constructor(
             else -> 4
         }
 
-    fun onAttachView(view: MainView, initDestination: Destination?) {
+    fun onAttachView(view: MainView, initDestinationJson: String?) {
         super.onAttachView(view)
 
+        val initDestination: Destination? = initDestinationJson?.let { json.decodeFromString(it) }
+
         val startMenuIndex = initDestination.startMenuIndex
         val destinations = rootDestinationTypeList.map {
             if (it == initDestination?.destinationType) initDestination else it.defaultDestination
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
index 24347e73..cfb62849 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
@@ -15,6 +15,8 @@ import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.openInternetBrowser
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import javax.inject.Inject
 
 @SuppressLint("CustomSplashScreen")
@@ -29,13 +31,13 @@ class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView
 
     companion object {
 
-        private const val EXTRA_START_DESTINATION = "start_destination"
+        private const val EXTRA_START_DESTINATION = "start_destination_json"
 
         private const val EXTRA_EXTERNAL_URL = "external_url"
 
         fun getStartIntent(context: Context, destination: Destination? = null) =
             Intent(context, SplashActivity::class.java).apply {
-                putExtra(EXTRA_START_DESTINATION, destination)
+                destination?.let { putExtra(EXTRA_START_DESTINATION, Json.encodeToString(it)) }
                 flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             }
     }
@@ -43,12 +45,12 @@ class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         installSplashScreen().setKeepOnScreenCondition { true }
+        shortcutsHelper.initializeShortcuts()
 
         val externalLink = intent?.getStringExtra(EXTRA_EXTERNAL_URL)
-        val startDestination = intent?.getParcelableExtra(EXTRA_START_DESTINATION) as Destination?
-            ?: shortcutsHelper.getDestination(intent)
+        val startDestinationJson = intent?.getStringExtra(EXTRA_START_DESTINATION)
 
-        presenter.onAttachView(this, externalLink, startDestination)
+        presenter.onAttachView(this, externalLink, startDestinationJson)
     }
 
     override fun openLoginView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
index 0b740902..767c885c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
@@ -5,16 +5,21 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.Destination
 import kotlinx.coroutines.launch
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
 import javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
+    private val json: Json
 ) : BasePresenter<SplashView>(errorHandler, studentRepository) {
 
-    fun onAttachView(view: SplashView, externalUrl: String?, startDestination: Destination?) {
+    fun onAttachView(view: SplashView, externalUrl: String?, startDestinationJson: String?) {
         super.onAttachView(view)
 
+        val startDestination: Destination? = startDestinationJson?.let { json.decodeFromString(it) }
+
         if (!externalUrl.isNullOrBlank()) {
             view.openExternalUrlAndFinish(externalUrl)
             return
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 7557d745..720239e6 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -5,13 +5,9 @@ import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.clearMocks
-import io.mockk.every
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
-import io.mockk.just
-import io.mockk.verify
+import kotlinx.serialization.json.Json
 import org.junit.Before
 import org.junit.Test
 
@@ -43,8 +39,14 @@ class MainPresenterTest {
         clearMocks(mainView)
 
         every { mainView.initView(any(), any()) } just Runs
-        presenter =
-            MainPresenter(errorHandler, studentRepository, prefRepository, syncManager, analytics)
+        presenter = MainPresenter(
+            errorHandler = errorHandler,
+            studentRepository = studentRepository,
+            prefRepository = prefRepository,
+            syncManager = syncManager,
+            analytics = analytics,
+            json = Json
+        )
         presenter.onAttachView(mainView, null)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
index 32311974..eb362978 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
@@ -7,6 +7,7 @@ import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify
+import kotlinx.serialization.json.Json
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -30,7 +31,7 @@ class SplashPresenterTest {
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
-        presenter = SplashPresenter(errorHandler, studentRepository)
+        presenter = SplashPresenter(errorHandler, studentRepository, Json)
     }
 
     @Test

From d37de197fca0a5f364dbcd8989056afd1b675987 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Apr 2022 14:52:06 +0000
Subject: [PATCH 007/429] Bump firebase-bom from 29.3.0 to 29.3.1 (#1836)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 30c81b55..c8a96abf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -233,7 +233,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.6.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:29.3.0')
+    playImplementation platform('com.google.firebase:firebase-bom:29.3.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 426bee882c8d4aac502b99bdbee24c5ca527c2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 18 Apr 2022 16:52:28 +0200
Subject: [PATCH 008/429] Display timetable header as HTML on dashboard tile
 (#1835)

---
 .../github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
index 3b6dc729..9191d43c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
@@ -9,6 +9,7 @@ import android.os.Looper
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updateMarginsRelative
@@ -563,7 +564,7 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
     ) {
         with(binding.dashboardLessonsItemDayHeader) {
             isVisible = header != null
-            text = header?.content
+            text = header?.content?.parseAsHtml()
         }
     }
 

From fed00122d746c83f00f4f1f5c94a42ec461fd577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 19 Apr 2022 09:56:01 +0200
Subject: [PATCH 009/429] Version 1.6.3

---
 app/build.gradle                                  | 4 ++--
 app/src/main/play/release-notes/pl-PL/default.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c8a96abf..188af355 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 106
-        versionName "1.6.2"
+        versionCode 107
+        versionName "1.6.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 4a3b1e2f..2dba56dd 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 1.6.2
+Wersja 1.6.3
 
 - dodaliśmy możliwość usuwania wielu wiadomości jednocześnie
 - dodaliśmy opcję szybkiego dodawania sprawdzianów do kalendarza

From 15e8e096ede8060dd0293d8b39280cbf2e03d62d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 May 2022 11:38:18 +0000
Subject: [PATCH 010/429] Bump robolectric from 4.7.3 to 4.8 (#1839)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 188af355..81f7af17 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -255,7 +255,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.7.3'
+    testImplementation 'org.robolectric:robolectric:4.8'
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation "androidx.test:core:1.4.0"

From 28ef8c6761fc04b2c602513a40ef27d19f555802 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 May 2022 11:46:03 +0000
Subject: [PATCH 011/429] Bump kotlin_version from 1.6.20 to 1.6.21 (#1837)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 80b2e4b7..2b1d16a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.6.20'
+        kotlin_version = '1.6.21'
         about_libraries = '8.9.4'
         hilt_version = "2.41"
     }

From bb052fd4c9e07ca5e55efa8f3c59758323987a2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 19:05:20 +0000
Subject: [PATCH 012/429] Bump robolectric from 4.8 to 4.8.1 (#1842)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 81f7af17..0a987cf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -255,7 +255,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.8'
+    testImplementation 'org.robolectric:robolectric:4.8.1'
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation "androidx.test:core:1.4.0"

From 2e7caabde392f946d7b02be66f6bcf552aa5825a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 19:05:40 +0000
Subject: [PATCH 013/429] Bump firebase-bom from 29.3.1 to 30.0.0 (#1844)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0a987cf9..e91296a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -233,7 +233,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.6.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:29.3.1')
+    playImplementation platform('com.google.firebase:firebase-bom:30.0.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From a0bf14b5766e995110a724a580b83b717ab5fe60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 19:05:59 +0000
Subject: [PATCH 014/429] Bump agconnect-crash from 1.6.5.300 to 1.6.6.200
 (#1843)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e91296a7..2910c84b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:20.6.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.4.1.302'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.5.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.6.200'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From ebde42328aa096f235e6eecd9aca66beb84b847f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 19:06:15 +0000
Subject: [PATCH 015/429] Bump agcp from 1.6.5.300 to 1.6.6.200 (#1845)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2b1d16a2..862a45cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.huawei.agconnect:agcp:1.6.5.300'
+        classpath 'com.huawei.agconnect:agcp:1.6.6.200'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.3"

From 445bfda801371bc852727d20f3d3e6c8504cc19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 12 May 2022 21:07:14 +0200
Subject: [PATCH 016/429] New Crowdin updates (#1840)

---
 .../main/res/values-ru/preferences_values.xml |  18 +-
 app/src/main/res/values-ru/strings.xml        | 546 +++++++--------
 .../main/res/values-uk/preferences_values.xml |  16 +-
 app/src/main/res/values-uk/strings.xml        | 632 +++++++++---------
 4 files changed, 606 insertions(+), 606 deletions(-)

diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index cfdaa957..9cc37620 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -32,7 +32,7 @@
         <item>0,75</item>
     </string-array>
     <string-array name="grade_sorting_mode_entries">
-        <item>Алфавитный</item>
+        <item>В алфавитном порядке</item>
         <item>По дате</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
@@ -43,22 +43,22 @@
     <string-array name="default_expand_grade_entries">
         <item>До 1 за раз</item>
         <item>Всегда развернуто</item>
-        <item>Неограниченные расширения</item>
+        <item>Неограниченно</item>
     </string-array>
     <string-array name="grade_average_mode_entries">
-        <item>Средние оценки только с выбранного семестра</item>
-        <item>Средние значения для обоих семестров</item>
-        <item>Средняя оценок со всего года</item>
+        <item>Средняя из оценок выбранного семестра</item>
+        <item>Средняя из средних оценок семестров</item>
+        <item>Средняя из оценок со всего года</item>
     </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Счастливый номер</item>
-        <item>Непрочитанные сообщения</item>
+        <item>Непрочитанные письма</item>
         <item>Посещаемость</item>
         <item>Уроки</item>
         <item>Оценки</item>
         <item>Домашняя работа</item>
-        <item>Объявления школ</item>
-        <item>Экзамены</item>
-        <item>Конференции</item>
+        <item>Объявления школы</item>
+        <item>Тесты</item>
+        <item>Встречи</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 909a627c..662e0934 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,93 +12,93 @@
     <string name="about_title">О приложении</string>
     <string name="logviewer_title">Просмотр журнала</string>
     <string name="debug_title">Отладка</string>
-    <string name="notification_debug_title">Отладка уведомления</string>
+    <string name="notification_debug_title">Отладка уведомлений</string>
     <string name="contributors_title">Разработчики</string>
     <string name="license_title">Лицензии</string>
-    <string name="message_title">Сообщения</string>
-    <string name="send_message_title">Новое сообщение</string>
-    <string name="add_homework_title">Новая домашняя работа</string>
-    <string name="note_title">Предупреждения и свершения</string>
+    <string name="message_title">Письма</string>
+    <string name="send_message_title">Написать</string>
+    <string name="add_homework_title">Новое домашнее задание</string>
+    <string name="note_title">Замечания и свершения</string>
     <string name="homework_title">Домашние задания</string>
-    <string name="account_title">Менеджер аккаунтов</string>
-    <string name="account_quick_title">Выбор учетной записи</string>
+    <string name="account_title">Управлять аккаунтами</string>
+    <string name="account_quick_title">Выбрать аккаунт</string>
     <string name="account_details_title">Данные аккаунта</string>
-    <string name="student_info_title">Информация о студенте</string>
-    <string name="dashboard_title">Панель</string>
+    <string name="student_info_title">Информация о ученике</string>
+    <string name="dashboard_title">Главная</string>
     <string name="notifications_center_title">Центр уведомлений</string>
     <!--Subtitles-->
     <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
     <!--Login-->
-    <string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
-    <string name="login_header_symbol">Введите символ со страницы регистрации: &lt;b&gt;%1$s&lt;/b&gt;</string>
-    <string name="login_nickname_hint">Имя пользователя</string>
-    <string name="login_email_hint">Электронная почта</string>
+    <string name="login_header_default">Воспользуйтесь аккаунтом ученика/родителя</string>
+    <string name="login_header_symbol">Введите symbol аккаунта со страницы регистрации: &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="login_nickname_hint">Логин</string>
+    <string name="login_email_hint">E-mail</string>
     <string name="login_login_pesel_email_hint">Логин, PESEL или электронная почта</string>
     <string name="login_password_hint">Пароль</string>
-    <string name="login_host_hint">UONET + вариант регистрации</string>
+    <string name="login_host_hint">Тип дневника UONET+</string>
     <string name="login_type_api">Мобильный API</string>
     <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Гибрид</string>
+    <string name="login_type_hybrid">Hybrid</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Войти</string>
-    <string name="login_invalid_password">Слишком короткий пароль</string>
+    <string name="login_invalid_password">Пароль слишком короткий</string>
     <string name="login_incorrect_password_default">Данные для входа указаны неверно</string>
-    <string name="login_incorrect_password">%1$s. Убедитесь, что ниже выбран правильный UONET+ вариант регистра</string>
-    <string name="login_invalid_pin">Неправильный PIN</string>
+    <string name="login_incorrect_password">%1$s. Убедитесь, что ниже выбран правильный тип дневника UONET+</string>
+    <string name="login_invalid_pin">Неверный PIN</string>
     <string name="login_invalid_token">Неверный token</string>
     <string name="login_expired_token">Token просрочен</string>
-    <string name="login_invalid_email">Неверный адрес электронной почты</string>
-    <string name="login_invalid_login">Используйте назначенный логин вместо электронной почты</string>
-    <string name="login_invalid_custom_email">Использовать назначенный логин или email в @%1$s</string>
-    <string name="login_invalid_symbol">Неправильный символ</string>
-    <string name="login_incorrect_symbol">Студент не найден. Подтвердите символ и выбранный вариант регистра UONET+</string>
+    <string name="login_invalid_email">Неверный e-mail</string>
+    <string name="login_invalid_login">Используйте назначенный логин вместо e-mail</string>
+    <string name="login_invalid_custom_email">Используйте назначенный логин или email в @%1$s</string>
+    <string name="login_invalid_symbol">Неверный symbol</string>
+    <string name="login_incorrect_symbol">Ученик не найден. Проверьте symbol и выбранный тип дненика UONET+</string>
     <string name="login_duplicate_student">Данный ученик уже авторизован</string>
-    <string name="login_symbol_helper">Этот символ можно найти на странице регистрации в &#160;<b>Ученик</b> → &#160;<b>Телефонный доступ</b> → &#160;<b> Зарегистрируйте мобильное устройство</b>.\n\nУбедитесь, что вы установили соответствующий вариант регистра в поле <b>Разновидностью бревна UONET+</b> на предыдущем экране. Вулкановый на данный момент не обнаруживает дошкольников</string>
+    <string name="login_symbol_helper">Symbol можно найти на странице регистрации в &#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nУбедитесь, что вы выбрали соответствующий тип дневника в поле <b>Тип дневника UONET+</b> на предыдущем экране</string>
     <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
     <string name="login_advanced">Другие варианты</string>
     <string name="login_advanced_warning_mobile_api">В этом режиме не работают: счастливый номер, статистика класса по оценкам, статистика посещаемости и уроков, информация о школе и список зарегистрированных устройств</string>
     <string name="login_advanced_warning_scraper">Scraper - режим, который показывает данные так же, как и сайт дневника</string>
     <string name="login_advanced_warning_hybrid">Hybrid - это комбинация лучших функций остальных двух режимов. Он работает быстрее, чем Scraper, и вводит функции, которых нет в режиме Mobile API. Находится в экспериментальной стадии</string>
-    <string name="login_privacy_policy">Политика приватности</string>
+    <string name="login_privacy_policy">Политика конфиденциальности</string>
     <string name="login_contact_header">Проблемы с авторизацией? Свяжитесь с нами!</string>
-    <string name="login_contact_email">Электронная почта</string>
+    <string name="login_contact_email">E-mail</string>
     <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">Я забыл свой пароль</string>
+    <string name="login_recover_warning">Убедитесь, что вы выбрали правильный тип дневника UONET+</string>
+    <string name="login_recover_button">Забыли пароль?</string>
     <string name="login_recover_title">Восстановите свой аккаунт</string>
     <string name="login_recover">Восстановить</string>
-    <string name="login_signed_in">Студент уже вошел в систему</string>
+    <string name="login_signed_in">Ученик уже авторизован</string>
     <string name="login_host_standard">Стандартный</string>
     <!--Main-->
     <string name="main_account_picker">Менеджер аккаунтов</string>
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
-    <string name="main_session_relogin">Сеанс истёк, пожалуйста, войдите ещё раз</string>
+    <string name="main_session_relogin">Сеанс истёк, авторизуйтесь снова</string>
     <!--Grade-->
     <string name="grade_header">Оценка</string>
-    <string name="grade_semester">Семестр %d</string>
+    <string name="grade_semester">%d семестр</string>
     <string name="grade_switch_semester">Сменить семестр</string>
-    <string name="grade_no_items">Оценки отсутствуют</string>
+    <string name="grade_no_items">Нет оценок</string>
     <string name="grade_weight">Стоимость</string>
     <string name="grade_weight_value">Стоимость: %s</string>
     <string name="grade_comment">Комментарий</string>
     <string name="grade_number_new_items">Количество новых оценок: %1$d</string>
     <string name="grade_average">Средняя оценка: %1$.2f</string>
     <string name="grade_points_sum">Баллы: %s</string>
-    <string name="grade_no_average">Средняя оценка отсутствует</string>
+    <string name="grade_no_average">Нет средней оценки</string>
     <string name="grade_summary_points">Сумма баллов</string>
     <string name="grade_summary_final_grade">Итоговая оценка</string>
     <string name="grade_summary_predicted_grade">Ожидаемая оценка</string>
     <string name="grade_summary_calculated_average">Рассчитанная средняя оценка</string>
-    <string name="grade_summary_calculated_average_help_dialog_title">Как рассчитывается средняя работа?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Расчетное среднее - это среднее арифметическое, рассчитанное на основе средних значений испытуемых. Это позволяет узнать приблизительное итоговое среднее значение. Он рассчитывается способом, выбранным пользователем в настройках приложения. Рекомендуется выбрать подходящий вариант. Это потому, что расчет средних показателей школы отличается. Кроме того, если ваша школа сообщает среднее значение по предметам на странице Vulcan, приложение загружает их и не вычисляет эти средние значения. Это можно изменить, принудительно вычисляя среднее значение в настройках приложения.\n\n<b>Среднее значение только за выбранный семестр </b>:\n1. Вычисление средневзвешенного значения по каждому предмету за семестр\n2.Добавление вычисленных средних\n3. Вычисление среднего арифметического суммарных средних\n\n<b>Среднее из средних значений за оба семестра</b>:\n1.Расчет средневзвешенного значения для каждого предмета в семестрах 1 и 2\n2. Вычисление среднего арифметического рассчитанных средних значений для семестров 1 и 2 по каждому предмету.\n3. Добавление вычисленных средних\n4. Расчет среднего арифметического суммированных средних\n\n<b>Среднее значение оценок за весь год: </b>\n1. Расчет средневзвешенного значения за год по каждому предмету. Итоговое среднее значение за 1 семестр не имеет значения.\n3. Добавление вычисленных средних\n4. Расчет среднего арифметического</string>
-    <string name="grade_summary_final_average_help_dialog_title">Как работает окончательный средний показатель?</string>
-    <string name="grade_summary_final_average_help_dialog_message">Среднее арифметическое - это среднее арифметическое, рассчитанное по всем имеющимся на данный момент итоговым классам данного семестра.\n\nСхема расчета состоит из следующих шагов:\n1. Суммирование итоговых классов преподавателей\n2. Деление по количеству уже оцененных предметов</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">Как работает \"Рассчитанная средняя оценка\"?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Рассчитанная средняя оценка - это среднее арифметическое, рассчитанное на основе средних оценок по предметам. Это позволяет узнать приблизительную итоговую среднюю оценку. Она рассчитывается способом, выбранным пользователем в настройках приложения. Рекомендуется выбрать подходящий вариант, так как каждая школа по разному считает среднюю оценку. Кроме того, если ваша школа выставляет средние оценки по предметам на странице Vulcan, приложение просто загрузит их. Это можно изменить, заставив приложение считать среднюю оценку в настройках.\n\n<b>Средняя из оценок выбранного семестра</b>:\n1. Вычисление средневзвешенного значения по каждому предмету за семестр\n2.Суммирование вычисленных значений\n3. Вычисление среднего арифметического суммированных значений\n\n<b>Средняя из средних оценок семестров</b>:\n1.Расчет средневзвешенного значения для каждого предмета в семестрах. \n2. Вычисление среднего арифметического из средневзвешенных значений для каждого предмета в семестрах.\n3. Суммирование средних арифметических\n4. Вычисление среднего арифматического из суммированных значений\n\n<b>Средняя из оценок со всего года:</b>\n1. Расчет средневзвешенного значения по каждому предмету за год. Итоговое среднее значение за 1 семестр не имеет значения.\n2. Суммирование вычисленных средних\n4. Расчет среднего арифметического суммированных чисел</string>
+    <string name="grade_summary_final_average_help_dialog_title">Как работает \"Итоговая средняя оценка\"?</string>
+    <string name="grade_summary_final_average_help_dialog_message">Итоговая средняя оценка - это среднее арифметическое, рассчитанное из всех имеющихся на данный момент итоговых оценок в семестре.\n\nРассчет происходит следующим образом:\n1. Суммирование итоговых оценок, выставленных преподавателями\n2. Полученная сумма делится на число предметов, по которым выставлены оценки</string>
     <string name="grade_summary_final_average">Итоговая средняя оценка</string>
-    <string name="grade_summary_from_subjects">от %1$d из %2$d субъектов</string>
+    <string name="grade_summary_from_subjects">%1$d из %2$d предметов</string>
     <string name="grade_menu_summary">Итоги</string>
     <string name="grade_menu_statistics">Класс</string>
     <string name="grade_menu_read">Пометить как \"прочитанное\"</string>
@@ -107,10 +107,10 @@
     <string name="grade_statistics_points">Баллы</string>
     <string name="grade_statistics_legend">Легенда</string>
     <string name="grade_statistics_class_average">Средняя класса: %1$s</string>
-    <string name="grade_statistics_student_average">Ваша средний: %1$s</string>
+    <string name="grade_statistics_student_average">Ваша средняя: %1$s</string>
     <string name="grade_statistics_student_grade">Ваша оценка: %1$s</string>
     <string name="grade_statistics_average_class">Класс</string>
-    <string name="grade_statistics_average_student">Студент</string>
+    <string name="grade_statistics_average_student">Ученик</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d оценка</item>
         <item quantity="few">%d оценки</item>
@@ -136,22 +136,22 @@
         <item quantity="other">Новые итоговые оценки</item>
     </plurals>
     <plurals name="grade_notify_new_items">
-        <item quantity="one">Вы получили %1$d оценку</item>
-        <item quantity="few">Вы получили %1$d оценки</item>
-        <item quantity="many">Вы получили %1$d оценок</item>
-        <item quantity="other">Вы получили %1$d оценок</item>
+        <item quantity="one">Вы получили %1$d новую оценку</item>
+        <item quantity="few">Вы получили %1$d новые оценки</item>
+        <item quantity="many">Вы получили %1$d новых оценок</item>
+        <item quantity="other">Вы получили %1$d новых оценок</item>
     </plurals>
     <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Вы получили %1$d ожидаемую оценку</item>
-        <item quantity="few">Вы получили %1$d ожидаемые оценки</item>
-        <item quantity="many">Вы получили %1$d ожидаемых оценок</item>
-        <item quantity="other">Вы получили %1$d ожидаемых оценок</item>
+        <item quantity="one">Вы получили %1$d новую ожидаемую оценку</item>
+        <item quantity="few">Вы получили %1$d новые ожидаемые оценки</item>
+        <item quantity="many">Вы получили %1$d новых ожидаемых оценок</item>
+        <item quantity="other">Вы получили %1$d новых ожидаемых оценок</item>
     </plurals>
     <plurals name="grade_notify_new_items_final">
-        <item quantity="one">Вы получили %1$d итоговою оценку</item>
-        <item quantity="few">Вы получили %1$d итоговых оценки</item>
-        <item quantity="many">Вы получили %1$d итоговых оценок</item>
-        <item quantity="other">Вы получили %1$d финальные оценки</item>
+        <item quantity="one">Вы получили %1$d новую итоговую оценку</item>
+        <item quantity="few">Вы получили %1$d новых итоговых оценки</item>
+        <item quantity="many">Вы получили %1$d новых итоговых оценок</item>
+        <item quantity="other">Вы получили %1$d новых итоговые оценки</item>
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
@@ -169,36 +169,36 @@
     <string name="timetable_next">Следующий: %s</string>
     <string name="timetable_later">Позже: %s</string>
     <string name="timetable_notify_lesson">%1$s урок %2$d - %3$s</string>
-    <string name="timetable_notify_change_room">Изменить комнату с %1$s на %2$s</string>
-    <string name="timetable_notify_change_teacher">Изменить учителя с %1$s на %2$s</string>
-    <string name="timetable_notify_change_subject">Изменить тему с %1$s на %2$s</string>
+    <string name="timetable_notify_change_room">Аудитория изменена с %1$s на %2$s</string>
+    <string name="timetable_notify_change_teacher">Учитель изменён с %1$s на %2$s</string>
+    <string name="timetable_notify_change_subject">Тема изменена с %1$s на %2$s</string>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Изменение расписания</item>
-        <item quantity="few">Изменение расписания</item>
-        <item quantity="many">Изменение расписания</item>
-        <item quantity="other">Изменение расписания</item>
+        <item quantity="few">Изменения расписания</item>
+        <item quantity="many">Изменения расписания</item>
+        <item quantity="other">Изменения расписания</item>
     </plurals>
     <plurals name="timetable_notify_new_items">
-        <item quantity="one">%1$s - %2$d изменений в расписании</item>
-        <item quantity="few">%1$s - %2$d изменений в расписании</item>
+        <item quantity="one">%1$s - %2$d изменение в расписании</item>
+        <item quantity="few">%1$s - %2$d изменения в расписании</item>
         <item quantity="many">%1$s - %2$d изменений в расписании</item>
-        <item quantity="other">%1$s - %2$d  изменений в расписании</item>
+        <item quantity="other">%1$s - %2$d изменений в расписании</item>
     </plurals>
     <plurals name="timetable_notify_new_items_group">
-        <item quantity="one">%1$d - изменений в расписании</item>
-        <item quantity="few">%1$d изменение в расписании</item>
-        <item quantity="many">%1$d изменение в расписании</item>
+        <item quantity="one">%1$d изменение в расписании</item>
+        <item quantity="few">%1$d изменения в расписании</item>
+        <item quantity="many">%1$d изменений в расписании</item>
         <item quantity="other">%1$d изменений в расписании</item>
     </plurals>
     <plurals name="timetable_number_item">
         <item quantity="one">%d изменение</item>
-        <item quantity="few">%d изменение</item>
-        <item quantity="many">%d изменение</item>
+        <item quantity="few">%d изменения</item>
+        <item quantity="many">%d изменений</item>
         <item quantity="other">%d изменений</item>
     </plurals>
     <!--Completed lessons-->
     <string name="completed_lessons_title">Проведённые уроки</string>
-    <string name="completed_lessons_button">Просмотреть проведённые уроки</string>
+    <string name="completed_lessons_button">Показать проведённые уроки</string>
     <string name="completed_lessons_no_items">Нет информации о проведённых уроках</string>
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Отсутствие</string>
@@ -213,7 +213,7 @@
     <string name="additional_lessons_delete_success">Дополнительный урок успешно удален</string>
     <string name="additional_lessons_repeat">Повторять еженедельно</string>
     <string name="additional_lessons_delete_title">Удалить дополнительный урок</string>
-    <string name="additional_lessons_delete_one">Просто этот урок</string>
+    <string name="additional_lessons_delete_one">Только этот урок</string>
     <string name="additional_lessons_delete_series">Все в серии</string>
     <string name="additional_lessons_start">Время начала</string>
     <string name="additional_lessons_end">Время окончания</string>
@@ -224,35 +224,35 @@
     <string name="attendance_absence_excused">Отсутствие по уважительной причине</string>
     <string name="attendance_absence_unexcused">Отсутствие по неуважительной причине</string>
     <string name="attendance_exemption">Освобождение</string>
-    <string name="attendance_excused_lateness">Опоздание по уважительным причинам</string>
-    <string name="attendance_unexcused_lateness">Опоздание по неуважительным причинам</string>
+    <string name="attendance_excused_lateness">Опоздание по уважительной причине</string>
+    <string name="attendance_unexcused_lateness">Опоздание по неуважительной причине</string>
     <string name="attendance_present">Присутствие</string>
     <string name="attendance_deleted">Удалено</string>
     <string name="attendance_unknown">Неизвестно</string>
     <string name="attendance_number">Урок №</string>
-    <string name="attendance_no_items">Данные не найдены</string>
+    <string name="attendance_no_items">Нет записей</string>
     <string name="attendance_excuse_dialog_reason">Причина отсутствия (необязательно)</string>
-    <string name="attendance_excuse_dialog_submit">Послать</string>
-    <string name="attendance_excuse_success">Запрос на освобождение оправдания успешно отправлен!</string>
-    <string name="attendance_excuse_no_selection">Выберите хотя-бы одно отсутствие</string>
-    <string name="attendance_excuse_title">Изменить статус</string>
+    <string name="attendance_excuse_dialog_submit">Отправить</string>
+    <string name="attendance_excuse_success">Причина отсутствия успешно отправлена.</string>
+    <string name="attendance_excuse_no_selection">Выберите хотя бы одно отсутствие.</string>
+    <string name="attendance_excuse_title">Указать причину</string>
     <plurals name="attendance_notify_new_items_title">
-        <item quantity="one">Новое посещение</item>
-        <item quantity="few">Новое посещение</item>
-        <item quantity="many">Новое посещение</item>
-        <item quantity="other">Новое посещение</item>
+        <item quantity="one">Новая запись о посещаемости</item>
+        <item quantity="few">Новые записи о посещаемости</item>
+        <item quantity="many">Новые записи о посещаемости</item>
+        <item quantity="other">Новые записи о посещаемости</item>
     </plurals>
     <plurals name="attendance_notify_new_items">
-        <item quantity="one">%1$d новое посещения</item>
-        <item quantity="few">%1$d новое посещение</item>
-        <item quantity="many">%1$d новое посещение</item>
-        <item quantity="other">%1$d новое посещения</item>
+        <item quantity="one">%1$d новая запись о посещаемости</item>
+        <item quantity="few">%1$d новые записи о посещаемости</item>
+        <item quantity="many">%1$d новых записей о посещаемости</item>
+        <item quantity="other">%1$d новых записей о посещаемости</item>
     </plurals>
     <plurals name="attendance_number_item">
-        <item quantity="one">%d посещаемость</item>
-        <item quantity="few">%d посещаемость</item>
-        <item quantity="many">%d посещаемость</item>
-        <item quantity="other">%d посещаемость</item>
+        <item quantity="one">%d запись о посещаемости</item>
+        <item quantity="few">%d записи о посещаемости</item>
+        <item quantity="many">%d записей о посещаемости</item>
+        <item quantity="other">%d записей о посещаемости</item>
     </plurals>
     <!--Attendance summary-->
     <string name="attendance_summary_total">Общая</string>
@@ -261,54 +261,54 @@
     <string name="exam_type">Тип</string>
     <string name="exam_entry_date">Дата записи</string>
     <plurals name="exam_notify_new_item_title">
-        <item quantity="one">Новый экзамен</item>
-        <item quantity="few">Новый экзамен</item>
-        <item quantity="many">Новый экзамен</item>
-        <item quantity="other">Новые экзамены</item>
+        <item quantity="one">Новый тест</item>
+        <item quantity="few">Новые тесты</item>
+        <item quantity="many">Новые тесты</item>
+        <item quantity="other">Новые тесты</item>
     </plurals>
     <plurals name="exam_notify_new_item_content">
-        <item quantity="one">%d новый экзамен</item>
-        <item quantity="few">%d новый экзамен</item>
-        <item quantity="many">%d новый экзамен</item>
-        <item quantity="other">%d новых экзаменов</item>
+        <item quantity="one">%d новый тест</item>
+        <item quantity="few">%d новых теста</item>
+        <item quantity="many">%d новых тестов</item>
+        <item quantity="other">%d новых тестов</item>
     </plurals>
     <plurals name="exam_number_item">
-        <item quantity="one">%d экзамен</item>
-        <item quantity="few">%d экзамен</item>
-        <item quantity="many">%d экзамен</item>
-        <item quantity="other">%d экзаменов</item>
+        <item quantity="one">%d тест</item>
+        <item quantity="few">%d теста</item>
+        <item quantity="many">%d тестов</item>
+        <item quantity="other">%d тестов</item>
     </plurals>
     <!--Message-->
     <string name="message_inbox">Полученные</string>
     <string name="message_sent">Отправленные</string>
     <string name="message_trash">Корзина</string>
     <string name="message_no_subject">(нет темы)</string>
-    <string name="message_no_items">Нет сообщений</string>
+    <string name="message_no_items">Нет писем</string>
     <string name="message_from">От:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %1$s</string>
     <string name="message_reply">Ответ</string>
     <string name="message_forward">Переслать</string>
-    <string name="message_select_all">Выбрать всё</string>
-    <string name="message_unselect_all">Снять выбор</string>
+    <string name="message_select_all">Выбрать все</string>
+    <string name="message_unselect_all">Отменить выбор</string>
     <string name="message_move_to_trash">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
-    <string name="message_delete_success">Сообщение успешно удалено</string>
+    <string name="message_delete_success">Письмо успешно удалено</string>
     <string name="message_share">Поделиться</string>
     <string name="message_print">Печать</string>
     <string name="message_subject">Тема</string>
-    <string name="message_content">Текст</string>
-    <string name="message_send_successful">Сообщение успешно отправлено</string>
-    <string name="message_not_exists">Сообщения не существует</string>
+    <string name="message_content">Содержание</string>
+    <string name="message_send_successful">Письмо успешно отправлено</string>
+    <string name="message_not_exists">Письма не существует</string>
     <string name="message_required_recipients">Вы должны выбрать как минимум одного получателя</string>
     <string name="message_content_min_length">Текст сообщения должен содержать как минимум 3 знака</string>
     <string name="message_chip_only_unread">Только непрочитанные</string>
     <string name="message_chip_only_with_attachments">Только с вложениями</string>
-    <string name="message_read">Чтение: %s</string>
+    <string name="message_read">Прочитано: %s</string>
     <string name="message_read_by">Прочитано: %1$d из %2$d человек</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d сообщение</item>
-        <item quantity="few">%1$d сообщений</item>
+        <item quantity="few">%1$d сообщения</item>
         <item quantity="many">%1$d сообщений</item>
         <item quantity="other">%1$d сообщений</item>
     </plurals>
@@ -318,8 +318,8 @@
         <item quantity="many">Новые сообщения</item>
         <item quantity="other">Новые сообщения</item>
     </plurals>
-    <string name="message_restore_dialog">Вы хотите восстановить черновичное сообщение?</string>
-    <string name="message_restore_dialog_with_recipients">Вы хотите восстановить черновик сообщения с получателями: %s?</string>
+    <string name="message_restore_dialog">Вы хотите восстановить черновик письма?</string>
+    <string name="message_restore_dialog_with_recipients">Вы хотите восстановить черновик письма с получателями: %s?</string>
     <plurals name="message_notify_new_items">
         <item quantity="one">Вы получили %1$d новое сообщение</item>
         <item quantity="few">Вы получили %1$d новых сообщения</item>
@@ -334,7 +334,7 @@
     </plurals>
     <string name="message_messages_deleted">Сообщение удалено</string>
     <!--Note-->
-    <string name="note_no_items">Нет информации о заметках</string>
+    <string name="note_no_items">Нет записей о замечаниях и свершениях</string>
     <string name="note_points">Баллы</string>
     <plurals name="note_number_item">
         <item quantity="one">%d предупреждение</item>
@@ -345,33 +345,33 @@
     <plurals name="note_new_items">
         <item quantity="one">Новое предупреждение</item>
         <item quantity="few">Новые предупреждения</item>
-        <item quantity="many">Новых предупреждений</item>
-        <item quantity="other">Новых предупреждений</item>
+        <item quantity="many">Новые предупреждения</item>
+        <item quantity="other">Новые предупреждения</item>
     </plurals>
     <plurals name="note_notify_new_items">
-        <item quantity="one">Вы получили %1$d предупреждение</item>
-        <item quantity="few">Вы получили %1$d предупреждения</item>
-        <item quantity="many">Вы получили %1$d предупреждений</item>
-        <item quantity="other">Вы получили %1$d предупреждений</item>
+        <item quantity="one">Вы получили %1$d новое предупреждение</item>
+        <item quantity="few">Вы получили %1$d новые предупреждения</item>
+        <item quantity="many">Вы получили %1$d новых предупреждений</item>
+        <item quantity="other">Вы получили %1$d новых предупреждений</item>
     </plurals>
     <!--Praise-->
     <plurals name="praise_number_item">
         <item quantity="one">%d похвала</item>
-        <item quantity="few">%d похвала</item>
-        <item quantity="many">%d похвала</item>
-        <item quantity="other">%d похвала</item>
+        <item quantity="few">%d похвалы</item>
+        <item quantity="many">%d похвал</item>
+        <item quantity="other">%d похвал</item>
     </plurals>
     <plurals name="praise_new_items">
         <item quantity="one">Новая похвала</item>
         <item quantity="few">Новые похвалы</item>
-        <item quantity="many">Новые свершения</item>
+        <item quantity="many">Новые похвалы</item>
         <item quantity="other">Новые похвалы</item>
     </plurals>
     <plurals name="praise_notify_new_items">
-        <item quantity="one">Вы получили %1$d похвалу</item>
-        <item quantity="few">Вы получили %1$d похвалы</item>
-        <item quantity="many">Вы получили %1$d похвалы</item>
-        <item quantity="other">Вы получили %1$d похвалы</item>
+        <item quantity="one">Вы получили %1$d новую похвалу</item>
+        <item quantity="few">Вы получили %1$d новые похвалы</item>
+        <item quantity="many">Вы получили %1$d новых похвал</item>
+        <item quantity="other">Вы получили %1$d новых похвал</item>
     </plurals>
     <!--Neutral notes-->
     <plurals name="neutral_note_number_item">
@@ -387,34 +387,34 @@
         <item quantity="other">Новые нейтральные замечания</item>
     </plurals>
     <plurals name="neutral_note_notify_new_items">
-        <item quantity="one">Вы получили %1$d нейтральное замечание</item>
-        <item quantity="few">Вы получили %1$d нейтральных замечания</item>
-        <item quantity="many">Вы получили %1$d нейтральных замечаний</item>
-        <item quantity="other">Вы получили %1$d нейтральных замечаний</item>
+        <item quantity="one">Вы получили %1$d новое нейтральное замечание</item>
+        <item quantity="few">Вы получили %1$d новые нейтральных замечания</item>
+        <item quantity="many">Вы получили %1$d новых нейтральных замечаний</item>
+        <item quantity="other">Вы получили %1$d новых нейтральных замечаний</item>
     </plurals>
     <!--Homework-->
     <string name="homework_no_items">Нет домашних заданий</string>
     <string name="homework_mark_as_done">Завершено</string>
     <string name="homework_mark_as_undone">Не завершено</string>
-    <string name="homework_add">Добавить домашнюю работу</string>
-    <string name="homework_add_success">Домашняя работа успешно добавлена</string>
-    <string name="homework_delete_success">Домашняя работа успешно удалена</string>
+    <string name="homework_add">Добавить домашнее задание</string>
+    <string name="homework_add_success">Домашнее задание успешно добавлена</string>
+    <string name="homework_delete_success">Домашнее задание успешно удалена</string>
     <string name="homework_attachments">Вложения</string>
     <plurals name="homework_notify_new_item_title">
-        <item quantity="one">Новая домашняя работа</item>
-        <item quantity="few">Новая домашняя работа</item>
-        <item quantity="many">Новая домашняя работа</item>
-        <item quantity="other">Новая домашняя работа</item>
+        <item quantity="one">Новое домашнее задание</item>
+        <item quantity="few">Новые домашние работы</item>
+        <item quantity="many">Новые домашние задания</item>
+        <item quantity="other">Новые домашние задания</item>
     </plurals>
     <plurals name="homework_notify_new_item_content">
-        <item quantity="one">Вы получили %d новых домашних заданий</item>
+        <item quantity="one">Вы получили %d новое домашнее задание</item>
         <item quantity="few">Вы получили %d новых домашних заданий</item>
         <item quantity="many">Вы получили %d новых домашних заданий</item>
         <item quantity="other">Вы получили %d новых домашних заданий</item>
     </plurals>
     <plurals name="homework_number_item">
-        <item quantity="one">%d домашних заданий</item>
-        <item quantity="few">%d домашних заданий</item>
+        <item quantity="one">%d домашнее задание</item>
+        <item quantity="few">%d домашних задания</item>
         <item quantity="many">%d домашних заданий</item>
         <item quantity="other">%d домашних заданий</item>
     </plurals>
@@ -423,15 +423,15 @@
     <string name="lucky_number_header">Сегодняшний счастливый номер это</string>
     <string name="lucky_number_empty">Нет данных о счастливом номере</string>
     <string name="lucky_number_notify_new_item_title">Сегодняшний счастливый номер</string>
-    <string name="lucky_number_notify_new_item">Сегодняшний номер удачи: %s</string>
+    <string name="lucky_number_notify_new_item">Сегодняшний счастливый номер: %s</string>
     <string name="lucky_number_history_button">Показать историю</string>
     <!--Lucky number history-->
-    <string name="lucky_number_history_title">История удачных чисел</string>
-    <string name="lucky_number_history_empty">Нет информации о номерах удачи</string>
+    <string name="lucky_number_history_title">История счастливых номеров</string>
+    <string name="lucky_number_history_empty">Нет информации о счастливых номерах</string>
     <!--Mobile devices-->
     <string name="mobile_devices_title">Мобильные устройства</string>
     <string name="mobile_devices_no_items">Нет устройств</string>
-    <string name="mobile_devices_unregister">Отменить регистрацию</string>
+    <string name="mobile_devices_unregister">Удалить</string>
     <string name="mobile_device_removed">Устройство удалено</string>
     <string name="mobile_device_qr">QR-код</string>
     <string name="mobile_device_token">Token</string>
@@ -457,45 +457,45 @@
     <string name="conferences_title">Встречи</string>
     <string name="conference_no_items">Нет информации о встречах</string>
     <plurals name="conference_number_item">
-        <item quantity="one">%d конференция</item>
-        <item quantity="few">%d конференция</item>
-        <item quantity="many">%d конференция</item>
-        <item quantity="other">%d конференций</item>
+        <item quantity="one">%d встреча</item>
+        <item quantity="few">%d встречи</item>
+        <item quantity="many">%d встреч</item>
+        <item quantity="other">%d встреч</item>
     </plurals>
     <plurals name="conference_notify_new_item_title">
-        <item quantity="one">Новая конференция</item>
-        <item quantity="few">Новая конференция</item>
-        <item quantity="many">Новая конференция</item>
-        <item quantity="other">Новые конференции</item>
+        <item quantity="one">Новая встреча</item>
+        <item quantity="few">Новые встречи</item>
+        <item quantity="many">Новые встречи</item>
+        <item quantity="other">Новые встречи</item>
     </plurals>
     <plurals name="conference_notify_new_items">
-        <item quantity="one">У вас %1$d новая конференция</item>
-        <item quantity="few">У вас %1$d новая конференция</item>
-        <item quantity="many">У вас %1$d новая конференция</item>
-        <item quantity="other">У вас %1$d новых конференций</item>
+        <item quantity="one">У вас %1$d новая встреча</item>
+        <item quantity="few">У вас %1$d новые встречи</item>
+        <item quantity="many">У вас %1$d новых встреч</item>
+        <item quantity="other">У вас %1$d новых встреч</item>
     </plurals>
-    <string name="conferences_present">Присутствует на конференции</string>
+    <string name="conferences_present">Присутствует на встрече</string>
     <string name="conference_agenda">Повестка дня</string>
     <!--Director information-->
-    <string name="school_announcement_title">Объявления школ</string>
-    <string name="school_announcement_no_items">Нет объявлений о школе</string>
+    <string name="school_announcement_title">Объявления школы</string>
+    <string name="school_announcement_no_items">Нет школьных объявлений</string>
     <plurals name="school_announcement_number_item">
-        <item quantity="one">Объявление о школе %d</item>
-        <item quantity="few">Объявление о школе %d</item>
-        <item quantity="many">Объявление о школе %d</item>
-        <item quantity="other">Объявления школы %d</item>
+        <item quantity="one">%d школьное объявление</item>
+        <item quantity="few">%d школьных объявления</item>
+        <item quantity="many">%d школьных объявлений</item>
+        <item quantity="other">%d школьных объявлений</item>
     </plurals>
     <plurals name="school_announcement_notify_new_item_title">
-        <item quantity="one">Объявление о новой школе</item>
-        <item quantity="few">Объявление о новой школе</item>
-        <item quantity="many">Объявление о новой школе</item>
-        <item quantity="other">Объявления о новых школах</item>
+        <item quantity="one">Новое школьное объявление</item>
+        <item quantity="few">Новые школьные объявления</item>
+        <item quantity="many">Новые школьные объявления</item>
+        <item quantity="other">Новые школьные объявления</item>
     </plurals>
     <plurals name="school_announcement_notify_new_items">
-        <item quantity="one">У вас %1$d объявление о новой школе</item>
-        <item quantity="few">У вас %1$d объявление о новой школе</item>
-        <item quantity="many">У тебя %1$d новых школьных объявлений</item>
-        <item quantity="other">У тебя %1$d новых школьных объявлений</item>
+        <item quantity="one">У вас %1$d новое школьное объявление</item>
+        <item quantity="few">У вас %1$d новые школьных объявления</item>
+        <item quantity="many">У вас %1$d новых школьных объявлений</item>
+        <item quantity="other">У вас %1$d новых школьных объявлений</item>
     </plurals>
     <!--Account-->
     <string name="account_add_new">Добавить аккаунт</string>
@@ -505,29 +505,29 @@
     <string name="account_type_student">Профиль ученика</string>
     <string name="account_type_parent">Профиль родителя</string>
     <string name="account_details_edit">Изменить данные</string>
-    <string name="account_quick_manager">Менеджер аккаунтов</string>
-    <string name="account_select_student">Выберите Студента</string>
+    <string name="account_quick_manager">Управлять аккаунтами</string>
+    <string name="account_select_student">Выбрать ученика</string>
     <string name="account_family">Семья</string>
-    <string name="account_contact">Контакт</string>
-    <string name="account_address">Детали проживания</string>
-    <string name="account_personal_data">Персональные данные</string>
+    <string name="account_contact">Контакты</string>
+    <string name="account_address">Места жительства</string>
+    <string name="account_personal_data">Личная информация</string>
     <!--About-->
     <string name="about_version">Версия приложения</string>
     <string name="about_contributor">Разработчики</string>
-    <string name="about_contributor_summary">Список разработчиков \"Вулкановый\"</string>
+    <string name="about_contributor_summary">Список разработчиков приложения</string>
     <string name="about_feedback">Возникла ошибка?</string>
     <string name="about_feedback_summary">Сообщить о ошибке</string>
     <string name="about_faq">FAQ</string>
     <string name="about_faq_summary">Часто задаваемые вопросы</string>
     <string name="about_discord">Сервер Discord</string>
     <string name="about_discord_summary">Присоединиться к сообществу приложения</string>
-    <string name="about_facebook">Facebook фан-страница</string>
-    <string name="about_twitter">Странница в твиттере</string>
-    <string name="about_twitter_summary">Подпишись на нас в твиттере</string>
-    <string name="about_facebook_summary">Поставьте лайк на нашей странице в Facebook</string>
-    <string name="about_privacy">Политика приватности</string>
+    <string name="about_facebook">Страница в Facebook</string>
+    <string name="about_twitter">Страница в Twitter</string>
+    <string name="about_twitter_summary">Следите за нами в Twitter</string>
+    <string name="about_facebook_summary">Лайкните нас в Facebook</string>
+    <string name="about_privacy">Политика конфиденциальности</string>
     <string name="about_privacy_summary">Правила хранения личных данных</string>
-    <string name="about_system">Параметры системы</string>
+    <string name="about_system">Системные настройки</string>
     <string name="about_system_summary">Открыть системные настройки</string>
     <string name="about_homepage">Домашняя страница</string>
     <string name="about_homepage_summary">Помочь в развитии приложения</string>
@@ -541,23 +541,23 @@
     <!--Student info-->
     <string name="student_info_empty">Нет информации об ученике или семье ученика</string>
     <string name="student_info_first_name">Имя</string>
-    <string name="student_info_second_name">Фамилия</string>
+    <string name="student_info_second_name">Второе имя</string>
     <string name="student_info_gender">Пол</string>
     <string name="student_info_polish_citizenship">Польское гражданство</string>
-    <string name="student_info_family_name">Фамилия</string>
+    <string name="student_info_family_name">Девичья фамилия</string>
     <string name="student_info_parents_name">Имена матери и отца</string>
-    <string name="student_info_phone">Телефон</string>
+    <string name="student_info_phone">Домашний телефон</string>
     <string name="student_info_cellphone">Сотовый телефон</string>
-    <string name="student_info_email">Эл. почта</string>
+    <string name="student_info_email">E-mail</string>
     <string name="student_info_address">Адрес проживания</string>
-    <string name="student_info_registered_address">Адрес регистрации</string>
-    <string name="student_info_correspondence_address">Адрес переписки</string>
+    <string name="student_info_registered_address">Адрес прописки</string>
+    <string name="student_info_correspondence_address">Почтовый адрес</string>
     <string name="student_info_full_name">Фамилия и имя</string>
     <string name="student_info_kinship">Степень родства</string>
     <string name="student_info_guardian_address">Адрес</string>
-    <string name="student_info_phones">Телефоны</string>
-    <string name="student_info_male">Муж</string>
-    <string name="student_info_female">Женская</string>
+    <string name="student_info_phones">Номера телефонов</string>
+    <string name="student_info_male">Мужской</string>
+    <string name="student_info_female">Женский</string>
     <string name="student_info_last_name">Фамилия</string>
     <string name="student_info_guardian">Опекун</string>
     <!--Account edit-->
@@ -565,7 +565,7 @@
     <string name="account_edit_header">Добавить ник</string>
     <string name="account_edit_avatar_title">Выберите цвет аватара</string>
     <!--Log viewer-->
-    <string name="logviewer_share">Поделиться логами</string>
+    <string name="logviewer_share">Отправить логи</string>
     <string name="logviewer_refresh">Обновить</string>
     <!--Dashboard-->
     <string name="dashboard_timetable_title">Уроки</string>
@@ -579,20 +579,20 @@
     <string name="dashboard_timetable_second_lessons_title">Далее:</string>
     <string name="dashboard_timetable_third_title">Позднее:</string>
     <plurals name="dashboard_timetable_third_value">
-        <item quantity="one">Еще %1$d урок</item>
-        <item quantity="few">Еще %1$d урок</item>
-        <item quantity="many">Еще %1$d урок</item>
-        <item quantity="other">Ещё %1$d уроков</item>
+        <item quantity="one">ещё %1$d урок</item>
+        <item quantity="few">ещё %1$d урока</item>
+        <item quantity="many">ещё %1$d уроков</item>
+        <item quantity="other">ещё %1$d уроков</item>
     </plurals>
     <string name="dashboard_timetable_third_time">до %1$s</string>
     <string name="dashboard_timetable_no_lessons">Нет предстоящих занятий</string>
     <string name="dashboard_timetable_error">Произошла ошибка при загрузке уроков</string>
-    <string name="dashboard_homework_title">Домашняя работа</string>
+    <string name="dashboard_homework_title">Домашнее задание</string>
     <string name="dashboard_homework_no_homework">Нет домашних заданий</string>
     <string name="dashboard_homework_error">Произошла ошибка при загрузке домашнего задания</string>
     <plurals name="dashboard_homework_more">
-        <item quantity="one">Ещё %1$d домашних заданий</item>
-        <item quantity="few">Ещё %1$d домашних заданий</item>
+        <item quantity="one">Ещё %1$d домашнее задание</item>
+        <item quantity="few">Ещё %1$d домашних задания</item>
         <item quantity="many">Ещё %1$d домашних заданий</item>
         <item quantity="other">Ещё %1$d домашних заданий</item>
     </plurals>
@@ -600,32 +600,32 @@
     <string name="dashboard_grade_title">Последние оценки</string>
     <string name="dashboard_grade_no_grade">Нет новых оценок</string>
     <string name="dashboard_grade_error">Произошла ошибка при загрузке оценок</string>
-    <string name="dashboard_announcements_title">Объявления школ</string>
-    <string name="dashboard_announcements_no_announcements">Нет текущих объявлений</string>
+    <string name="dashboard_announcements_title">Школьные объявления</string>
+    <string name="dashboard_announcements_no_announcements">Нет объявлений</string>
     <string name="dashboard_announcements_error">Произошла ошибка при загрузке объявлений</string>
     <plurals name="dashboard_announcements_more">
-        <item quantity="one">Ещё %1$d объявление</item>
-        <item quantity="few">Ещё %1$d объявление</item>
-        <item quantity="many">Ещё %1$d объявление</item>
-        <item quantity="other">Ещё %1$d объявлений</item>
+        <item quantity="one">ещё %1$d объявление</item>
+        <item quantity="few">ещё %1$d объявления</item>
+        <item quantity="many">ещё %1$d объявлений</item>
+        <item quantity="other">ещё %1$d объявлений</item>
     </plurals>
-    <string name="dashboard_exams_title">Экзамены</string>
-    <string name="dashboard_exams_no_exams">Нет предстоящих экзаменов</string>
-    <string name="dashboard_exams_error">Произошла ошибка при загрузке экзамена</string>
+    <string name="dashboard_exams_title">Тесты</string>
+    <string name="dashboard_exams_no_exams">Нет предстоящих тестов</string>
+    <string name="dashboard_exams_error">Произошла ошибка при загрузке тестов</string>
     <plurals name="dashboard_exams_more">
-        <item quantity="one">Еще %1$d экзамен</item>
-        <item quantity="few">Еще %1$d экзамен</item>
-        <item quantity="many">Еще %1$d экзамен</item>
-        <item quantity="other">ещё %1$d экзаменов</item>
+        <item quantity="one">ещё %1$d тест</item>
+        <item quantity="few">ещё %1$d теста</item>
+        <item quantity="many">ещё %1$d тестов</item>
+        <item quantity="other">ещё %1$d тестов</item>
     </plurals>
-    <string name="dashboard_conferences_title">Конференции</string>
-    <string name="dashboard_conferences_no_conferences">Нет предстоящих конференций</string>
-    <string name="dashboard_conferences_error">Произошла ошибка при загрузке конференций</string>
+    <string name="dashboard_conferences_title">Встречи</string>
+    <string name="dashboard_conferences_no_conferences">Нет предстоящих встреч</string>
+    <string name="dashboard_conferences_error">Произошла ошибка при загрузке встреч</string>
     <plurals name="dashboard_conference_more">
-        <item quantity="one">Еще %1$d конференция</item>
-        <item quantity="few">Еще %1$d конференция</item>
-        <item quantity="many">Еще %1$d конференция</item>
-        <item quantity="other">Еще %1$d конференций</item>
+        <item quantity="one">еще %1$d встреча</item>
+        <item quantity="few">еще %1$d встречи</item>
+        <item quantity="many">еще %1$d встреч</item>
+        <item quantity="other">еще %1$d встреч</item>
     </plurals>
     <string name="dashboard_horizontal_group_error">Произошла ошибка при загрузке данных</string>
     <string name="dashboard_horizontal_group_no_data">Отсутствует</string>
@@ -668,96 +668,96 @@
     <!--Preferences-->
     <string name="pref_view_header">Приложение</string>
     <string name="pref_view_list">Окно по умолчанию</string>
-    <string name="pref_view_grade_average_mode">Рассчитанные средние параметры</string>
+    <string name="pref_view_grade_average_mode">Параметры расчёта средних оценок</string>
     <string name="pref_view_grade_average_force_calc">Принудительно высчитать среднюю оценку через приложение</string>
-    <string name="pref_view_present">Показать присутствие</string>
+    <string name="pref_view_present">Показывать присутствия</string>
     <string name="pref_view_app_theme">Тема</string>
-    <string name="pref_view_expand_grade">Расширяется оценка</string>
+    <string name="pref_view_expand_grade">Разворачивание оценок</string>
     <string name="pref_view_timetable_show_timers">Отметить текущий урок</string>
     <string name="pref_view_timetable_show_groups">Показать группы рядом с темами</string>
     <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
     <string name="pref_view_subjects_without_grades">Показать предметы без оценок</string>
-    <string name="pref_view_grade_color_scheme">Схема цветов оценок</string>
+    <string name="pref_view_grade_color_scheme">Цветовая схема оценок</string>
     <string name="pref_view_grade_sorting_mode">Сортировка уроков</string>
     <string name="pref_view_app_language">Язык</string>
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_header_other">Прочее</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
-    <string name="pref_notify_upcoming_lessons_switch">Показывать уведомления о будущих уроках</string>
-    <string name="pref_notify_upcoming_lessons_persistent_switch">Сделать уведомления о предстоящем уроке постоянным</string>
-    <string name="pref_notify_upcoming_lessons_persistent_summary">Выключить, когда уведомление не отображается в чата/полосе</string>
-    <string name="pref_notify_open_system_settings">Открыть настройки уведомлений системы</string>
+    <string name="pref_notify_upcoming_lessons_switch">Показывать уведомления о предстоящих уроках</string>
+    <string name="pref_notify_upcoming_lessons_persistent_switch">Сделать уведомление о предстоящем уроке постоянным</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Выключите, если уведомление не отображается на умных часах</string>
+    <string name="pref_notify_open_system_settings">Открыть системные настройки уведомлений</string>
     <string name="pref_notify_fix_sync_issues">Исправить проблемы с синхронизацией и уведомлениями</string>
     <string name="pref_notify_fix_sync_issues_message">На вашем устройстве могут быть проблемы с синхронизацией данных и уведомлениями.\n\nЧтобы их исправить, вам необходимо добавить Wulkanowy в авто-старт и выключить оптимизацию/экономию батареи в настройках устройства.</string>
-    <string name="pref_notify_debug_switch">Показывать дебаг-уведомления</string>
+    <string name="pref_notify_debug_switch">Показывать отладочные уведомления</string>
     <string name="pref_notify_disabled_summary">Синхронизация отключена</string>
-    <string name="pref_notify_notifications_piggyback_header">Официальные уведомления приложения</string>
-    <string name="pref_notify_notifications_piggyback">Записывать официальные уведомления</string>
+    <string name="pref_notify_notifications_piggyback_header">Уведомления официального приложения</string>
+    <string name="pref_notify_notifications_piggyback">Захватывать уведомления официального приложения</string>
     <string name="pref_notify_notifications_piggyback_cancel_original">Удалить уведомления от официального приложения после захвата</string>
-    <string name="pref_notification_piggyback_popup_title">Показывать push-уведомления</string>
-    <string name="pref_notification_piggyback_popup_description">С помощью этой функции вы можете получить замену push-уведомлений, как в официальном приложении. Все, что вам нужно сделать, это разрешить Wulkanowy получать все уведомления в настройках системы.\n\nКак это работает?\nКогда вы получаете уведомление в Dziennik VULCAN, Wulkanowy будет уведомлен (это требует дополнительных прав) и запустит синхронизацию, чтобы отправить свое уведомление.\n\nТОЛЬКО ДЛЯ ПОЛЬЗОВАТЕЛЯ</string>
-    <string name="pref_notification_exact_alarm_popup_title">Показывать уведомления о будущих уроках</string>
-    <string name="pref_notification_exact_alarm_popup_descriptions">Вы должны разрешить приложению Wulkanowy установить будильник и напоминания в настройках системы, чтобы использовать эту функцию.</string>
+    <string name="pref_notification_piggyback_popup_title">Захват уведомлений</string>
+    <string name="pref_notification_piggyback_popup_description">С помощью этой функции вы можете получить аналог push-уведомлений из официального приложения. Все, что вам нужно сделать, это разрешить Wulkanowy получать все уведомления в настройках системы.\n\nКак это работает?\nКогда вы получаете уведомление в Dziennik VULCAN, Wulkanowy будет уведомлен (для этого и нужны дополнительные разрешения) и запустит синхронизацию, чтобы отправить свое уведомление.\n\nТОЛЬКО ДЛЯ ПРОДВИНУТЫХ ПОЛЬЗОВАТЕЛЕЙ</string>
+    <string name="pref_notification_exact_alarm_popup_title">Показывать уведомления о предстоящих уроках</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">Вы должны разрешить Wulkanowy устанавливать будильник и напоминания в настройках системы, чтобы использовать эту функцию.</string>
     <string name="pref_notification_go_to_settings">Перейти к настройкам</string>
     <string name="pref_services_header">Синхронизация</string>
     <string name="pref_services_switch">Автоматическая синхронизация</string>
-    <string name="pref_services_suspended">Приостановить синхронизации во время каникул</string>
+    <string name="pref_services_suspended">Приостановлена во время каникул</string>
     <string name="pref_services_interval">Интервал синхронизации</string>
     <string name="pref_services_wifi">Только через Wi-Fi</string>
     <string name="pref_services_force_sync">Синхронизировать</string>
     <string name="pref_services_message_sync_success">Синхронизировано!</string>
     <string name="pref_services_message_sync_failed">Синхронизация не удалась</string>
-    <string name="pref_services_sync_in_progress">Идёт синхронизация</string>
+    <string name="pref_services_sync_in_progress">Синхронизация...</string>
     <string name="pref_services_last_full_sync_date">Последняя полная синхронизация: %s</string>
     <string name="pref_other_grade_modifier_plus">Стоимость плюса</string>
     <string name="pref_other_grade_modifier_minus">Стоимость минуса</string>
     <string name="pref_other_fill_message_content">Отвечать с историей сообщений</string>
-    <string name="pref_other_optional_arithmetic_average">Показывать среднее арифметическое при отсутствии весов</string>
+    <string name="pref_other_optional_arithmetic_average">Показывать среднее арифметическое при отсутствии стоимости</string>
     <string name="pref_ads_support_category_name">Поддержка</string>
-    <string name="pref_ads_support">Смотреть одиночную рекламу для поддержки проекта</string>
+    <string name="pref_ads_support">Посмотреть рекламу для поддержки проекта</string>
     <string name="pref_ads_privacy_title">Согласие на обработку данных</string>
     <string name="pref_ads_privacy_description">Для просмотра рекламы вы должны согласиться с условиями обработки данных нашей Политики конфиденциальности</string>
-    <string name="pref_ads_privacy_agree">Согласен</string>
+    <string name="pref_ads_privacy_agree">Согласиться</string>
     <string name="pref_ads_privacy_link">Политика конфиденциальности</string>
-    <string name="pref_ads_loading">Объявление загружается</string>
+    <string name="pref_ads_loading">Реклама загружается</string>
     <string name="pref_ads_once_per_visit">Спасибо за вашу поддержку, возвращайтесь позже для дополнительной рекламы</string>
     <string name="pref_settings_advanced_title">Расширенные</string>
-    <string name="pref_settings_appearance_title">Внешний вид &amp; Поведение</string>
+    <string name="pref_settings_appearance_title">Внешний вид и поведение</string>
     <string name="pref_settings_notifications_title">Уведомления</string>
     <string name="pref_settings_sync_title">Синхронизация</string>
     <string name="pref_settings_ads_title">Реклама</string>
     <string name="pref_grades_appearance_header">Оценки</string>
-    <string name="pref_dashboard_appearance_header">Панель</string>
+    <string name="pref_dashboard_appearance_header">Главная</string>
     <string name="pref_dashboard_appearance_tiles_title">Видимость плиток</string>
     <string name="pref_attendance_appearance_view">Посещаемость</string>
     <string name="pref_timetable_appearance_view">Расписание</string>
     <string name="pref_grades_advanced_header">Оценки</string>
-    <string name="pref_counted_average_advanced_header">Расчетное среднее</string>
+    <string name="pref_counted_average_advanced_header">Рассчитанная средняя оценка</string>
     <string name="pref_messages_advanced_header">Сообщения</string>
-    <string name="pref_appearance_category">Внешний вид &amp; Поведение</string>
-    <string name="pref_appearance_category_summary">Языки, темы, темы сортировки темы</string>
-    <string name="pref_notifications_category_summary">Уведомления приложений, проблемы с устранением</string>
+    <string name="pref_appearance_category">Внешний вид и поведение</string>
+    <string name="pref_appearance_category_summary">Язык, тема, сортировка предметов</string>
+    <string name="pref_notifications_category_summary">Настройки уведомлений приложения</string>
     <string name="pref_notifications_category">Уведомления</string>
     <string name="pref_sync_category">Синхронизация</string>
-    <string name="pref_sync_category_summary">Автоматическое обновление, интервал синхронизации</string>
-    <string name="pref_advanced_category_summary">Значения плюс и минус, средний расчет</string>
+    <string name="pref_sync_category_summary">Автоматическая синхронизация и её интервал</string>
+    <string name="pref_advanced_category_summary">Значения плюса и минуса, расчёт средней оценки</string>
     <string name="pref_advanced_category">Расширенные</string>
-    <string name="pref_about_category_summary">Версия приложения, участники, социальные порталы</string>
-    <string name="pref_ads_category_summary">Отображение объявлений, поддержка проекта</string>
+    <string name="pref_about_category_summary">Версия приложения, разработчики, соц. сети</string>
+    <string name="pref_ads_category_summary">Посмотреть рекламу, чтобы поддержать преокт</string>
     <!--Notification Channels-->
     <string name="channel_new_grades">Новые оценки</string>
-    <string name="channel_new_homework">Новая домашняя работа</string>
-    <string name="channel_new_conference">Новые конференции</string>
-    <string name="channel_new_exam">Новые экзамены</string>
+    <string name="channel_new_homework">Новое домашнее задание</string>
+    <string name="channel_new_conference">Новые встречи</string>
+    <string name="channel_new_exam">Новые тесты</string>
     <string name="channel_lucky_number">Счастливый номер</string>
-    <string name="channel_new_message">Новые сообщения</string>
-    <string name="channel_new_notes">Новые заметки</string>
-    <string name="channel_new_school_announcement">Объявления о новых школах</string>
-    <string name="channel_push">Показывать push-уведомления</string>
-    <string name="channel_upcoming_lessons">Будущие уроки</string>
-    <string name="channel_debug">Дебаг</string>
-    <string name="channel_change_timetable">Изменение расписания</string>
-    <string name="channel_new_attendance">Новое посещение</string>
+    <string name="channel_new_message">Новые письма</string>
+    <string name="channel_new_notes">Новые замечания</string>
+    <string name="channel_new_school_announcement">Новые школьные объявления</string>
+    <string name="channel_push">Push-уведомления</string>
+    <string name="channel_upcoming_lessons">Предстоящие уроки</string>
+    <string name="channel_debug">Отладка</string>
+    <string name="channel_change_timetable">Изменения в расписании</string>
+    <string name="channel_new_attendance">Новая запись о посещаемости</string>
     <!--Colors-->
     <string name="all_black">Чёрный</string>
     <string name="all_red">Красный</string>
@@ -771,16 +771,16 @@
     <string name="update_download_success_button">Перезапустить</string>
     <string name="update_failed">Не удалось обновить! Wulkanowy может работать некорректно. Рассмотрите возможность обновления</string>
     <!--Errors-->
-    <string name="error_no_internet">Нет интернет-подключения</string>
-    <string name="error_invalid_device_datetime">Произошла ошибка. Проверьте часы вашего устройства</string>
-    <string name="error_timeout">Не удалось подключиться к регистрации. Серверы могут быть перегружены. Пожалуйста, повторите попытку позже</string>
-    <string name="error_login_failed">Не удалось загрузить данные. Пожалуйста, повторите попытку позже</string>
-    <string name="error_password_change_required">Необходимо изменить пароль реестра</string>
-    <string name="error_service_unavailable">Технический перерыв в журнале UONET + продолжается. Попробуйте позже</string>
-    <string name="error_unknown_uonet">Неизвестная ошибка UONET + регистр. Попробуйте позже</string>
-    <string name="error_unknown_app">Неизвестная ошибка приложения. Пожалуйста, повторите попытку позже</string>
-    <string name="error_unknown">Произошла неожиданная ошибка</string>
-    <string name="error_feature_disabled">Функция была выключена школой</string>
-    <string name="error_feature_not_available">Функция не доступна в этом режиме</string>
-    <string name="error_field_required">Это поле является обязательным</string>
+    <string name="error_no_internet">Интернет-соединение отсутствует</string>
+    <string name="error_invalid_device_datetime">Произошла ошибка. Проверьте время на вашем устройстве</string>
+    <string name="error_timeout">Не удалось подключиться к дневнику. Возможно, сервера перегружены, повторите попытку позже</string>
+    <string name="error_login_failed">Не удалось загрузить данные, повторите попытку позже</string>
+    <string name="error_password_change_required">Необходимо изменить пароль дневника</string>
+    <string name="error_service_unavailable">UONET+ проводит техническое обслуживание, повторите попытку позже</string>
+    <string name="error_unknown_uonet">Неизвестная ошибка дневника UONET+, повторите попытку позже</string>
+    <string name="error_unknown_app">Неизвестная ошибка приложения, повторите попытку позже</string>
+    <string name="error_unknown">Произошла непредвиденная ошибка</string>
+    <string name="error_feature_disabled">Функция отключена вашей школой</string>
+    <string name="error_feature_not_available">Функция недоступна в режиме Mobile API. Воспользуйтесь другим режимом</string>
+    <string name="error_field_required">Это поле обязательно</string>
 </resources>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index a8c09bcf..82c5b6ec 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -41,24 +41,24 @@
         <item>Кольори оцінок в щоденнику</item>
     </string-array>
     <string-array name="default_expand_grade_entries">
-        <item>Раз до 1</item>
-        <item>Завжди розгорнутий</item>
-        <item>Необмежена кількість розширень</item>
+        <item>До 1 за раз</item>
+        <item>Завжди розгорнуті</item>
+        <item>Необмежена кількість розгортань</item>
     </string-array>
     <string-array name="grade_average_mode_entries">
-        <item>Середні оцінки тільки від обраного семестру</item>
-        <item>Середнє значення для обох семестів</item>
-        <item>Середнє оцінювання за весь рік</item>
+        <item>Середні оцінки тільки за обраний семестр</item>
+        <item>Середнє значення з обох семестрів</item>
+        <item>Середня оцінка з цілого року</item>
     </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Щасливий номер</item>
-        <item>Непрочитані повідомлення</item>
+        <item>Непрочитані листи</item>
         <item>Відвідуваність</item>
         <item>Уроки</item>
         <item>Оцінки</item>
         <item>Домашні завдання</item>
         <item>Оголошення школи</item>
         <item>Тести</item>
-        <item>Конференції</item>
+        <item>Зустрічі</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7e01f70b..0cc50dbe 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -8,34 +8,34 @@
     <string name="exam_title">Тести</string>
     <string name="timetable_title">Розклад</string>
     <string name="settings_title">Налаштування</string>
-    <string name="more_title">Інше</string>
-    <string name="about_title">Про додаток</string>
-    <string name="logviewer_title">Переглядач журналів</string>
+    <string name="more_title">Більше</string>
+    <string name="about_title">Про</string>
+    <string name="logviewer_title">Переглядач логів</string>
     <string name="debug_title">Відладка</string>
-    <string name="notification_debug_title">Налагодження сповіщень</string>
+    <string name="notification_debug_title">Відладка сповіщень</string>
     <string name="contributors_title">Розробники</string>
     <string name="license_title">Ліцензії</string>
-    <string name="message_title">Повідомлення</string>
-    <string name="send_message_title">Нове повідомлення</string>
-    <string name="add_homework_title">Нова домашня робота</string>
-    <string name="note_title">Нотатки та досягнення</string>
+    <string name="message_title">Листи</string>
+    <string name="send_message_title">Новий лист</string>
+    <string name="add_homework_title">Нове домашнє завдання</string>
+    <string name="note_title">Зауваження та похвали</string>
     <string name="homework_title">Домашні завдання</string>
-    <string name="account_title">Менеджер аккаунтів</string>
-    <string name="account_quick_title">Виберіть обліковий запис</string>
+    <string name="account_title">Змінити облікові записи</string>
+    <string name="account_quick_title">Вибрати обліковий запис</string>
     <string name="account_details_title">Деталі облікового запису</string>
     <string name="student_info_title">Інформація про учня</string>
-    <string name="dashboard_title">Дошка</string>
-    <string name="notifications_center_title">Журнал сповіщень</string>
+    <string name="dashboard_title">Головна</string>
+    <string name="notifications_center_title">Центр сповіщень</string>
     <!--Subtitles-->
     <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
     <!--Login-->
-    <string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батьків</string>
-    <string name="login_header_symbol">Введіть символ зі сторінки реєстру: &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="login_header_default">Авторизуйтеся за допомогою облікового запису учня або батьків</string>
+    <string name="login_header_symbol">Введіть symbol зі сторінки щоденника: &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="login_nickname_hint">Ім\'я користувача</string>
-    <string name="login_email_hint">Електронна пошта</string>
-    <string name="login_login_pesel_email_hint">Логін, PESEL або електронна пошта</string>
+    <string name="login_email_hint">E-mail</string>
+    <string name="login_login_pesel_email_hint">Логін, PESEL або e-mail</string>
     <string name="login_password_hint">Пароль</string>
-    <string name="login_host_hint">UONET + варіант реєстрації</string>
+    <string name="login_host_hint">Тип щоденника UONET+</string>
     <string name="login_type_api">Мobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
@@ -45,35 +45,35 @@
     <string name="login_sign_in">Увійти</string>
     <string name="login_invalid_password">Занадто короткий пароль</string>
     <string name="login_incorrect_password_default">Вказані невірні дані</string>
-    <string name="login_incorrect_password">%1$s. Переконайтеся, що обрано правильну варіацію запису UONET+</string>
+    <string name="login_incorrect_password">%1$s. Переконайтеся, що обрано правильний тип щоденника UONET+</string>
     <string name="login_invalid_pin">Неправильний PIN</string>
     <string name="login_invalid_token">Неправильний token</string>
-    <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_symbol">Неправильний симбвол</string>
-    <string name="login_incorrect_symbol">Студента не знайдено Перевірте символ та обраний варіант реєстру UONET+</string>
-    <string name="login_duplicate_student">Даного учня вже авторизовано</string>
-    <string name="login_symbol_helper">Символ можна знайти на сторінці реєстрації в &#160; <b> Учень </b> → &#160; <b> Мобільний доступ </b> → &#160; <b> Додайте мобільне приладдя </b>.\n\nПереконайтесь, що ви встановили відповідний варіант реєстру в полі <b> UONET + варіант реєстрації </b> на попередньому екрані. На даний момент Wulkanowy не виявляє учнів дошкільних закладів</string>
+    <string name="login_expired_token">Token згаснув</string>
+    <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">Неправильний symbol</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>Zarejestruj urządzenie mobilne</b>.\n\nПереконайтесь, що ви встановили відповідний тип щоденника в полі <b>Тип щоденника UONET+</b> на попередньому екрані</string>
     <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>
     <string name="login_advanced">Інші варіанти</string>
-    <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності і уроків, інформація про школу і список зареєстрованних пристроїв</string>
+    <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності та уроків, інформація про школу та список зареєстрованих пристроїв</string>
     <string name="login_advanced_warning_scraper">Scraper - режим, котрий показує дані так само, як і сторінка щоденника</string>
-    <string name="login_advanced_warning_hybrid">Hybrid - це комбінація найкращих функцій інших двох режимів. Він працює швидше, ніж Scraper, и впроваджує функції, котрих нема в режимі Mobile API. Знаходиться в експериментальній стадії</string>
-    <string name="login_privacy_policy">Політика приватності</string>
+    <string name="login_advanced_warning_hybrid">Hybrid - це комбінація найкращих функцій інших двох режимів. Він працює швидше, ніж Scraper, й впроваджує функції, котрих нема в режимі Mobile API. Знаходиться в експериментальній стадії</string>
+    <string name="login_privacy_policy">Політика конфіденційності</string>
     <string name="login_contact_header">Проблеми з авторизацією? Зв\'яжіться з нами!</string>
-    <string name="login_contact_email">Електронна пошта</string>
+    <string name="login_contact_email">E-mail</string>
     <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Відправити лист</string>
-    <string name="login_recover_warning">Переконайтеся, що ви вибрали правильний варіант реєстрації UONET+!</string>
+    <string name="login_email_intent_title">Надіслати електронний лист</string>
+    <string name="login_recover_warning">Переконайтеся, що ви вибрали правильний тип щоденника UONET+!</string>
     <string name="login_recover_button">Забули пароль?</string>
     <string name="login_recover_title">Відновіть свій обліковий запис</string>
     <string name="login_recover">Відновити</string>
-    <string name="login_signed_in">Учень вже увійшов до системи</string>
+    <string name="login_signed_in">Учня вже авторизовано</string>
     <string name="login_host_standard">Стандартний</string>
     <!--Main-->
-    <string name="main_account_picker">Менеджер аккаунтів</string>
+    <string name="main_account_picker">Змінити облікові записи</string>
     <string name="main_log_in">Увійти</string>
     <string name="main_session_expired">Минув термін дії сесії</string>
     <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
@@ -87,26 +87,26 @@
     <string name="grade_comment">Коментар</string>
     <string name="grade_number_new_items">Кількість нових оцінок: %1$d</string>
     <string name="grade_average">Середня оцінка: %1$.2f</string>
-    <string name="grade_points_sum">Балів: %s</string>
-    <string name="grade_no_average">Відсутність середньої оцінки</string>
-    <string name="grade_summary_points">Сума балів</string>
+    <string name="grade_points_sum">Бали: %s</string>
+    <string name="grade_no_average">Середня оцінка відсутня</string>
+    <string name="grade_summary_points">Всього балів</string>
     <string name="grade_summary_final_grade">Підсумкова оцінка</string>
-    <string name="grade_summary_predicted_grade">Очікувана оцінка</string>
+    <string name="grade_summary_predicted_grade">Передбачувана оцінка</string>
     <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
-    <string name="grade_summary_calculated_average_help_dialog_title">Як розраховується середньо?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Розрахункове середнє - це середнє арифметичне, обчислене з середніх показників для випробуваних. Це дозволяє дізнатися приблизну кінцеву середню величину. Він розраховується способом, обраним користувачем у налаштуваннях програми. Рекомендується вибрати відповідний варіант. Це пояснюється тим, що розрахунок середніх показників за школою відрізняється. Крім того, якщо у вашій школі повідомляється середнє значення предметів на сторінці Вулкан, програма завантажує їх і не обчислює ці середні значення. Це можна змінити шляхом примусового розрахунку середнього значення в налаштуваннях програми.\n\n<b>Середні оцінки лише за вибраний семестр </b>:\n1. Розрахунок середньозваженого для кожного предмета в даному семестрі\n2.Додавання розрахункових середніх\n3. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення середніх показників за обидва семестри </b>:\n1.Обчислення середньозваженого значення для кожного предмета у 1 та 2 семестрах\n2. Обчислення середнього арифметичного розрахункових середніх показників за 1 та 2 семестри для кожного предмета.\n3. Додавання розрахункових середніх\n4. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення оцінок за весь рік: </b>\n1. Розрахунок середньозваженого показника за рік для кожного предмета. Остаточний середній показник у 1 -му семестрі не має значення.\n3. Додавання розрахункових середніх \n4. Обчислення середнього арифметичного середніх суммованих середніх</string>
-    <string name="grade_summary_final_average_help_dialog_title">Як працює кінцевий середній показник?</string>
-    <string name="grade_summary_final_average_help_dialog_message">Підсумкове середнє значення - це середнє арифметичне, обчислене з усіх наявних наразі підсумкових оцінок у даному семестрі. \ N \ nСхема обчислення складається з таких кроків: \ n1. Підбиття підсумкових оцінок викладачів \ n2. Поділіть на кількість предметів, які вже оцінені</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">Як працює \"Розрахована середня оцінка\"?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Розрахована середня оцінка - це середнє арифметичне, обчислене з середніх оцінок з предметів.Це дозволяє дізнатися приблизну кінцеву середню оцінку.Вона розраховується способом, обраним користувачем у налаштуваннях програми.Рекомендується вибрати відповідний варіант, тому що кожна школа по різному розраховує середню оцінку.Крім того, якщо у вашій школі повідомляється середня оцінка з предметів на сторінці Vulcan, програма тільки завантажує ці оцінки.Це можна змінити шляхом примусового розрахунку середньоЇ оцінки в налаштуваннях програми.\n\n<b>Середні оцінки тільки за обраний семестр</b>:\n1. Розрахунок середньозваженого числа для кожного предмета в даному семестрі\n2. Сумування розрахованих числ\n3. Розрахунок середнього арифметичного з сумованих чисел\n\n<b>Середнє значення з обох семестрів</b>:\n1. Обчислення середньозваженого числа для кожного предмета у 1 та 2 семестрі\n2. Обчислення середнього арифметичного з розрахованих середньозважених числ за 1 та 2 семестри для кожного предмета.\n3. Додавання розрахованих середніх\n4. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення оцінок за весь рік: </b>\n1. Розрахунок середньозваженого числа за рік для кожного предмета. Підсумковий середній показник у 1-му семестрі не має значення.\n2. Сумування розрахованих середніх\n3. Обчислення середнього арифметичного з суммованих середніх</string>
+    <string name="grade_summary_final_average_help_dialog_title">Як працює \"Підсумкова середня оцінка\"?</string>
+    <string name="grade_summary_final_average_help_dialog_message">Підсумкове середнє значення - це середнє арифметичне, обчислене з усіх наявних наразі підсумкових оцінок у даному семестрі. \n\nСхема обчислення складається з таких кроків:\n1. Сумування підсумкових оцінок, виставленних викладачами\n2. Ділення на кількість предметів, з яких виставлені ці оцінки</string>
     <string name="grade_summary_final_average">Підсумкова середня оцінка</string>
-    <string name="grade_summary_from_subjects">з %1$d із %2$d тем</string>
+    <string name="grade_summary_from_subjects">%1$d із %2$d предметів</string>
     <string name="grade_menu_summary">Підсумок</string>
     <string name="grade_menu_statistics">Клас</string>
     <string name="grade_menu_read">Позначити як прочитане</string>
-    <string name="grade_statistics_partial">Поточні</string>
+    <string name="grade_statistics_partial">Часткові</string>
     <string name="grade_statistics_semester">Семестрові</string>
     <string name="grade_statistics_points">Бали</string>
     <string name="grade_statistics_legend">Умовні позначення</string>
-    <string name="grade_statistics_class_average">Середня классу: %1$s</string>
+    <string name="grade_statistics_class_average">Середня класу: %1$s</string>
     <string name="grade_statistics_student_average">Ваша середня: %1$s</string>
     <string name="grade_statistics_student_grade">Ваша оцінка: %1$s</string>
     <string name="grade_statistics_average_class">Клас</string>
@@ -124,10 +124,10 @@
         <item quantity="other">Нові оцінки</item>
     </plurals>
     <plurals name="grade_new_items_predicted">
-        <item quantity="one">Нова прогнозована оцінка</item>
-        <item quantity="few">Нові прогнозовані оцінки</item>
-        <item quantity="many">Нові прогнозовані оцінки</item>
-        <item quantity="other">Нові прогнозовані оцінки</item>
+        <item quantity="one">Нова передбачувана оцінка</item>
+        <item quantity="few">Нові передбачувані оцінки</item>
+        <item quantity="many">Нові передбачувані оцінки</item>
+        <item quantity="other">Нові передбачувані оцінки</item>
     </plurals>
     <plurals name="grade_new_items_final">
         <item quantity="one">Нова підсумкова оцінка</item>
@@ -136,16 +136,16 @@
         <item quantity="other">Нові підсумкові оцінки</item>
     </plurals>
     <plurals name="grade_notify_new_items">
-        <item quantity="one">Ви отримали %1$d оцінку</item>
-        <item quantity="few">Ви отримали %1$d оцінки</item>
-        <item quantity="many">Ви отримали %1$d оцінок</item>
-        <item quantity="other">Ви отримали %1$d оцінок</item>
+        <item quantity="one">Ви отримали %1$d нову оцінку</item>
+        <item quantity="few">Ви отримали %1$d нові оцінки</item>
+        <item quantity="many">Ви отримали %1$d нових оцінок</item>
+        <item quantity="other">Ви отримали %1$d нових оцінок</item>
     </plurals>
     <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">Ви отримали %1$d нову прогнозовану оцінку</item>
-        <item quantity="few">Ви отримали %1$d нові прогнозовані оцінки</item>
-        <item quantity="many">Ви отримали %1$d нових прогнозованих оцінок</item>
-        <item quantity="other">Ви отримали %1$d нових прогнозованих оцінок</item>
+        <item quantity="one">Ви отримали %1$d нову передбачувану оцінку</item>
+        <item quantity="few">Ви отримали %1$d нові передбачувані оцінкі</item>
+        <item quantity="many">Ви отримали %1$d нових передбачуваних оцінок</item>
+        <item quantity="other">Ви отримали %1$d нових передбачуваних оцінок</item>
     </plurals>
     <plurals name="grade_notify_new_items_final">
         <item quantity="one">Ви отримали %1$d нову підсумкову оцінку</item>
@@ -159,62 +159,62 @@
     <string name="timetable_group">Група</string>
     <string name="timetable_time">Години</string>
     <string name="timetable_changes">Зміни</string>
-    <string name="timetable_no_items">Брак уроків у цей день</string>
+    <string name="timetable_no_items">Немає уроків у цей день</string>
     <string name="timetable_minutes">%s хвилин</string>
     <string name="timetable_seconds">%s сек</string>
-    <string name="timetable_time_left">%1$s лишилося</string>
+    <string name="timetable_time_left">%1$s залишилося</string>
     <string name="timetable_time_until">через %1$s</string>
-    <string name="timetable_finished">Завершено</string>
+    <string name="timetable_finished">Закінчено</string>
     <string name="timetable_now">Зараз: %s</string>
     <string name="timetable_next">Наступний: %s</string>
     <string name="timetable_later">Пізніше: %s</string>
     <string name="timetable_notify_lesson">%1$s урок %2$d - %3$s</string>
-    <string name="timetable_notify_change_room">Зміна місця з %1$s на %2$s</string>
-    <string name="timetable_notify_change_teacher">Змінити вчителя з %1$s на %2$s</string>
+    <string name="timetable_notify_change_room">Зміна аудіторії з %1$s на %2$s</string>
+    <string name="timetable_notify_change_teacher">Зміна вчителя з %1$s на %2$s</string>
     <string name="timetable_notify_change_subject">Зміна теми з %1$s на %2$s</string>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Зміна у розкладі</item>
-        <item quantity="few">Зміна у розкладі</item>
-        <item quantity="many">Зміна у розкладі</item>
-        <item quantity="other">Зміни у розкладі рейсу</item>
+        <item quantity="few">Зміни у розкладі</item>
+        <item quantity="many">Зміни у розкладі</item>
+        <item quantity="other">Зміни у розкладі</item>
     </plurals>
     <plurals name="timetable_notify_new_items">
         <item quantity="one">%1$s - %2$d зміна в розкладі</item>
-        <item quantity="few">%1$s - %2$d зміна в розкладі</item>
-        <item quantity="many">%1$s - %2$d зміна в розкладі</item>
-        <item quantity="other">%1$s - %2$d  змін у розкладі</item>
+        <item quantity="few">%1$s - %2$d зміни в розкладі</item>
+        <item quantity="many">%1$s - %2$d змін в розкладі</item>
+        <item quantity="other">%1$s - %2$d змін у розкладі</item>
     </plurals>
     <plurals name="timetable_notify_new_items_group">
         <item quantity="one">%1$d зміна в розкладі</item>
         <item quantity="few">%1$d зміна в розкладі</item>
         <item quantity="many">%1$d зміна в розкладі</item>
-        <item quantity="other">%1$d змін у розкладі</item>
+        <item quantity="other">%1$d змін в розкладі</item>
     </plurals>
     <plurals name="timetable_number_item">
         <item quantity="one">%d зміна</item>
-        <item quantity="few">%d зміна</item>
-        <item quantity="many">%d зміна</item>
+        <item quantity="few">%d зміни</item>
+        <item quantity="many">%d змін</item>
         <item quantity="other">%d змін</item>
     </plurals>
     <!--Completed lessons-->
     <string name="completed_lessons_title">Уроки, що відбулися</string>
-    <string name="completed_lessons_button">Показати уроки, що відбулися</string>
-    <string name="completed_lessons_no_items">Брак інформації о уроках, що відбулися</string>
+    <string name="completed_lessons_button">Показати завершені уроки</string>
+    <string name="completed_lessons_no_items">Немає інформації про завершенні уроки</string>
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Відсутність</string>
     <string name="completed_lessons_resources">Ресурси</string>
     <!--Additional lessons-->
     <string name="additional_lessons_title">Додаткові уроки</string>
     <string name="additional_lessons_button">Показати додаткові уроки</string>
-    <string name="additional_lessons_no_items">Немає інформації про додаткових уроків</string>
+    <string name="additional_lessons_no_items">Немає інформації про додаткові уроки</string>
     <string name="additional_lessons_add">Новий урок</string>
     <string name="additional_lessons_add_title">Новий додатковий урок</string>
     <string name="additional_lessons_add_success">Додатковий урок успішно додано</string>
-    <string name="additional_lessons_delete_success">Успішно видалено додаткове заняття</string>
+    <string name="additional_lessons_delete_success">Успішно видалено додатковий урок</string>
     <string name="additional_lessons_repeat">Повторювати щотижня</string>
     <string name="additional_lessons_delete_title">Видалити додатковий урок</string>
     <string name="additional_lessons_delete_one">Тільки цей урок</string>
-    <string name="additional_lessons_delete_series">Все в серії</string>
+    <string name="additional_lessons_delete_series">Всі в серії</string>
     <string name="additional_lessons_start">Час початку</string>
     <string name="additional_lessons_end">Час завершення</string>
     <string name="additional_lessons_end_time_error">Час завершення має бути більшим, ніж час початку</string>
@@ -222,10 +222,10 @@
     <string name="attendance_summary_button">Підсумок відвідуваності</string>
     <string name="attendance_absence_school">Відсутність зі шкільних причин</string>
     <string name="attendance_absence_excused">Відсутність з поважних причин</string>
-    <string name="attendance_absence_unexcused">Відсутність з не поважних причин</string>
+    <string name="attendance_absence_unexcused">Відсутність без поважних причин</string>
     <string name="attendance_exemption">Звільнення</string>
     <string name="attendance_excused_lateness">Спізнення з поважних причин</string>
-    <string name="attendance_unexcused_lateness">Спізнення з не поважних причин</string>
+    <string name="attendance_unexcused_lateness">Спізнення без поважних причин</string>
     <string name="attendance_present">Присутність</string>
     <string name="attendance_deleted">Вилучено</string>
     <string name="attendance_unknown">Невідомо</string>
@@ -237,22 +237,22 @@
     <string name="attendance_excuse_no_selection">Оберіть хоча б одну відсутність</string>
     <string name="attendance_excuse_title">Змінити статус</string>
     <plurals name="attendance_notify_new_items_title">
-        <item quantity="one">Нова відвідуваність</item>
-        <item quantity="few">Нова відвідуваність</item>
-        <item quantity="many">Нова відвідуваність</item>
-        <item quantity="other">Нова відвідуваність</item>
+        <item quantity="one">Новий запис відвідуваності</item>
+        <item quantity="few">Нові записи відвідуваності</item>
+        <item quantity="many">Нові записи відвідуваності</item>
+        <item quantity="other">Нові записи відвідуваності</item>
     </plurals>
     <plurals name="attendance_notify_new_items">
-        <item quantity="one">%1$d новий відвідувач</item>
-        <item quantity="few">%1$d новий відвідувач</item>
-        <item quantity="many">%1$d новий відвідувач</item>
-        <item quantity="other">%1$d відвідування</item>
+        <item quantity="one">%1$d новий запис відвідуваності</item>
+        <item quantity="few">%1$d нові записи відвідуваності</item>
+        <item quantity="many">%1$d нові записи відвідуваності</item>
+        <item quantity="other">%1$d нові записи відвідуваності</item>
     </plurals>
     <plurals name="attendance_number_item">
-        <item quantity="one">%d відвідування</item>
-        <item quantity="few">%d відвідування</item>
-        <item quantity="many">%d відвідування</item>
-        <item quantity="other">%d відвідування</item>
+        <item quantity="one">%d запис відвідуваності</item>
+        <item quantity="few">%d записи відвідуваності</item>
+        <item quantity="many">%d записів відвідуваності</item>
+        <item quantity="other">%d записів відвідуваності</item>
     </plurals>
     <!--Attendance summary-->
     <string name="attendance_summary_total">Загальна</string>
@@ -261,80 +261,80 @@
     <string name="exam_type">Тип</string>
     <string name="exam_entry_date">Дата запису</string>
     <plurals name="exam_notify_new_item_title">
-        <item quantity="one">Новий іспит</item>
-        <item quantity="few">Новий іспит</item>
-        <item quantity="many">Новий іспит</item>
-        <item quantity="other">Нові іспити</item>
+        <item quantity="one">Новий тест</item>
+        <item quantity="few">Нові тести</item>
+        <item quantity="many">Нові тести</item>
+        <item quantity="other">Нові тести</item>
     </plurals>
     <plurals name="exam_notify_new_item_content">
-        <item quantity="one">%d новий екзамен</item>
-        <item quantity="few">%d новий екзамен</item>
-        <item quantity="many">%d новий екзамен</item>
-        <item quantity="other">%d нових іспитів</item>
+        <item quantity="one">%d новий тест</item>
+        <item quantity="few">%d нових тести</item>
+        <item quantity="many">%d нових тестів</item>
+        <item quantity="other">%d нових тестів</item>
     </plurals>
     <plurals name="exam_number_item">
-        <item quantity="one">%d екзамен</item>
-        <item quantity="few">%d екзамен</item>
-        <item quantity="many">%d екзамен</item>
-        <item quantity="other">%d іспити</item>
+        <item quantity="one">%d тест</item>
+        <item quantity="few">%d тести</item>
+        <item quantity="many">%d тести</item>
+        <item quantity="other">%d тести</item>
     </plurals>
     <!--Message-->
     <string name="message_inbox">Отримані</string>
     <string name="message_sent">Відправлені</string>
     <string name="message_trash">Кошик</string>
     <string name="message_no_subject">(брак теми)</string>
-    <string name="message_no_items">Нема повідомлень</string>
+    <string name="message_no_items">Немає листів</string>
     <string name="message_from">Від:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %1$s</string>
     <string name="message_reply">Відповісти</string>
     <string name="message_forward">Переслати</string>
-    <string name="message_select_all">Вибрати все</string>
+    <string name="message_select_all">Вибрати всі</string>
     <string name="message_unselect_all">Відмінити вибір</string>
     <string name="message_move_to_trash">Перемістити до кошика</string>
     <string name="message_delete_forever">Видалити назавжди</string>
-    <string name="message_delete_success">Повідомлення було успішно видалено</string>
-    <string name="message_share">Поділіться</string>
+    <string name="message_delete_success">Лист було успішно видалено</string>
+    <string name="message_share">Поділитись</string>
     <string name="message_print">Друк</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Зміст</string>
-    <string name="message_send_successful">Повідомлення було успішно відправлено</string>
-    <string name="message_not_exists">Такого повідомлення не існує</string>
+    <string name="message_send_successful">Лист було успішно відправлено</string>
+    <string name="message_not_exists">Такого листа не існує</string>
     <string name="message_required_recipients">Необхідно обрати принаймні 1 адресата</string>
-    <string name="message_content_min_length">Зміст повідомлення мусить складатися принаймні з 3 знаків</string>
+    <string name="message_content_min_length">Зміст листа повинен складатися принаймні з 3 знаків</string>
     <string name="message_chip_only_unread">Лише непрочитані</string>
     <string name="message_chip_only_with_attachments">Тільки з вкладеннями</string>
-    <string name="message_read">Читання: %s</string>
-    <string name="message_read_by">Прочитанно:%1$d через %2$d людей</string>
+    <string name="message_read">Прочитаний: %s</string>
+    <string name="message_read_by">Прочитаний: %1$d з %2$d осіб</string>
     <plurals name="message_number_item">
-        <item quantity="one">%1$d повідомлення</item>
-        <item quantity="few">%1$d повідомлень</item>
-        <item quantity="many">%1$d повідомлень</item>
-        <item quantity="other">%1$d повідомлень</item>
+        <item quantity="one">%1$d лист</item>
+        <item quantity="few">%1$d листи</item>
+        <item quantity="many">%1$d листів</item>
+        <item quantity="other">%1$d листів</item>
     </plurals>
     <plurals name="message_new_items">
-        <item quantity="one">Нове повідомлення</item>
-        <item quantity="few">Нові повідомлення</item>
-        <item quantity="many">Нові повідомлення</item>
-        <item quantity="other">Нові повідомлення</item>
+        <item quantity="one">Новий лист</item>
+        <item quantity="few">Нові листи</item>
+        <item quantity="many">Нові листи</item>
+        <item quantity="other">Нові листи</item>
     </plurals>
-    <string name="message_restore_dialog">Ви хочете відновити повідомлення в чернетці?</string>
-    <string name="message_restore_dialog_with_recipients">Ви хочете відновити чернетку повідомлення з отримувачами: %s?</string>
+    <string name="message_restore_dialog">Ви хочете відновити чорновик листа?</string>
+    <string name="message_restore_dialog_with_recipients">Ви хочете відновити чорновик листа з отримувачами: %s?</string>
     <plurals name="message_notify_new_items">
-        <item quantity="one">Ви отримали %1$d нове повідомлення</item>
-        <item quantity="few">Ви отримали %1$d нових повідомлення</item>
-        <item quantity="many">Ви отримали %1$d нових повідомлень</item>
-        <item quantity="other">Ви отримали %1$d нових повідомлень</item>
+        <item quantity="one">Ви отримали %1$d новий лист</item>
+        <item quantity="few">Ви отримали %1$d нові листи</item>
+        <item quantity="many">Ви отримали %1$d нових листів</item>
+        <item quantity="other">Ви отримали %1$d нових листів</item>
     </plurals>
     <plurals name="message_selected_messages_count">
         <item quantity="one">%1$d вибрано</item>
-        <item quantity="few">вибрано %1$d</item>
-        <item quantity="many">вибрано %1$d</item>
+        <item quantity="few">%1$d вибрано</item>
+        <item quantity="many">%1$d вибрано</item>
         <item quantity="other">%1$d вибрано</item>
     </plurals>
-    <string name="message_messages_deleted">Повідомлення видалені</string>
+    <string name="message_messages_deleted">Листи видалені</string>
     <!--Note-->
-    <string name="note_no_items">Брак інформації о зауваженнях</string>
+    <string name="note_no_items">Немає інформації о зауваженнях</string>
     <string name="note_points">Бали</string>
     <plurals name="note_number_item">
         <item quantity="one">%d зауваження</item>
@@ -343,20 +343,20 @@
         <item quantity="other">%d зауважень</item>
     </plurals>
     <plurals name="note_new_items">
-        <item quantity="one">Нова нотатка</item>
-        <item quantity="few">Нові нотатки</item>
-        <item quantity="many">Нових нотаток</item>
-        <item quantity="other">Нових нотаток</item>
+        <item quantity="one">Нове зауваження</item>
+        <item quantity="few">Нові зауваження</item>
+        <item quantity="many">Нові зауваження</item>
+        <item quantity="other">Нові зауваження</item>
     </plurals>
     <plurals name="note_notify_new_items">
-        <item quantity="one">%1$d нове зауваження</item>
-        <item quantity="few">%1$d нових зауваження</item>
-        <item quantity="many">%1$d нових зауважень</item>
-        <item quantity="other">%1$d нових зауважень</item>
+        <item quantity="one">Ви отримали %1$d нове зауваження</item>
+        <item quantity="few">Ви отримали %1$d нові зауваження</item>
+        <item quantity="many">Ви отримали %1$d нових зауважень</item>
+        <item quantity="other">Ви отримали %1$d нових зауважень</item>
     </plurals>
     <!--Praise-->
     <plurals name="praise_number_item">
-        <item quantity="one">%d похвалили</item>
+        <item quantity="one">%d похвал</item>
         <item quantity="few">%d похвали</item>
         <item quantity="many">%d похвал</item>
         <item quantity="other">%d похвал</item>
@@ -375,62 +375,62 @@
     </plurals>
     <!--Neutral notes-->
     <plurals name="neutral_note_number_item">
-        <item quantity="one">%d нейтральна нота</item>
-        <item quantity="few">%d нейтральні ноти</item>
-        <item quantity="many">%d нейтральних нот</item>
-        <item quantity="other">%d нейтральних нот</item>
+        <item quantity="one">%d нейтральний запис</item>
+        <item quantity="few">%d нейтральні записи</item>
+        <item quantity="many">%d нейтральних записів</item>
+        <item quantity="other">%d нейтральних записів</item>
     </plurals>
     <plurals name="neutral_note_new_items">
-        <item quantity="one">Нова нейтральна нота</item>
-        <item quantity="few">Нова нейтральна нота</item>
-        <item quantity="many">Нова нейтральна нота</item>
-        <item quantity="other">Нові нейтральні ноти</item>
+        <item quantity="one">Новий нейтральний запис</item>
+        <item quantity="few">Нові нейтральні записи</item>
+        <item quantity="many">Нові нейтральні записи</item>
+        <item quantity="other">Нові нейтральні записи</item>
     </plurals>
     <plurals name="neutral_note_notify_new_items">
-        <item quantity="one">Ви отримали %1$d нову нейтральну ноту</item>
-        <item quantity="few">Ви отримали %1$d нові нейтральні ноти</item>
-        <item quantity="many">Ви отримали %1$d нових нейтральних нот</item>
-        <item quantity="other">Ви отримали %1$d нових нейтральних нот</item>
+        <item quantity="one">Ви отримали %1$d новий нейтральний запис</item>
+        <item quantity="few">Ви отримали %1$d нові нейтральні записи</item>
+        <item quantity="many">Ви отримали %1$d нових нейтральних записів</item>
+        <item quantity="other">Ви отримали %1$d нових нейтральних записів</item>
     </plurals>
     <!--Homework-->
-    <string name="homework_no_items">Брак домашніх завдань</string>
-    <string name="homework_mark_as_done">Позначити як зроблене</string>
-    <string name="homework_mark_as_undone">Позначити як не зроблене</string>
-    <string name="homework_add">Додати домашню роботу</string>
-    <string name="homework_add_success">Домашню роботу додано успішно</string>
-    <string name="homework_delete_success">Домашню роботу видалено успішно</string>
-    <string name="homework_attachments">Додатки</string>
+    <string name="homework_no_items">Немає домашніх завдань</string>
+    <string name="homework_mark_as_done">Зроблено</string>
+    <string name="homework_mark_as_undone">Не зроблено</string>
+    <string name="homework_add">Додати домашнє завдання</string>
+    <string name="homework_add_success">Домашнє завдання додано успішно</string>
+    <string name="homework_delete_success">Домашнє завдання видалено успішно</string>
+    <string name="homework_attachments">Вкладення</string>
     <plurals name="homework_notify_new_item_title">
-        <item quantity="one">Нова домашня робота</item>
-        <item quantity="few">Нова домашня робота</item>
-        <item quantity="many">Нова домашня робота</item>
-        <item quantity="other">Нова домашня робота</item>
+        <item quantity="one">Нове домашнє завдання</item>
+        <item quantity="few">Нові домашні завдання</item>
+        <item quantity="many">Нові домашні завдання</item>
+        <item quantity="other">Нові домашні завдання</item>
     </plurals>
     <plurals name="homework_notify_new_item_content">
-        <item quantity="one">Ви отримали %d нове домашнє завдання</item>
-        <item quantity="few">Ви отримали %d нове домашнє завдання</item>
-        <item quantity="many">Ви отримали %d нове домашнє завдання</item>
-        <item quantity="other">Ви отримали %d нове домашнє завдання</item>
+        <item quantity="one">Ви отримали %d домашнє завдання</item>
+        <item quantity="few">Ви отримали %d домашні завдання</item>
+        <item quantity="many">Ви отримали %d домашніх завдань</item>
+        <item quantity="other">Ви отримали %d домашніх завдань</item>
     </plurals>
     <plurals name="homework_number_item">
         <item quantity="one">%d домашнє завдання</item>
-        <item quantity="few">%d домашнє завдання</item>
-        <item quantity="many">%d домашнє завдання</item>
-        <item quantity="other">%d домашнє завдання</item>
+        <item quantity="few">%d домашні завдання</item>
+        <item quantity="many">%d домашні завдання</item>
+        <item quantity="other">%d домашні завдання</item>
     </plurals>
     <!--Lucky number-->
     <string name="lucky_number_title">Щасливий номер</string>
     <string name="lucky_number_header">Сьогоднішній щасливий номер</string>
-    <string name="lucky_number_empty">Брак інформації о щасливому номері</string>
+    <string name="lucky_number_empty">Немає інформації о щасливому номері</string>
     <string name="lucky_number_notify_new_item_title">Сьогоднішній щасливий номер</string>
     <string name="lucky_number_notify_new_item">Сьогоднішній щасливий номер: %s</string>
     <string name="lucky_number_history_button">Показати історію</string>
     <!--Lucky number history-->
-    <string name="lucky_number_history_title">Історія щасливих чисел</string>
+    <string name="lucky_number_history_title">Історія щасливих номерів</string>
     <string name="lucky_number_history_empty">Немає інформації про щасливі номери</string>
     <!--Mobile devices-->
     <string name="mobile_devices_title">Мобільні пристрої</string>
-    <string name="mobile_devices_no_items">Брак пристроїв</string>
+    <string name="mobile_devices_no_items">Немає пристроїв</string>
     <string name="mobile_devices_unregister">Видалити</string>
     <string name="mobile_device_removed">Пристрій видалено</string>
     <string name="mobile_device_qr">QR-код</string>
@@ -441,98 +441,98 @@
     <string name="schoolandteachers_title">Школа та вчителі</string>
     <!--School-->
     <string name="school_title">Школа</string>
-    <string name="school_no_info">Брак інформації про школу</string>
+    <string name="school_no_info">Немає інформації про школу</string>
     <string name="school_name">Назва школи</string>
     <string name="school_address">Адреса школи</string>
     <string name="school_telephone">Телефон</string>
     <string name="school_headmaster">Директор</string>
-    <string name="school_pedagogue">Викладач</string>
+    <string name="school_pedagogue">Педагог</string>
     <string name="school_address_button">Показати на мапі</string>
-    <string name="school_telephone_button">Зателефонувати</string>
+    <string name="school_telephone_button">Задзвонити</string>
     <!--Teacher-->
     <string name="teachers_title">Вчителі</string>
-    <string name="teacher_no_items">Брак інформації про вчителів</string>
-    <string name="teacher_no_subject">Брак предмету</string>
+    <string name="teacher_no_items">Немає інформацій про вчителів</string>
+    <string name="teacher_no_subject">Немає предмету</string>
     <!--Conference-->
     <string name="conferences_title">Зустрічі</string>
     <string name="conference_no_items">Немає інформації про зустрічі</string>
     <plurals name="conference_number_item">
-        <item quantity="one">%d конференція</item>
-        <item quantity="few">%d конференція</item>
-        <item quantity="many">%d конференція</item>
-        <item quantity="other">%d конференцій</item>
+        <item quantity="one">%d зустріч</item>
+        <item quantity="few">%d зустрічі</item>
+        <item quantity="many">%d зустрічей</item>
+        <item quantity="other">%d зустрічей</item>
     </plurals>
     <plurals name="conference_notify_new_item_title">
-        <item quantity="one">Нова конференція</item>
-        <item quantity="few">Нова конференція</item>
-        <item quantity="many">Нова конференція</item>
-        <item quantity="other">Нові конференції</item>
+        <item quantity="one">Нова зустріч</item>
+        <item quantity="few">Нові зустрічі</item>
+        <item quantity="many">Нові зустрічі</item>
+        <item quantity="other">Нові зустрічі</item>
     </plurals>
     <plurals name="conference_notify_new_items">
-        <item quantity="one">У вас є %1$d нова конференція</item>
-        <item quantity="few">У вас є %1$d нова конференція</item>
-        <item quantity="many">У вас є %1$d нова конференція</item>
-        <item quantity="other">У вас є %1$d нових конференцій</item>
+        <item quantity="one">У вас є %1$d нова зустріч</item>
+        <item quantity="few">У вас є %1$d нові зустрічі</item>
+        <item quantity="many">У вас є %1$d нових зустрічей</item>
+        <item quantity="other">У вас є %1$d нових зустрічей</item>
     </plurals>
-    <string name="conferences_present">Присутність на конференції</string>
+    <string name="conferences_present">Присутність на зустрічі</string>
     <string name="conference_agenda">Порядок денний</string>
     <!--Director information-->
     <string name="school_announcement_title">Оголошення школи</string>
-    <string name="school_announcement_no_items">Жодних навчальних оголошень</string>
+    <string name="school_announcement_no_items">Немає шкільних оголошень</string>
     <plurals name="school_announcement_number_item">
-        <item quantity="one">%d оголошення про школу</item>
-        <item quantity="few">%d оголошення про школу</item>
-        <item quantity="many">%d оголошення про школу</item>
-        <item quantity="other">Оголошення нової школи</item>
+        <item quantity="one">%d шкільне оголошення</item>
+        <item quantity="few">%d шкільних оголошення</item>
+        <item quantity="many">%d шкільних оголошень</item>
+        <item quantity="other">%d шкільних оголошень</item>
     </plurals>
     <plurals name="school_announcement_notify_new_item_title">
-        <item quantity="one">Оголошення нової школи</item>
-        <item quantity="few">Оголошення нової школи</item>
+        <item quantity="one">Нове шкільне оголошення</item>
+        <item quantity="few">Нові шкільні оголошення</item>
         <item quantity="many">Нові шкільні оголошення</item>
         <item quantity="other">Нові шкільні оголошення</item>
     </plurals>
     <plurals name="school_announcement_notify_new_items">
-        <item quantity="one">У вас є %1$d нове оголошення про школу</item>
-        <item quantity="few">У вас є %1$d нове оголошення про школу</item>
-        <item quantity="many">У вас є %1$d нове оголошення про школу</item>
-        <item quantity="other">У вас є %1$d нових оголошень про школи</item>
+        <item quantity="one">У вас є %1$d нове шкільне оголошення</item>
+        <item quantity="few">У вас є %1$d нові шкільні оголошення</item>
+        <item quantity="many">У вас є %1$d нових шкільних оголошень</item>
+        <item quantity="other">У вас є %1$d нових шкільних оголошень</item>
     </plurals>
     <!--Account-->
-    <string name="account_add_new">Додати аккаунт</string>
+    <string name="account_add_new">Додати обліковий запис</string>
     <string name="account_logout">Вийти</string>
-    <string name="account_confirm">Ви впевнені, що хочете вийти з цього аккаунту?</string>
-    <string name="account_logout_student">Вийти з аккаунту учня</string>
-    <string name="account_type_student">Студентський рахунок</string>
-    <string name="account_type_parent">Головний рахунок</string>
-    <string name="account_details_edit">Редагувати дані</string>
-    <string name="account_quick_manager">Менеджер аккаунтів</string>
-    <string name="account_select_student">Виберіть учня</string>
+    <string name="account_confirm">Ви впевнені, що хочете вийти з цього облікового запису?</string>
+    <string name="account_logout_student">Вийти з облікового запису учня</string>
+    <string name="account_type_student">Обліковий запис учня</string>
+    <string name="account_type_parent">Обліковий запис батька</string>
+    <string name="account_details_edit">Змінити дані</string>
+    <string name="account_quick_manager">Змінити облікові записи</string>
+    <string name="account_select_student">Вибрати учня</string>
     <string name="account_family">Сім\'я</string>
     <string name="account_contact">Контакт</string>
     <string name="account_address">Деталі проживання</string>
-    <string name="account_personal_data">Особиста інформація</string>
+    <string name="account_personal_data">Персональні дані</string>
     <!--About-->
     <string name="about_version">Версія додатка</string>
     <string name="about_contributor">Розробники</string>
-    <string name="about_contributor_summary">Список розробників \"Wulkanowy\"</string>
+    <string name="about_contributor_summary">Список розробників додатку</string>
     <string name="about_feedback">Виникла помилка?</string>
     <string name="about_feedback_summary">Повідомити о помилці за допомогою e-mail</string>
     <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Запитання, які часто задають</string>
+    <string name="about_faq_summary">Найбільш поширенні питання</string>
     <string name="about_discord">Сервер Discord</string>
-    <string name="about_discord_summary">Приєднатися до спільноти додатка</string>
-    <string name="about_facebook">Фен-сторінка Facebook</string>
-    <string name="about_twitter">Сторінка Twitter</string>
+    <string name="about_discord_summary">Приєднуйтеся до спільноти додатка</string>
+    <string name="about_facebook">Сторінка у Facebook</string>
+    <string name="about_twitter">Сторінка у Twitter</string>
     <string name="about_twitter_summary">Стежте за нами у Твіттері</string>
-    <string name="about_facebook_summary">Вподобати нашу фансторінку у Facebook</string>
+    <string name="about_facebook_summary">Вподобайте нас у Facebook</string>
     <string name="about_privacy">Політика конфіденційності</string>
     <string name="about_privacy_summary">Правила зберігання особистих даних</string>
     <string name="about_system">Налаштування системи</string>
     <string name="about_system_summary">Відкрити налаштування системи</string>
     <string name="about_homepage">Домашня сторінка</string>
-    <string name="about_homepage_summary">Допомогти розвитку додатка</string>
+    <string name="about_homepage_summary">Відвідайте наш сайт і допоможіть в розробці додатку</string>
     <string name="about_licenses">Ліцензії</string>
-    <string name="about_licenses_summary">Ліцензії вжитих бібліотек</string>
+    <string name="about_licenses_summary">Ліцензії використаних бібліотек</string>
     <!--Licenses-->
     <string name="license_dialog_title">Ліцензія</string>
     <!--Contributor-->
@@ -544,12 +544,12 @@
     <string name="student_info_second_name">Друге ім\'я</string>
     <string name="student_info_gender">Стать</string>
     <string name="student_info_polish_citizenship">Польське громадянство</string>
-    <string name="student_info_family_name">Прізвище</string>
+    <string name="student_info_family_name">Дошлюбне прізвище</string>
     <string name="student_info_parents_name">Імена батька і матері</string>
-    <string name="student_info_phone">Номер телефону</string>
+    <string name="student_info_phone">Стаціонарний телефон</string>
     <string name="student_info_cellphone">Мобільний телефон</string>
-    <string name="student_info_email">Електронна пошта</string>
-    <string name="student_info_address">Місця проживання</string>
+    <string name="student_info_email">E-mail</string>
+    <string name="student_info_address">Місце проживання</string>
     <string name="student_info_registered_address">Адреса реєстрації</string>
     <string name="student_info_correspondence_address">Адреса для кореспонденції</string>
     <string name="student_info_full_name">Прізвище та ім\'я</string>
@@ -557,9 +557,9 @@
     <string name="student_info_guardian_address">Адреса</string>
     <string name="student_info_phones">Телефони</string>
     <string name="student_info_male">Чоловіча</string>
-    <string name="student_info_female">Жінка</string>
+    <string name="student_info_female">Жіноча</string>
     <string name="student_info_last_name">Прізвище</string>
-    <string name="student_info_guardian">Охоронець</string>
+    <string name="student_info_guardian">Опікун</string>
     <!--Account edit-->
     <string name="account_edit_nick_hint">Псевдонім</string>
     <string name="account_edit_header">Додати псевдонім</string>
@@ -570,73 +570,73 @@
     <!--Dashboard-->
     <string name="dashboard_timetable_title">Уроки</string>
     <string name="dashboard_timetable_title_tomorrow">(Завтра)</string>
-    <string name="dashboard_timetable_title_today_and_tomorrow">(сьогодні та завтра)</string>
+    <string name="dashboard_timetable_title_today_and_tomorrow">(Сьогодні та завтра)</string>
     <string name="dashboard_timetable_first_lesson_title_moment">Через мить:</string>
     <string name="dashboard_timetable_first_lesson_title_soon">Незабаром:</string>
-    <string name="dashboard_timetable_first_lesson_title_first">Перше:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">Перший:</string>
     <string name="dashboard_timetable_first_lesson_title_now">Зараз:</string>
     <string name="dashboard_timetable_second_lesson_value_end">Кінець уроків</string>
     <string name="dashboard_timetable_second_lessons_title">Далі:</string>
-    <string name="dashboard_timetable_third_title">Пізніше :</string>
+    <string name="dashboard_timetable_third_title">Пізніше:</string>
     <plurals name="dashboard_timetable_third_value">
-        <item quantity="one">%1$d більше уроку</item>
-        <item quantity="few">%1$d більше уроку</item>
-        <item quantity="many">%1$d більше уроку</item>
-        <item quantity="other">%1$d більше уроків</item>
+        <item quantity="one">ще %1$d урок</item>
+        <item quantity="few">ще %1$d уроки</item>
+        <item quantity="many">ще %1$d уроків</item>
+        <item quantity="other">ще %1$d уроків</item>
     </plurals>
     <string name="dashboard_timetable_third_time">до %1$s</string>
     <string name="dashboard_timetable_no_lessons">Немає майбутніх уроків</string>
     <string name="dashboard_timetable_error">Сталася помилка під час завантаження уроків</string>
-    <string name="dashboard_homework_title">Домашня робота</string>
+    <string name="dashboard_homework_title">Домашнє завдання</string>
     <string name="dashboard_homework_no_homework">Немає домашнього завдання для виконання</string>
-    <string name="dashboard_homework_error">Помилка при завантаженні домашньої роботи</string>
+    <string name="dashboard_homework_error">Помилка при завантаженні домашніх завдань</string>
     <plurals name="dashboard_homework_more">
-        <item quantity="one">Ще %1$d домашнє завдання</item>
-        <item quantity="few">Ще %1$d домашнє завдання</item>
-        <item quantity="many">Ще %1$d домашнє завдання</item>
-        <item quantity="other">Ще %1$d домашнє завдання</item>
+        <item quantity="one">ще %1$d домашнє завдання</item>
+        <item quantity="few">ще %1$d домашніх завдання</item>
+        <item quantity="many">ще %1$d домашніх завдань</item>
+        <item quantity="other">ще %1$d домашніх завдань</item>
     </plurals>
     <string name="dashboard_homework_time">до %1$s</string>
-    <string name="dashboard_grade_title">Останні оцінки</string>
+    <string name="dashboard_grade_title">Остатні оцінки</string>
     <string name="dashboard_grade_no_grade">Немає нових оцінок</string>
-    <string name="dashboard_grade_error">Помилка при завантаженні класів</string>
-    <string name="dashboard_announcements_title">Оголошення школи</string>
+    <string name="dashboard_grade_error">Помилка при завантаженні оцінок</string>
+    <string name="dashboard_announcements_title">Шкільні оголошення</string>
     <string name="dashboard_announcements_no_announcements">Немає поточних оголошень</string>
     <string name="dashboard_announcements_error">Помилка при завантаженні анонсів</string>
     <plurals name="dashboard_announcements_more">
-        <item quantity="one">%1$d нових оголошень</item>
-        <item quantity="few">%1$d нових оголошень</item>
-        <item quantity="many">%1$d нових оголошень</item>
-        <item quantity="other">%1$d нових оголошень</item>
+        <item quantity="one">ще %1$d оголошення</item>
+        <item quantity="few">ще %1$d оголошення</item>
+        <item quantity="many">ще %1$d оголошень</item>
+        <item quantity="other">ще %1$d оголошень</item>
     </plurals>
-    <string name="dashboard_exams_title">Іспити</string>
-    <string name="dashboard_exams_no_exams">Немає майбутніх іспитів</string>
-    <string name="dashboard_exams_error">Помилка при завантаженні іспитів</string>
+    <string name="dashboard_exams_title">Тести</string>
+    <string name="dashboard_exams_no_exams">Немає майбутніх тестів</string>
+    <string name="dashboard_exams_error">Помилка при завантаженні тестів</string>
     <plurals name="dashboard_exams_more">
-        <item quantity="one">%1$d ще екзамен</item>
-        <item quantity="few">%1$d ще екзамен</item>
-        <item quantity="many">%1$d ще екзамен</item>
-        <item quantity="other">%1$d ще іспитів</item>
+        <item quantity="one">ще %1$d тест</item>
+        <item quantity="few">ще %1$d тести</item>
+        <item quantity="many">ще %1$d тестів</item>
+        <item quantity="other">ще %1$d тестів</item>
     </plurals>
-    <string name="dashboard_conferences_title">Конференції</string>
-    <string name="dashboard_conferences_no_conferences">Немає майбутніх конференцій</string>
-    <string name="dashboard_conferences_error">Помилка при завантаженні конференцій</string>
+    <string name="dashboard_conferences_title">Зустрічі</string>
+    <string name="dashboard_conferences_no_conferences">Немає майбутніх зустрічей</string>
+    <string name="dashboard_conferences_error">Помилка при завантаженні зустрічей</string>
     <plurals name="dashboard_conference_more">
-        <item quantity="one">Ще %1$d конференція</item>
-        <item quantity="few">Ще %1$d конференція</item>
-        <item quantity="many">Ще %1$d конференція</item>
-        <item quantity="other">%1$d більше конференцій</item>
+        <item quantity="one">ще %1$d зустріч</item>
+        <item quantity="few">ще %1$d зустрічі</item>
+        <item quantity="many">ще %1$d зустрічей</item>
+        <item quantity="other">ще %1$d зустрічей</item>
     </plurals>
-    <string name="dashboard_horizontal_group_error">Помилка при завантаженні даних</string>
+    <string name="dashboard_horizontal_group_error">Виникла помилка при завантаженні даних</string>
     <string name="dashboard_horizontal_group_no_data">Нічого</string>
     <!--Error dialog-->
-    <string name="dialog_error_check_update">Провірити наявність оновлень</string>
-    <string name="dialog_error_check_update_message">Перед тим, як повідомлювати о помілці, перевірте наявність оновлень</string>
+    <string name="dialog_error_check_update">Перевірити наявність оновлень</string>
+    <string name="dialog_error_check_update_message">Перед тим, як повідомлювати о помилці, перевірте наявність оновлень</string>
     <!--Generic-->
     <string name="all_content">Зміст</string>
     <string name="all_retry">Повторити</string>
     <string name="all_description">Опис</string>
-    <string name="all_no_description">Брак опису</string>
+    <string name="all_no_description">Немає опису</string>
     <string name="all_teacher">Вчитель</string>
     <string name="all_date">Дата</string>
     <string name="all_entry_date">Дата запису</string>
@@ -653,26 +653,26 @@
     <string name="all_yes">Так</string>
     <string name="all_no">Ні</string>
     <string name="all_save">Зберегти</string>
-    <string name="all_title">Титул</string>
+    <string name="all_title">Заголовок</string>
     <string name="all_add">Додати</string>
     <string name="all_copied">Скопійовано</string>
     <string name="all_undo">Відмінити</string>
     <string name="all_change">Змінити</string>
     <string name="all_add_to_calendar">Додати у календар</string>
     <!--Timetable Widget-->
-    <string name="widget_timetable_no_items">Брак уроків</string>
+    <string name="widget_timetable_no_items">Немаэ уроків</string>
     <string name="widget_timetable_theme_title">Увібрати тему</string>
     <string name="widget_timetable_theme_light">Яскрава</string>
     <string name="widget_timetable_theme_dark">Темна</string>
     <string name="widget_timetable_theme_system">Тема системи</string>
     <!--Preferences-->
-    <string name="pref_view_header">Додатки</string>
+    <string name="pref_view_header">Додаток</string>
     <string name="pref_view_list">Вікно за замовчуванням</string>
-    <string name="pref_view_grade_average_mode">Розрахункові середні параметри</string>
-    <string name="pref_view_grade_average_force_calc">Примусово розрахувати середню оцінку через додаток</string>
-    <string name="pref_view_present">Показати присутність</string>
+    <string name="pref_view_grade_average_mode">Параметри розраховування середніх оцінок</string>
+    <string name="pref_view_grade_average_force_calc">Примусово розраховувати середню оцінку через додаток</string>
+    <string name="pref_view_present">Показувати присутність</string>
     <string name="pref_view_app_theme">Тема</string>
-    <string name="pref_view_expand_grade">Розширення оцінок</string>
+    <string name="pref_view_expand_grade">Розгортання оцінок</string>
     <string name="pref_view_timetable_show_timers">Позначити поточний урок</string>
     <string name="pref_view_timetable_show_groups">Показувати групи поруч з темами</string>
     <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
@@ -685,102 +685,102 @@
     <string name="pref_notify_switch">Показувати повідомлення</string>
     <string name="pref_notify_upcoming_lessons_switch">Показувати повідомлення о наступних уроках</string>
     <string name="pref_notify_upcoming_lessons_persistent_switch">Зробити сповіщення майбутнього уроку нестійкими</string>
-    <string name="pref_notify_upcoming_lessons_persistent_summary">Вимкнути коли сповіщення не показуються у відстежувачі/темпі</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Вимкніть, якщо сповіщення не показуються на розумному годиннику</string>
     <string name="pref_notify_open_system_settings">Відкрити налаштування сповіщень системи</string>
     <string name="pref_notify_fix_sync_issues">Виправити помилки з синхронізацією і повідомленнями</string>
-    <string name="pref_notify_fix_sync_issues_message">На вашому пристрої можуть бути помилки з синхронізацією і повідомленнями\n\nЩоб виправити іх, вам необхідно додати Wulkanowy в авто-старт и вимкнути оптимізацію/экономію батареї в налаштуваннях пристрою.</string>
+    <string name="pref_notify_fix_sync_issues_message">На вашому пристрої можуть бути помилки з синхронізацією і повідомленнями\n\nЩоб виправити іх, вам необхідно додати Wulkanowy в авто-старт і вимкнути оптимізацію/экономію батареї в налаштуваннях пристрою.</string>
     <string name="pref_notify_debug_switch">Показувати дебаг-повідомлення</string>
     <string name="pref_notify_disabled_summary">Синхронізація вимкнена</string>
-    <string name="pref_notify_notifications_piggyback_header">Офіційні сповіщення додатків</string>
-    <string name="pref_notify_notifications_piggyback">Захоплювати офіційні сповіщення програм</string>
-    <string name="pref_notify_notifications_piggyback_cancel_original">Видалити офіційні сповіщення програм після захоплення</string>
-    <string name="pref_notification_piggyback_popup_title">Показувати push-повідомлення</string>
-    <string name="pref_notification_piggyback_popup_description">За допомогою цієї функції ви можете отримати заміну push -повідомлень, як у офіційному додатку. Все, що вам потрібно зробити, це дозволити Wulkanowy отримувати всі сповіщення у налаштуваннях вашої системи. \ N \ nЯк це працює? \ NКоли ви отримаєте сповіщення у Dziennik VULCAN, Wulkanowy отримає сповіщення (для цього призначені ці додаткові дозволи) і запустить синхронізація, яка може надсилати власне сповіщення. \ n \ n ТІЛЬКИ ДЛЯ РОЗШИРЕНИХ КОРИСТУВАЧІВ</string>
+    <string name="pref_notify_notifications_piggyback_header">Сповіщення офіційного додатку</string>
+    <string name="pref_notify_notifications_piggyback">Захоплювати сповіщення офіційного додатку</string>
+    <string name="pref_notify_notifications_piggyback_cancel_original">Видалити сповіщення офіційного додатку після захоплення</string>
+    <string name="pref_notification_piggyback_popup_title">Захоплювати сповіщення</string>
+    <string name="pref_notification_piggyback_popup_description">За допомогою цієї функції ви можете отримати аналог повідомлень з офіційного додатку. Все, що вам потрібно зробити, це дозволити Wulkanowy отримувати всі сповіщення у налаштуваннях вашої системи.\n\nЯк це працює?\nКоли ви отримаєте сповіщення у Dziennik VULCAN, Wulkanowy отримає сповіщення (для цього призначені ці додаткові дозволи) і запустить синхронізацію, щоб надіслати своє власне повідомлення.\n\nТІЛЬКИ ДЛЯ ПРОСУНУТИХ КОРИСТУВАЧІВ</string>
     <string name="pref_notification_exact_alarm_popup_title">Показувати повідомлення о наступних уроках</string>
-    <string name="pref_notification_exact_alarm_popup_descriptions">Ви повинні дозволити Wulkanowy встановити будильник та нагадування у налаштуваннях вашої системи для використання цієї функції.</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">Ви повинні дозволити Wulkanowy встановлювати будильник та нагадування у налаштуваннях вашої системи для використання цієї функції.</string>
     <string name="pref_notification_go_to_settings">Перейти до налаштувань</string>
     <string name="pref_services_header">Синхронізація</string>
-    <string name="pref_services_switch">Автоматична синхронізація</string>
+    <string name="pref_services_switch">Автоматичне оновлення</string>
     <string name="pref_services_suspended">Призупинено на час канікул</string>
     <string name="pref_services_interval">Інтервал оновлення</string>
     <string name="pref_services_wifi">Тільки через Wi-Fi</string>
     <string name="pref_services_force_sync">Синхронізувати</string>
     <string name="pref_services_message_sync_success">Синхронізовано!</string>
     <string name="pref_services_message_sync_failed">Синхронізація не вдалася</string>
-    <string name="pref_services_sync_in_progress">Триває синхронізація</string>
+    <string name="pref_services_sync_in_progress">Синхронізація...</string>
     <string name="pref_services_last_full_sync_date">Остання синхронізація: %s</string>
     <string name="pref_other_grade_modifier_plus">Вартість плюсу</string>
-    <string name="pref_other_grade_modifier_minus">Вага мінуса</string>
+    <string name="pref_other_grade_modifier_minus">Вартість мінуса</string>
     <string name="pref_other_fill_message_content">Відповісти з історією повідомлень</string>
-    <string name="pref_other_optional_arithmetic_average">Показувати в середньому арифметику, якщо немає ваги</string>
+    <string name="pref_other_optional_arithmetic_average">Вилічити середню аритметичну, якщо оцінка немає вартості</string>
     <string name="pref_ads_support_category_name">Підтримка</string>
-    <string name="pref_ads_support">Відстежуйте єдину рекламу для підтримки проекту</string>
+    <string name="pref_ads_support">Подивіться одну рекламу для підтримки проєкту</string>
     <string name="pref_ads_privacy_title">Згода в обробці даних</string>
     <string name="pref_ads_privacy_description">Щоб переглянути рекламу, ви повинні погодитися з умовами обробки даних нашої Політики конфіденційності</string>
     <string name="pref_ads_privacy_agree">Погоджуюсь</string>
     <string name="pref_ads_privacy_link">Політика конфіденційності</string>
     <string name="pref_ads_loading">Реклама завантажується</string>
-    <string name="pref_ads_once_per_visit">Дякуємо за вашу підтримку, повертайтеся пізніше для більшої кількості оголошень</string>
+    <string name="pref_ads_once_per_visit">Дякуємо за вашу підтримку, повертайтеся пізніше для більшої кількості реклам</string>
     <string name="pref_settings_advanced_title">Додатково</string>
-    <string name="pref_settings_appearance_title">Вигляд &amp; Поведінка</string>
-    <string name="pref_settings_notifications_title">Повідомлення</string>
+    <string name="pref_settings_appearance_title">Вигляд та поведінка</string>
+    <string name="pref_settings_notifications_title">Сповіщення</string>
     <string name="pref_settings_sync_title">Синхронізація</string>
     <string name="pref_settings_ads_title">Реклама</string>
     <string name="pref_grades_appearance_header">Оцінки</string>
-    <string name="pref_dashboard_appearance_header">Дошка</string>
+    <string name="pref_dashboard_appearance_header">Головна</string>
     <string name="pref_dashboard_appearance_tiles_title">Видимість плиток</string>
     <string name="pref_attendance_appearance_view">Відвідуваність</string>
     <string name="pref_timetable_appearance_view">Розклад</string>
-    <string name="pref_grades_advanced_header">Класи</string>
-    <string name="pref_counted_average_advanced_header">Обчислена середня</string>
+    <string name="pref_grades_advanced_header">Оцінки</string>
+    <string name="pref_counted_average_advanced_header">Розрахована середня оцінка</string>
     <string name="pref_messages_advanced_header">Повідомлення</string>
-    <string name="pref_appearance_category">Вигляд &amp; Поведінка</string>
-    <string name="pref_appearance_category_summary">Мови, теми, тема сортування</string>
-    <string name="pref_notifications_category_summary">Сповіщення додатку, виправляти проблеми</string>
-    <string name="pref_notifications_category">Повідомлення</string>
+    <string name="pref_appearance_category">Вигляд та поведінка</string>
+    <string name="pref_appearance_category_summary">Мова, тема, сортування предметів</string>
+    <string name="pref_notifications_category_summary">Налаштуванная сповіщень додатку</string>
+    <string name="pref_notifications_category">Сповіщення</string>
     <string name="pref_sync_category">Синхронізація</string>
-    <string name="pref_sync_category_summary">Автоматичне оновлення, інтервал синхронізації</string>
-    <string name="pref_advanced_category_summary">Плюс і мінус значення, середні обчислення</string>
+    <string name="pref_sync_category_summary">Автоматичне оновлення та його інтервал</string>
+    <string name="pref_advanced_category_summary">Вартість плюса та мінуса, розраховування середньої</string>
     <string name="pref_advanced_category">Додатково</string>
-    <string name="pref_about_category_summary">Версія програми, учасники, соціальні портали</string>
-    <string name="pref_ads_category_summary">Відображається реклама, підтримка проектів</string>
+    <string name="pref_about_category_summary">Версія додатку, учасники, соціальні портали</string>
+    <string name="pref_ads_category_summary">Показування реклами, підтримка проєкту</string>
     <!--Notification Channels-->
     <string name="channel_new_grades">Нові оцінки</string>
-    <string name="channel_new_homework">Нова домашня робота</string>
-    <string name="channel_new_conference">Нові конференції</string>
-    <string name="channel_new_exam">Нові іспити</string>
+    <string name="channel_new_homework">Нові домашні завдання</string>
+    <string name="channel_new_conference">Нові зустрічі</string>
+    <string name="channel_new_exam">Нові тести</string>
     <string name="channel_lucky_number">Щасливий номер</string>
     <string name="channel_new_message">Нові повідомлення</string>
-    <string name="channel_new_notes">Нові нотатки</string>
-    <string name="channel_new_school_announcement">Оголошення нової школи</string>
-    <string name="channel_push">Показувати push-повідомлення</string>
+    <string name="channel_new_notes">Нові зауваження</string>
+    <string name="channel_new_school_announcement">Нові шкільні оголошення</string>
+    <string name="channel_push">Показувати сповіщення від розробників</string>
     <string name="channel_upcoming_lessons">Наступні уроки</string>
-    <string name="channel_debug">Дебаг</string>
-    <string name="channel_change_timetable">Зміна у розкладі</string>
-    <string name="channel_new_attendance">Нова відвідуваність</string>
+    <string name="channel_debug">Відладка</string>
+    <string name="channel_change_timetable">Зміни у розкладі</string>
+    <string name="channel_new_attendance">Нові записи відвідуваності</string>
     <!--Colors-->
     <string name="all_black">Чорний</string>
     <string name="all_red">Червоний</string>
     <string name="all_blue">Голубий</string>
     <string name="all_green">Зелений</string>
     <string name="all_purple">Фіолетовий</string>
-    <string name="all_empty_color">Брак кольору</string>
+    <string name="all_empty_color">Без кольору</string>
     <!--Update helper-->
     <string name="update_download_started">Завантаження оновлень розпочато…</string>
     <string name="update_download_success">Щойно завантажено оновлення.</string>
-    <string name="update_download_success_button">Перезапустити</string>
+    <string name="update_download_success_button">Перезавантажити</string>
     <string name="update_failed">Помилка оновлення! Wulkanowy може не працювати належним чином. Подумайте про оновлення</string>
     <!--Errors-->
-    <string name="error_no_internet">Брак з\'єднання з інтернетом</string>
+    <string name="error_no_internet">Немає з\'єднання з інтернетом</string>
     <string name="error_invalid_device_datetime">Сталася помилка. Перевірте годинник пристрою</string>
-    <string name="error_timeout">Помилка підключення до реєстрації. Сервери можуть бути перевантажені. Будь-ласка спробуйте пізніше</string>
-    <string name="error_login_failed">Помилка завантаження даних. Будь-ласка спробуйте пізніше</string>
-    <string name="error_password_change_required">Потрібна реєстрація зміни пароля</string>
-    <string name="error_service_unavailable">Технічна перерва в журналі UONET + продовжується. Спробуйте пізніше</string>
-    <string name="error_unknown_uonet">Невідома помилка реєстру UONET+. Спробуйте ще раз пізніше</string>
-    <string name="error_unknown_app">Невідома помилка програми. Будь-ласка спробуйте пізніше</string>
+    <string name="error_timeout">Помилка підключення до щоденнику. Сервери можуть бути перевантажені, спробуйте пізніше</string>
+    <string name="error_login_failed">Помилка завантаження даних, спробуйте пізніше</string>
+    <string name="error_password_change_required">Необхідна зміна пароля щоденника</string>
+    <string name="error_service_unavailable">UONET+ проводить технічне осблуговування, спробуйте пізніше</string>
+    <string name="error_unknown_uonet">Невідома помилка щоденника UONET+, спробуйте пізніше</string>
+    <string name="error_unknown_app">Невідома помилка програми, спробуйте пізніше</string>
     <string name="error_unknown">Відбулася несподівана помилка</string>
-    <string name="error_feature_disabled">Функція вимкнена школою</string>
-    <string name="error_feature_not_available">Функція не доступна в цьому режимі</string>
-    <string name="error_field_required">Це поле обов\'язкове для заповнення</string>
+    <string name="error_feature_disabled">Функція вимкнена вашою школою</string>
+    <string name="error_feature_not_available">Функція недоступна в режимі Mobile API. Увійдіть в інший режим</string>
+    <string name="error_field_required">Це поле обовʼязкове</string>
 </resources>

From 637125e1fc432bca4875175fd1ed41877f966d44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 13:51:39 +0000
Subject: [PATCH 017/429] Bump hilt_version from 2.41 to 2.42 (#1856)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 862a45cc..1d9b797b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.6.21'
         about_libraries = '8.9.4'
-        hilt_version = "2.41"
+        hilt_version = "2.42"
     }
     repositories {
         mavenCentral()

From c296e72c3042395e2149d54e00b95c4980869ba6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 13:52:16 +0000
Subject: [PATCH 018/429] Bump mockk from 1.12.2 to 1.12.4 (#1854)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2910c84b..142c7cbd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -173,7 +173,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.4.2"
     chucker = "3.5.2"
-    mockk = "1.12.2"
+    mockk = "1.12.4"
     coroutines = "1.6.1"
 }
 

From b17e9deca01ceb297c07ed90da36012d51c06e00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 13:52:41 +0000
Subject: [PATCH 019/429] Bump kotlinx-serialization-json from 1.3.2 to 1.3.3
 (#1853)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 142c7cbd..7e9bdedf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -182,7 +182,7 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.7.0"

From 0c8e2632a28dbca59a44bcc8b3f80bc704a16ec6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 13:52:58 +0000
Subject: [PATCH 020/429] Bump firebase-bom from 30.0.0 to 30.0.1 (#1851)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7e9bdedf..3cffcce8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -233,7 +233,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.6.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:30.0.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 459c8330f905b3718f4a8ea624be9868d042f084 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 13:53:13 +0000
Subject: [PATCH 021/429] Bump hianalytics from 6.4.1.302 to 6.5.0.300 (#1852)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3cffcce8..dc289442 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:20.6.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.4.1.302'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.5.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.6.200'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From facf84d9a811f614dc454bffba5e51a8540a1409 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 14:35:58 +0000
Subject: [PATCH 022/429] Bump about_libraries from 8.9.4 to 10.2.0 (#1858)

---
 app/build.gradle                                             | 2 +-
 .../hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt  | 3 ++-
 .../wulkanowy/ui/modules/about/license/LicenseAdapter.kt     | 5 +++--
 .../wulkanowy/ui/modules/about/license/LicenseFragment.kt    | 5 ++++-
 .../wulkanowy/ui/modules/about/license/LicensePresenter.kt   | 2 +-
 build.gradle                                                 | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dc289442..c033c7d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,7 +132,7 @@ android {
 
     kotlinOptions {
         jvmTarget = "11"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
+        freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
index fb9bcae6..adb162fd 100644
--- a/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
@@ -7,6 +7,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@Suppress("UNUSED_PARAMETER", "unused")
 class InAppReviewHelper @Inject constructor(
     @ApplicationContext private val context: Context
 )  {
@@ -14,4 +15,4 @@ class InAppReviewHelper @Inject constructor(
     fun showInAppReview(activity: MainActivity) {
         // do nothing
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
index 6ae06bbe..adf4ca74 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
@@ -23,8 +23,9 @@ class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter
         val item = items[position]
 
         with(holder.binding) {
-            licenseItemName.text = item.libraryName
-            licenseItemSummary.text = item.licenses?.firstOrNull()?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
+            licenseItemName.text = item.name
+            licenseItemSummary.text = item.licenses.firstOrNull()?.name?.takeIf { it.isNotBlank() }
+                ?: item.artifactVersion
 
             root.setOnClickListener { onClickListener(item) }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
index 4c3b608a..80e21c91 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
+import com.mikepenz.aboutlibraries.util.withContext
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentLicenseBinding
@@ -28,7 +29,9 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
 
     override val titleStringId get() = R.string.license_title
 
-    override val appLibraries by lazy { Libs(requireContext()).libraries }
+    override val appLibraries by lazy {
+        Libs.Builder().withContext(requireContext()).build().libraries
+    }
 
     companion object {
         fun newInstance() = LicenseFragment()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
index 5aa12a57..ddcd5918 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -22,7 +22,7 @@ class LicensePresenter @Inject constructor(
     }
 
     fun onItemSelected(library: Library) {
-        view?.run { library.licenses?.firstOrNull()?.licenseDescription?.let { openLicense(it) } }
+        view?.run { library.licenses.firstOrNull()?.licenseContent?.let { openLicense(it) } }
     }
 
     private fun loadData() {
diff --git a/build.gradle b/build.gradle
index 1d9b797b..c87ec150 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.6.21'
-        about_libraries = '8.9.4'
+        about_libraries = '10.2.0'
         hilt_version = "2.42"
     }
     repositories {

From c2496a15b8864bdf3b8e5f88c1c79973bdd13d4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 14:36:09 +0000
Subject: [PATCH 023/429] Bump flow-preferences from 1.6.0 to 1.7.0 (#1859)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c033c7d5..0210e5a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -231,7 +231,7 @@ dependencies {
     implementation "io.coil-kt:coil:1.4.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-    implementation 'com.fredporciuncula:flow-preferences:1.6.0'
+    implementation 'com.fredporciuncula:flow-preferences:1.7.0'
 
     playImplementation platform('com.google.firebase:firebase-bom:30.0.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'

From dbba61a99f57522d56ba917c1bd956efec1a03eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 May 2022 14:48:58 +0000
Subject: [PATCH 024/429] Bump coil from 1.4.0 to 2.0.0 (#1855)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0210e5a7..ac03aca5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -228,7 +228,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:1.4.0"
+    implementation "io.coil-kt:coil:2.0.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.7.0'

From 9542b9f231a7b855b86ae8d1f9199f9ee24a90ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 16 May 2022 23:23:49 +0200
Subject: [PATCH 025/429] Set "no data" string if attendance subject is blank
 (#1864)

---
 app/build.gradle                                          | 2 +-
 .../wulkanowy/ui/modules/attendance/AttendanceAdapter.kt  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac03aca5..be2499e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -178,7 +178,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.6.0"
+    implementation "io.github.wulkanowy:sdk:189f5ecee0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
index 5d5ed504..39f376f6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -35,9 +35,11 @@ class AttendanceAdapter @Inject constructor() :
 
         with(holder.binding) {
             attendanceItemNumber.text = item.number.toString()
-            attendanceItemSubject.text = item.subject
+            attendanceItemSubject.text = item.subject.ifBlank {
+                root.context.getString(R.string.all_no_data)
+            }
             attendanceItemDescription.setText(item.descriptionRes)
-            attendanceItemAlert.visibility = item.run { if (absence && !excused) View.VISIBLE else View.INVISIBLE }
+            attendanceItemAlert.isVisible = item.let { it.absence && !it.excused }
             attendanceItemNumber.visibility = View.GONE
             attendanceItemExcuseInfo.visibility = View.GONE
             attendanceItemExcuseCheckbox.visibility = View.GONE
@@ -46,7 +48,7 @@ class AttendanceAdapter @Inject constructor() :
                 onExcuseCheckboxSelect(item, checked)
             }
 
-            when (item.excuseStatus?.let { SentExcuseStatus.valueOf(it)}) {
+            when (item.excuseStatus?.let { SentExcuseStatus.valueOf(it) }) {
                 SentExcuseStatus.WAITING -> {
                     attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
                     attendanceItemExcuseInfo.visibility = View.VISIBLE

From 653417668558ff3221e26a40e51dc8320f58db0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 16 May 2022 23:42:40 +0200
Subject: [PATCH 026/429] Version 1.6.4

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index be2499e4..7db0aceb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 107
-        versionName "1.6.3"
+        versionCode 108
+        versionName "1.6.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -154,7 +154,7 @@ play {
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
     userFraction = 0.50d
-    updatePriority = 1
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -178,7 +178,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:189f5ecee0"
+    implementation "io.github.wulkanowy:sdk:1.6.4"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 2dba56dd..b6340bb9 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,9 +1,5 @@
-Wersja 1.6.3
+Wersja 1.6.4
 
-- dodaliśmy możliwość usuwania wielu wiadomości jednocześnie
-- dodaliśmy opcję szybkiego dodawania sprawdzianów do kalendarza
-- dodaliśmy średnią ucznia w wykresach ocen klasy
-- naprawiliśmy rzadki błąd dotyczący problemów z automatycznym odświeżaniem ekranu startowego
-- naprawiliśmy błąd z liczeniem średniej w drugim semestrze
+- naprawiliśmy błąd ładowania frekwencji na GPE i Lubelskim Portalu Oświatowym
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From a2804d813a73014e8b8d27bdc381b7124f1322d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 08:41:23 +0000
Subject: [PATCH 027/429] Bump firebase-bom from 30.0.1 to 30.0.2 (#1872)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7db0aceb..57ad5c90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -233,7 +233,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.7.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.0.1')
+    playImplementation platform('com.google.firebase:firebase-bom:30.0.2')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From dc717c9fb55a8c7d7305be76e19f68e2553ac31f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 08:43:32 +0000
Subject: [PATCH 028/429] Bump core-splashscreen from 1.0.0-beta02 to
 1.0.0-rc01 (#1871)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 57ad5c90..2cfb7bc6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.7.0"
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
+    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
     implementation "androidx.activity:activity-ktx:1.4.0"
     implementation "androidx.appcompat:appcompat:1.4.1"
     implementation "androidx.fragment:fragment-ktx:1.4.1"

From 808927a58a2e90ee7ddea790d645e407c26d71dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 08:43:52 +0000
Subject: [PATCH 029/429] Bump coil from 2.0.0 to 2.1.0 (#1870)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2cfb7bc6..b05e0501 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -228,7 +228,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.0.0"
+    implementation "io.coil-kt:coil:2.1.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.7.0'

From fa48b033af2fa28f53acdea7d6c35eda4615fb35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 08:44:17 +0000
Subject: [PATCH 030/429] Bump constraintlayout from 2.1.3 to 2.1.4 (#1869)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b05e0501..ab1593f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,7 +196,7 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
     implementation "com.google.android.material:material:1.5.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"

From c42a47ac48007e2db05f8f7a1c563414fcad0e7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 May 2022 04:18:37 +0000
Subject: [PATCH 031/429] Bump material from 1.5.0 to 1.6.0 (#1846)

---
 app/build.gradle                                                | 2 +-
 .../ui/modules/timetablewidget/TimetableWidgetProvider.kt       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab1593f8..57ba0f59 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -198,7 +198,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.5.0"
+    implementation "com.google.android.material:material:1.6.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.2.0'
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 07e717ea..74576986 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetManager.*
@@ -132,7 +131,6 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         }
     }
 
-    @SuppressLint("DefaultLocale")
     private fun updateWidget(
         context: Context,
         appWidgetId: Int,

From fcf0adfd807015178cdd9bb631c4784cf8f0380f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 May 2022 05:26:52 +0000
Subject: [PATCH 032/429] Bump gradle from 7.1.3 to 7.2.0 (#1857)

---
 app/build.gradle                 | 7 +++++--
 app/src/main/AndroidManifest.xml | 1 -
 build.gradle                     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 57ba0f59..2a36b19a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,7 @@ apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
+    namespace 'io.github.wulkanowy'
     compileSdkVersion 31
 
     defaultConfig {
@@ -136,8 +137,10 @@ android {
     }
 
     packagingOptions {
-        exclude 'META-INF/library_release.kotlin_module'
-        exclude 'META-INF/library-core_release.kotlin_module'
+        resources {
+            excludes += ['META-INF/library_release.kotlin_module',
+                         'META-INF/library-core_release.kotlin_module']
+        }
     }
 
     aboutLibraries {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 72fee08a..7835db90 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/build.gradle b/build.gradle
index c87ec150..d778e9a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.huawei.agconnect:agcp:1.6.6.200'

From 5c4a3d578bad1b5ace29a395b94a150529ca9c8b Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Fri, 27 May 2022 22:19:22 +0200
Subject: [PATCH 033/429] Add grade sorting by average (#1863)

---
 .../wulkanowy/data/enums/GradeSortingMode.kt     |  5 +++--
 .../grade/details/GradeDetailsPresenter.kt       |  5 +++--
 .../grade/summary/GradeSummaryPresenter.kt       | 16 +++++++++++++++-
 app/src/main/res/values/preferences_values.xml   |  2 ++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
index c5c0196c..a7aa4cc2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
@@ -2,9 +2,10 @@ package io.github.wulkanowy.data.enums
 
 enum class GradeSortingMode(val value: String) {
     ALPHABETIC("alphabetic"),
-    DATE("date");
+    DATE("date"),
+    AVERAGE("average");
 
     companion object {
         fun getByValue(value: String) = values().find { it.value == value } ?: ALPHABETIC
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 746601a6..8cde5d6b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.ui.modules.grade.details
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.enums.GradeExpandMode
-import io.github.wulkanowy.data.enums.GradeSortingMode.ALPHABETIC
-import io.github.wulkanowy.data.enums.GradeSortingMode.DATE
+import io.github.wulkanowy.data.enums.GradeSortingMode
+import io.github.wulkanowy.data.enums.GradeSortingMode.*
 import io.github.wulkanowy.data.repositories.GradeRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
@@ -204,6 +204,7 @@ class GradeDetailsPresenter @Inject constructor(
                     ALPHABETIC -> gradeSubjects.sortedBy { gradeDetailsWithAverage ->
                         gradeDetailsWithAverage.subject.lowercase()
                     }
+                    AVERAGE -> gradeSubjects.sortedByDescending { it.average }
                 }
             }
             .map { (subject, average, points, _, grades) ->
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index b07570cb..4d5a43d8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -2,6 +2,9 @@ package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.enums.GradeSortingMode
+import io.github.wulkanowy.data.enums.GradeSortingMode.*
+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
@@ -14,6 +17,7 @@ import javax.inject.Inject
 class GradeSummaryPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
+    private val preferencesRepository: PreferencesRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository) {
@@ -127,7 +131,17 @@ class GradeSummaryPresenter @Inject constructor(
     private fun createGradeSummaryItems(items: List<GradeSubject>): List<GradeSummary> {
         return items
             .filter { !checkEmpty(it) }
-            .sortedBy { it.subject }
+            .let { gradeSubjects ->
+                when (preferencesRepository.gradeSortingMode) {
+                    DATE -> gradeSubjects.sortedByDescending { gradeDetailsWithAverage ->
+                        gradeDetailsWithAverage.grades.maxByOrNull { it.date }?.date
+                    }
+                    ALPHABETIC -> gradeSubjects.sortedBy { gradeDetailsWithAverage ->
+                        gradeDetailsWithAverage.subject.lowercase()
+                    }
+                    AVERAGE -> gradeSubjects.sortedByDescending { it.average }
+                }
+            }
             .map { it.summary.copy(average = it.average) }
     }
 
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 1d777bdb..312f0b87 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -82,10 +82,12 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Alphabetically</item>
         <item>By date</item>
+        <item>By average</item>
     </string-array>
     <string-array name="grade_sorting_mode_values" translatable="false">
         <item>alphabetic</item>
         <item>date</item>
+        <item>average</item>
     </string-array>
 
     <string-array name="grade_color_scheme_entries">

From 891e241d1a7cb516a9233d0e5c270d0593e35600 Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Sat, 28 May 2022 02:03:42 +0200
Subject: [PATCH 034/429] Hide account selector in MessagePreviewView and
 SendMessageView (#1866)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Rafał Borcz <RafalBO99@outlook.com>
---
 .../message/preview/MessagePreviewFragment.kt       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 860ecc57..4b2685c6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -57,7 +57,8 @@ class MessagePreviewFragment :
         get() = getString(R.string.message_no_subject)
 
     override val printHTML: String
-        get() = requireContext().assets.open("message-print-page.html").bufferedReader().use { it.readText() }
+        get() = requireContext().assets.open("message-print-page.html").bufferedReader()
+            .use { it.readText() }
 
     override val messageNotExists: String
         get() = getString(R.string.message_not_exists)
@@ -81,7 +82,10 @@ class MessagePreviewFragment :
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMessagePreviewBinding.bind(view)
         messageContainer = binding.messagePreviewContainer
-        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getSerializable(MESSAGE_ID_KEY) as? Message)
+        presenter.onAttachView(
+            this,
+            (savedInstanceState ?: arguments)?.getSerializable(MESSAGE_ID_KEY) as? Message
+        )
     }
 
     override fun initView() {
@@ -101,6 +105,8 @@ class MessagePreviewFragment :
         menuShareButton = menu.findItem(R.id.messagePreviewMenuShare)
         menuPrintButton = menu.findItem(R.id.messagePreviewMenuPrint)
         presenter.onCreateOptionsMenu()
+
+        menu.findItem(R.id.mainMenuAccount).isVisible = false
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -173,7 +179,8 @@ class MessagePreviewFragment :
         val webView = WebView(requireContext())
         webView.webViewClient = object : WebViewClient() {
 
-            override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest) = false
+            override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest) =
+                false
 
             override fun onPageFinished(view: WebView, url: String) {
                 createWebPrintJob(view, jobName)

From d2d1d1dba71a7e6b03a78fe921fc15534cffd080 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 13:50:03 +0000
Subject: [PATCH 035/429] Bump firebase-bom from 30.0.2 to 30.1.0 (#1878)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2a36b19a..691d00f6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -236,7 +236,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.7.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.0.2')
+    playImplementation platform('com.google.firebase:firebase-bom:30.1.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From d074e5c9b322e317e010ffb0744b643f2df2541a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 13:50:22 +0000
Subject: [PATCH 036/429] Bump play-services-ads from 20.6.0 to 21.0.0 (#1877)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 691d00f6..c9c7a9ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:20.6.0'
+    playImplementation 'com.google.android.gms:play-services-ads:21.0.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.5.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.6.200'

From 4f3f24ac104a986a8dd42425668ed9ee576b825e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 13:50:52 +0000
Subject: [PATCH 037/429] Bump about_libraries from 10.2.0 to 10.3.0 (#1876)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d778e9a6..5a498be9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.6.21'
-        about_libraries = '10.2.0'
+        about_libraries = '10.3.0'
         hilt_version = "2.42"
     }
     repositories {

From 8dcb3ed45d2625b4208df856099ad58c29a29d3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 13:51:12 +0000
Subject: [PATCH 038/429] Bump firebase-crashlytics-gradle from 2.8.1 to 2.9.0
 (#1874)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5a498be9..7640fbc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.huawei.agconnect:agcp:1.6.6.200'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.3"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3"

From 8c515bd03f73f41d82f69c29a2d52f5537ae53c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 13:52:09 +0000
Subject: [PATCH 039/429] Bump coroutines from 1.6.1 to 1.6.2 (#1875)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c9c7a9ef..612cb953 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,7 +177,7 @@ ext {
     room = "2.4.2"
     chucker = "3.5.2"
     mockk = "1.12.4"
-    coroutines = "1.6.1"
+    coroutines = "1.6.2"
 }
 
 dependencies {

From cce736410bd54e0f186191623be47c09582b89b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 04:59:31 +0000
Subject: [PATCH 040/429] Bump material from 1.6.0 to 1.6.1 (#1884)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 612cb953..1038184f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -201,7 +201,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.6.0"
+    implementation "com.google.android.material:material:1.6.1"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.2.0'

From 03ad5527f8d83526d751042a5ef32d77a6056392 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 04:59:50 +0000
Subject: [PATCH 041/429] Bump appcompat from 1.4.1 to 1.4.2 (#1883)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1038184f..1f680e26 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -191,7 +191,7 @@ dependencies {
     implementation "androidx.core:core-ktx:1.7.0"
     implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
     implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "androidx.appcompat:appcompat:1.4.2"
     implementation "androidx.fragment:fragment-ktx:1.4.1"
     implementation "androidx.annotation:annotation:1.3.0"
 

From f61d820d6fd33babb7d85cee7dff22ba80eb5d42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jun 2022 05:07:54 +0000
Subject: [PATCH 042/429] Bump core-ktx from 1.7.0 to 1.8.0 (#1882)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1f680e26..aa7f6b37 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.7.0"
+    implementation "androidx.core:core-ktx:1.8.0"
     implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
     implementation "androidx.activity:activity-ktx:1.4.0"
     implementation "androidx.appcompat:appcompat:1.4.2"

From c3cbaa6ac2f4a58b36572ed64e0d2b68049c795f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 13 Jun 2022 07:43:12 +0200
Subject: [PATCH 043/429] Update dependencies (#1887)

---
 app/build.gradle                                      |  4 ++--
 .../wulkanowy/ui/modules/login/LoginActivity.kt       |  1 +
 .../ui/modules/login/recover/LoginRecoverFragment.kt  | 11 ++++-------
 .../github/wulkanowy/ui/modules/main/MainActivity.kt  |  1 +
 build.gradle                                          |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index aa7f6b37..230afdfe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,13 +16,13 @@ apply from: 'hooks.gradle'
 
 android {
     namespace 'io.github.wulkanowy'
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 108
         versionName "1.6.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index d7d77f73..aac60b56 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -93,6 +93,7 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     }
 
     //https://developer.android.com/guide/playcore/in-app-updates#status_callback
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
index c1c111d4..786bbfce 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
@@ -6,9 +6,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.webkit.JavascriptInterface
-import android.webkit.WebView
-import android.webkit.WebViewClient
+import android.webkit.*
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import com.yariksoffice.lingver.Lingver
@@ -206,10 +204,9 @@ class LoginRecoverFragment :
                 }
 
                 override fun onReceivedError(
-                    view: WebView,
-                    errorCode: Int,
-                    description: String,
-                    failingUrl: String
+                    view: WebView?,
+                    request: WebResourceRequest?,
+                    error: WebResourceError?
                 ) {
                     recoverWebViewSuccess = false
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 1bfc8ba5..260cf76c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -100,6 +100,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     }
 
     //https://developer.android.com/guide/playcore/in-app-updates#status_callback
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
diff --git a/build.gradle b/build.gradle
index 7640fbc4..3a8ae20c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.6.21'
+        kotlin_version = '1.7.0'
         about_libraries = '10.3.0'
         hilt_version = "2.42"
     }

From 6b705835735892114de3d666817ee00a3b69a0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 13 Jun 2022 07:43:40 +0200
Subject: [PATCH 044/429] New Crowdin updates (#1873)

---
 app/src/main/res/values-cs/preferences_values.xml | 1 +
 app/src/main/res/values-de/preferences_values.xml | 1 +
 app/src/main/res/values-pl/preferences_values.xml | 1 +
 app/src/main/res/values-pl/strings.xml            | 2 +-
 app/src/main/res/values-ru/preferences_values.xml | 1 +
 app/src/main/res/values-sk/preferences_values.xml | 1 +
 app/src/main/res/values-uk/preferences_values.xml | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
index 5252f79b..c8731372 100644
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@@ -34,6 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Abecedně</item>
         <item>Podle data</item>
+        <item>By average</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index 08b9d240..097e90e9 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -34,6 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Alphabetisch</item>
         <item>Nach Datum</item>
+        <item>By average</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index c823e960..45600574 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -34,6 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Alfabetycznie</item>
         <item>Według daty</item>
+        <item>Według średniej</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1607b17c..91e9fe7f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -94,7 +94,7 @@
     <string name="grade_summary_predicted_grade">Przewidywana ocena</string>
     <string name="grade_summary_calculated_average">Obliczona średnia</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Jak działa obliczona średnia?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Obliczona średnia jest średnią arytmetyczną obliczoną ze średnich przedmiotów. Pozwala ona na poznanie przybliżonej średniej końcowej. Jest obliczana w sposób wybrany przez użytkownika w ustawieniach aplikacji. Zaleca się wybranie odpowiedniej opcji. Dzieje się tak dlatego, że obliczanie średnich w szkołach różni się. Dodatkowo, jeśli twoja szkoła ma włączone średnie przedmiotów na stronie dziennika Vulcan, aplikacja pobiera je i ich nie oblicza. Można to zmienić, wymuszając obliczanie średniej w ustawieniach aplikacji.\n\n<b>Średnia ocen tylko z wybranego semestru</b>:\n1. Obliczanie średniej arytmetycznej każdego przedmiotu w danym semestrze\n2. Zsumowanie obliczonych średnich\n3. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia ze średnich z obu semestrów</b>:\n1.Obliczanie średniej arytmetycznej każdego przedmiotu w semestrze 1 i 2\n2. Obliczanie średniej arytmetycznej obliczonych średnich w semetrze 1 i 2 każdego przedmiotu.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia wszystkich ocen z całego roku:</b>\n1. Obliczanie średniej arytmetycznej z każdego przedmiotu w ciągu całego roku. Końcowa ocena w 1 semestrze jest bez znaczenia.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej z zsumowanych średnich</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Obliczona średnia jest średnią arytmetyczną obliczoną ze średnich przedmiotów. Pozwala ona na poznanie przybliżonej średniej końcowej. Jest obliczana w sposób wybrany przez użytkownika w ustawieniach aplikacji. Zaleca się wybranie odpowiedniej opcji. Dzieje się tak dlatego, że obliczanie średnich w szkołach różni się. Dodatkowo, jeśli twoja szkoła ma włączone średnie przedmiotów na stronie dziennika Vulcan, aplikacja pobiera je i ich nie oblicza. Można to zmienić, wymuszając obliczanie średniej w ustawieniach aplikacji.\n\n<b>Średnia ocen tylko z wybranego semestru</b>:\n1. Obliczanie średniej arytmetycznej każdego przedmiotu w danym semestrze\n2. Zsumowanie obliczonych średnich\n3. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia ze średnich z obu semestrów</b>:\n1.Obliczanie średniej arytmetycznej każdego przedmiotu w semestrze 1 i 2\n2. Obliczanie średniej arytmetycznej obliczonych średnich w semestrze 1 i 2 każdego przedmiotu.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia wszystkich ocen z całego roku:</b>\n1. Obliczanie średniej arytmetycznej z każdego przedmiotu w ciągu całego roku. Końcowa ocena w 1 semestrze jest bez znaczenia.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej z zsumowanych średnich</string>
     <string name="grade_summary_final_average_help_dialog_title">Jak działa końcowa średnia?</string>
     <string name="grade_summary_final_average_help_dialog_message">Średnią końcową jest średnia arytmetyczna obliczona na podstawie wszystkich obecnie dostępnych ocen końcowych w danym semestrze.\n\nSchemat obliczeń składa się z następujących kroków:\n1. Sumowanie końcowych ocen wpisanych przez nauczycieli\n2. Dzielenie przez liczbę przedmiotów, z których oceny zostały już wystawione</string>
     <string name="grade_summary_final_average">Końcowa średnia</string>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index 9cc37620..8a8c260d 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -34,6 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>В алфавитном порядке</item>
         <item>По дате</item>
+        <item>По средней</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
index e64f5606..ab0a43b6 100644
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@@ -34,6 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Abecedne</item>
         <item>Podľa dátumu</item>
+        <item>By average</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index 82c5b6ec..44acd18e 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -34,6 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>За алфавітом</item>
         <item>За датою</item>
+        <item>За середньою</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>

From 06ed5f6079ae17c2a63b2a9088fff476c5a4b4b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jun 2022 21:53:21 +0000
Subject: [PATCH 045/429] Bump logging-interceptor from 4.9.3 to 4.10.0 (#1889)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 230afdfe..f3f39258 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -225,7 +225,7 @@ dependencies {
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.3"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.10.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"

From cd59166efbd4bea7f79f2cdfc262212e0fcee8d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jun 2022 22:15:18 +0000
Subject: [PATCH 046/429] Bump sonarqube-gradle-plugin from 3.3 to 3.4.0.2513
 (#1888)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3a8ae20c..9dde0b28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.3"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From bfab265ccf4f5a0809788d92f535c7106bef8a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 18 Jun 2022 11:54:08 +0200
Subject: [PATCH 047/429] Fix case sensitive domain checker (#1894)

---
 app/build.gradle                                                | 2 +-
 .../wulkanowy/ui/modules/login/form/LoginFormPresenter.kt       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f3f39258..e629134e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.6.4"
+    implementation "io.github.wulkanowy:sdk:16811fbe90"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index b4291ff4..0acb0ea6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -172,7 +172,7 @@ class LoginFormPresenter @Inject constructor(
             if ("@" in login && "||" !in login && "login" !in host && "email" !in host) {
                 val emailHost = login.substringAfter("@")
                 val emailDomain = URL(host).host
-                if (emailHost != emailDomain) {
+                if (!emailHost.equals(emailDomain, true)) {
                     view?.setErrorEmailInvalid(domain = emailDomain)
                     isCorrect = false
                 }

From 0a2eb0784469afd19c837af49a1e7d5e45001567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 18 Jun 2022 12:11:46 +0200
Subject: [PATCH 048/429] Fix date in attendance and timetable when day is
 changing (#1893)

---
 .../modules/attendance/AttendancePresenter.kt  | 18 +++++++++++-------
 .../ui/modules/timetable/TimetablePresenter.kt | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 7fcbd002..26bfaf19 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -91,15 +91,19 @@ class AttendancePresenter @Inject constructor(
 
     fun onViewReselected() {
         Timber.i("Attendance view is reselected")
-        view?.also { view ->
+        view?.let { view ->
             if (view.currentStackSize == 1) {
-                baseDate.also {
-                    if (currentDate != it) {
-                        reloadView(it)
-                        loadData()
-                    } else if (!view.isViewEmpty) view.resetView()
+                baseDate = now().previousOrSameSchoolDay
+
+                if (currentDate != baseDate) {
+                    reloadView(baseDate)
+                    loadData()
+                } else if (!view.isViewEmpty) {
+                    view.resetView()
                 }
-            } else view.popView()
+            } else {
+                view.popView()
+            }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index dc6c8921..d0687408 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -87,15 +87,19 @@ class TimetablePresenter @Inject constructor(
 
     fun onViewReselected() {
         Timber.i("Timetable view is reselected")
-        view?.also { view ->
+        view?.let { view ->
             if (view.currentStackSize == 1) {
-                baseDate.also {
-                    if (currentDate != it) {
-                        reloadView(it)
-                        loadData()
-                    } else if (!view.isViewEmpty) view.resetView()
+                baseDate = now().nextOrSameSchoolDay
+
+                if (currentDate != baseDate) {
+                    reloadView(baseDate)
+                    loadData()
+                } else if (!view.isViewEmpty) {
+                    view.resetView()
                 }
-            } else view.popView()
+            } else {
+                view.popView()
+            }
         }
     }
 

From a264abf8144f8ce4ba8f9370333ef8163a0e87d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 18 Jun 2022 12:12:04 +0200
Subject: [PATCH 049/429] Fix typo in average description (#1892)

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ff25da7f..2ca516ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,7 +104,7 @@
     <string name="grade_summary_predicted_grade">Predicted grade</string>
     <string name="grade_summary_calculated_average">Calculated average</string>
     <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n3. Adding calculated averages\n4. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
     <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
     <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
     <string name="grade_summary_final_average">Final average</string>

From e9ba65f8f67e0afab0a1f27740abb863810cbac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 18 Jun 2022 12:12:21 +0200
Subject: [PATCH 050/429] Fix multiline address in student info (#1891)

---
 app/src/main/res/layout/fragment_student_info.xml | 4 ++--
 app/src/main/res/layout/item_student_info.xml     | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/fragment_student_info.xml b/app/src/main/res/layout/fragment_student_info.xml
index d270da4a..f72fed2f 100644
--- a/app/src/main/res/layout/fragment_student_info.xml
+++ b/app/src/main/res/layout/fragment_student_info.xml
@@ -37,7 +37,7 @@
         android:padding="10dp"
         android:visibility="gone"
         tools:ignore="UseCompoundDrawables"
-        tools:visibility="visible">
+        tools:visibility="gone">
 
         <ImageView
             android:layout_width="100dp"
@@ -63,7 +63,7 @@
         android:orientation="vertical"
         android:visibility="invisible"
         tools:ignore="UseCompoundDrawables"
-        tools:visibility="visible">
+        tools:visibility="gone">
 
         <ImageView
             android:layout_width="100dp"
diff --git a/app/src/main/res/layout/item_student_info.xml b/app/src/main/res/layout/item_student_info.xml
index 08eedebc..a38527cc 100644
--- a/app/src/main/res/layout/item_student_info.xml
+++ b/app/src/main/res/layout/item_student_info.xml
@@ -3,10 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="64dp"
+    android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:minHeight="64dp">
 
     <TextView
         android:id="@+id/student_info_item_title"
@@ -16,12 +17,12 @@
         android:layout_marginTop="13dp"
         android:layout_marginEnd="16dp"
         android:gravity="bottom"
-        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@id/student_info_item_arrow"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        tools:maxLines="1"
         tools:text="@tools:sample/lorem/random" />
 
     <TextView
@@ -31,12 +32,12 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:gravity="bottom"
-        android:maxLines="1"
         android:textColor="?android:textColorPrimary"
         android:textSize="16sp"
         app:layout_constraintEnd_toStartOf="@id/student_info_item_arrow"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/student_info_item_title"
+        tools:maxLines="1"
         tools:text="@tools:sample/lorem/random" />
 
     <ImageView

From a97039a727fb8cc816d1b8a16751528b0e45f3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sun, 19 Jun 2022 21:04:05 +0200
Subject: [PATCH 051/429] Fix jumping point in notes on refresh (#1898)

---
 app/src/main/res/layout/fragment_note.xml | 4 +++-
 app/src/main/res/layout/item_note.xml     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index f62a11a6..969003cc 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -19,7 +19,9 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/noteRecycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            tools:itemCount="4"
+            tools:listitem="@layout/item_note" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index 660f32e0..aa194989 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -54,7 +54,7 @@
 
     <TextView
         android:id="@+id/noteItemPoints"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:textSize="16sp"

From 120e5c9171b3a2d96f4670bd14fef875031f751c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:09:25 +0000
Subject: [PATCH 052/429] Bump coroutines from 1.6.2 to 1.6.3 (#1902)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e629134e..7c8046da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,7 +177,7 @@ ext {
     room = "2.4.2"
     chucker = "3.5.2"
     mockk = "1.12.4"
-    coroutines = "1.6.2"
+    coroutines = "1.6.3"
 }
 
 dependencies {

From c5dfea788c1a492b3cf06f4d00c99ac1fb4899a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 12:09:50 +0000
Subject: [PATCH 053/429] Bump annotation from 1.3.0 to 1.4.0 (#1900)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7c8046da..3e491206 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -193,7 +193,7 @@ dependencies {
     implementation "androidx.activity:activity-ktx:1.4.0"
     implementation "androidx.appcompat:appcompat:1.4.2"
     implementation "androidx.fragment:fragment-ktx:1.4.1"
-    implementation "androidx.annotation:annotation:1.3.0"
+    implementation "androidx.annotation:annotation:1.4.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"
     implementation "androidx.recyclerview:recyclerview:1.2.1"

From 0fb55bd6c64c78f1b4e110c444f84c9094a27089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sun, 26 Jun 2022 12:12:11 +0200
Subject: [PATCH 054/429] Fix doubled announcements (#1897)

---
 .../49.json                                   | 2445 +++++++++++++++++
 .../github/wulkanowy/data/db/AppDatabase.kt   |    3 +-
 .../data/db/dao/SchoolAnnouncementDao.kt      |    4 +-
 .../data/db/entities/SchoolAnnouncement.kt    |    4 +-
 .../data/db/migrations/Migration49.kt         |   23 +
 .../data/mappers/DirectorInformationMapper.kt |    2 +-
 .../SchoolAnnouncementRepository.kt           |    7 +-
 .../sync/works/SchoolAnnouncementWork.kt      |   12 +-
 .../notification/mock/schoolAnnouncement.kt   |    2 +-
 9 files changed, 2488 insertions(+), 14 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/49.json
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration49.kt

diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/49.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/49.json
new file mode 100644
index 00000000..5472fb78
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/49.json
@@ -0,0 +1,2445 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 49,
+    "identityHash": "790d4dc0e11f38349c49af85fabf9b7b",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '790d4dc0e11f38349c49af85fabf9b7b')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 379b8738..17fd7d69 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -55,7 +55,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 48
+        const val VERSION_SCHEMA = 49
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -102,6 +102,7 @@ abstract class AppDatabase : RoomDatabase() {
             Migration43(),
             Migration44(),
             Migration46(),
+            Migration49()
         )
 
         fun newInstance(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt
index 15655f4a..c32e4aba 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt
@@ -10,6 +10,6 @@ import javax.inject.Singleton
 @Singleton
 interface SchoolAnnouncementDao : BaseDao<SchoolAnnouncement> {
 
-    @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
+    @Query("SELECT * FROM SchoolAnnouncements WHERE user_login_id = :userLoginId ORDER BY date DESC")
+    fun loadAll(userLoginId: Int): Flow<List<SchoolAnnouncement>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt
index c8731bde..25e27ef1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt
@@ -9,8 +9,8 @@ import java.time.LocalDate
 @Entity(tableName = "SchoolAnnouncements")
 data class SchoolAnnouncement(
 
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
+    @ColumnInfo(name = "user_login_id")
+    val userLoginId: Int,
 
     val date: LocalDate,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration49.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration49.kt
new file mode 100644
index 00000000..6e1de19d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration49.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration49 : Migration(48, 49) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS SchoolAnnouncements")
+
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `SchoolAnnouncements` (
+            `user_login_id` INTEGER NOT NULL, 
+            `date` INTEGER NOT NULL, 
+            `subject` TEXT NOT NULL, 
+            `content` TEXT NOT NULL, 
+            `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
+            `is_notified` INTEGER NOT NULL)
+        """.trimIndent()
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt
index d059db81..16f1bbac 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt
@@ -6,7 +6,7 @@ import io.github.wulkanowy.sdk.pojo.DirectorInformation as SdkDirectorInformatio
 
 fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
     SchoolAnnouncement(
-        studentId = student.userLoginId,
+        userLoginId = student.userLoginId,
         date = it.date,
         subject = it.subject,
         content = it.content,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt
index cf7ac86c..4c42d092 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt
@@ -28,7 +28,8 @@ class SchoolAnnouncementRepository @Inject constructor(
 
     fun getSchoolAnnouncements(
         student: Student,
-        forceRefresh: Boolean, notify: Boolean = false
+        forceRefresh: Boolean,
+        notify: Boolean = false
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = { it.isEmpty() },
@@ -37,7 +38,7 @@ class SchoolAnnouncementRepository @Inject constructor(
             it.isEmpty() || forceRefresh || isExpired
         },
         query = {
-            schoolAnnouncementDb.loadAll(student.studentId)
+            schoolAnnouncementDb.loadAll(student.userLoginId)
         },
         fetch = {
             sdk.init(student)
@@ -56,7 +57,7 @@ class SchoolAnnouncementRepository @Inject constructor(
     )
 
     fun getSchoolAnnouncementFromDatabase(student: Student): Flow<List<SchoolAnnouncement>> {
-        return schoolAnnouncementDb.loadAll(student.studentId)
+        return schoolAnnouncementDb.loadAll(student.userLoginId)
     }
 
     suspend fun updateSchoolAnnouncement(schoolAnnouncement: List<SchoolAnnouncement>) =
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/SchoolAnnouncementWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/SchoolAnnouncementWork.kt
index 805ceb3e..1aedc839 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/SchoolAnnouncementWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/SchoolAnnouncementWork.kt
@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewSchoolAnnouncementNotification
 import kotlinx.coroutines.flow.first
+import java.time.LocalDate
 import javax.inject.Inject
 
 class SchoolAnnouncementWork @Inject constructor(
@@ -20,10 +21,13 @@ class SchoolAnnouncementWork @Inject constructor(
             notify = notify,
         ).waitForResult()
 
-
-        schoolAnnouncementRepository.getSchoolAnnouncementFromDatabase(student).first()
-            .filter { !it.isNotified }.let {
-                if (it.isNotEmpty()) newSchoolAnnouncementNotification.notify(it, student)
+        schoolAnnouncementRepository.getSchoolAnnouncementFromDatabase(student)
+            .first()
+            .filter { !it.isNotified && it.date >= LocalDate.now() }
+            .let {
+                if (it.isNotEmpty()) {
+                    newSchoolAnnouncementNotification.notify(it, student)
+                }
 
                 schoolAnnouncementRepository.updateSchoolAnnouncement(it.onEach { schoolAnnouncement ->
                     schoolAnnouncement.isNotified = true
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt
index 9b21f08e..e2dc5cd8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt
@@ -19,6 +19,6 @@ val debugSchoolAnnouncementItems = listOf(
 private fun generateAnnouncement(subject: String, content: String) = SchoolAnnouncement(
     subject = subject,
     content = content,
-    studentId = 0,
+    userLoginId = 0,
     date = LocalDate.now()
 )

From c808bf2e616eb3abf36c21f22a3e022768469ed5 Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Sun, 26 Jun 2022 13:06:43 +0200
Subject: [PATCH 055/429] Fix timetable widget day reset (#1862)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Rafał Borcz <RafalBO99@outlook.com>
---
 .../TimetableWidgetConfigureActivity.kt       |  6 ++---
 .../TimetableWidgetProvider.kt                | 24 ++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
index a27dba88..6ef6cfc9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -1,8 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.appwidget.AppWidgetManager.*
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -17,6 +15,7 @@ import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.EXTRA_FROM_CONFIGURE
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.EXTRA_FROM_PROVIDER
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
@@ -92,6 +91,7 @@ class TimetableWidgetConfigureActivity :
             .apply {
                 action = ACTION_APPWIDGET_UPDATE
                 putExtra(EXTRA_APPWIDGET_IDS, intArrayOf(widgetId))
+                putExtra(EXTRA_FROM_CONFIGURE, true)
             })
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 74576986..3ba2ae94 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -60,6 +60,8 @@ class TimetableWidgetProvider : BroadcastReceiver() {
 
         private const val BUTTON_RESET = "buttonReset"
 
+        const val EXTRA_FROM_CONFIGURE = "extraFromConfigure"
+
         const val EXTRA_FROM_PROVIDER = "extraFromProvider"
 
         fun getDateWidgetKey(appWidgetId: Int) = "timetable_widget_date_$appWidgetId"
@@ -86,12 +88,22 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     }
 
     private suspend fun onUpdate(context: Context, intent: Intent) {
-        if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
-            intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
+        if (intent.getStringExtra(EXTRA_BUTTON_TYPE) == null) {
+            val isFromConfigure = intent.getBooleanExtra(EXTRA_FROM_CONFIGURE, false)
+            val appWidgetIds = intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS) ?: return
+
+            appWidgetIds.forEach { appWidgetId ->
                 val student =
                     getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
+                val savedDataEpochDay = sharedPref.getLong(getDateWidgetKey(appWidgetId), 0)
 
-                updateWidget(context, appWidgetId, getWidgetDateToLoad(appWidgetId), student)
+                val dateToLoad = if (isFromConfigure && savedDataEpochDay != 0L) {
+                    LocalDate.ofEpochDay(savedDataEpochDay)
+                } else {
+                    getWidgetDefaultDateToLoad(appWidgetId)
+                }
+
+                updateWidget(context, appWidgetId, dateToLoad, student)
             }
         } else {
             val buttonType = intent.getStringExtra(EXTRA_BUTTON_TYPE)
@@ -103,10 +115,10 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             val savedDate =
                 LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
             val date = when (buttonType) {
-                BUTTON_RESET -> getWidgetDateToLoad(toggledWidgetId)
+                BUTTON_RESET -> getWidgetDefaultDateToLoad(toggledWidgetId)
                 BUTTON_NEXT -> savedDate.nextSchoolDay
                 BUTTON_PREV -> savedDate.previousSchoolDay
-                else -> getWidgetDateToLoad(toggledWidgetId)
+                else -> getWidgetDefaultDateToLoad(toggledWidgetId)
             }
             if (!buttonType.isNullOrBlank()) {
                 analytics.logEvent(
@@ -271,7 +283,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         return avatarBitmap
     }
 
-    private fun getWidgetDateToLoad(appWidgetId: Int): LocalDate {
+    private fun getWidgetDefaultDateToLoad(appWidgetId: Int): LocalDate {
         val lastLessonEndTimestamp =
             sharedPref.getLong(getTodayLastLessonEndDateTimeWidgetKey(appWidgetId), 0)
         val lastLessonEndDateTime =

From d8f644c5b4081d44e76a53a60067b31cb7baadf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sun, 26 Jun 2022 13:28:35 +0200
Subject: [PATCH 056/429] Add ads to dashboard (#1815)

---
 app/build.gradle                              |  3 +
 .../io/github/wulkanowy/utils/AdsHelper.kt    | 28 +++++++
 .../io/github/wulkanowy/utils/AdsHelper.kt    | 28 +++++++
 .../java/io/github/wulkanowy/WulkanowyApp.kt  |  4 +
 .../repositories/PreferencesRepository.kt     | 38 +++++++--
 .../ui/modules/dashboard/DashboardFragment.kt |  9 +++
 .../ui/modules/dashboard/DashboardItem.kt     | 23 +++---
 .../dashboard/DashboardItemMoveCallback.kt    |  3 +-
 .../modules/dashboard/DashboardPresenter.kt   | 35 +++++++-
 .../ui/modules/dashboard/DashboardView.kt     |  4 +-
 .../{ => adapters}/DashboardAdapter.kt        | 48 ++++++-----
 .../DashboardAnnouncementsAdapter.kt          |  4 +-
 .../DashboardConferencesAdapter.kt            |  4 +-
 .../{ => adapters}/DashboardExamsAdapter.kt   |  4 +-
 .../{ => adapters}/DashboardGradesAdapter.kt  |  2 +-
 .../DashboardHomeworkAdapter.kt               |  4 +-
 .../wulkanowy/ui/modules/main/MainActivity.kt | 46 +++++++++++
 .../ui/modules/main/MainPresenter.kt          | 63 ++++++++++++---
 .../wulkanowy/ui/modules/main/MainView.kt     |  6 ++
 .../wulkanowy/utils/ContextExtension.kt       |  1 +
 .../main/res/layout/dialog_ads_consent.xml    | 79 +++++++++++++++++++
 .../main/res/layout/item_dashboard_ads.xml    | 15 ++++
 .../main/res/values/preferences_defaults.xml  |  2 +
 app/src/main/res/values/preferences_keys.xml  |  4 +
 app/src/main/res/values/strings.xml           |  7 ++
 .../ui/modules/settings/ads/AdsFragment.kt    | 70 ++++++++++++++--
 .../ui/modules/settings/ads/AdsPresenter.kt   | 64 ++++++++++++---
 .../ui/modules/settings/ads/AdsView.kt        |  8 +-
 .../io/github/wulkanowy/utils/AdsHelper.kt    | 59 ++++++++++++--
 .../play/res/xml/scheme_preferences_ads.xml   | 27 ++++++-
 .../ui/modules/main/MainPresenterTest.kt      | 14 +++-
 31 files changed, 621 insertions(+), 85 deletions(-)
 create mode 100644 app/src/fdroid/java/io/github/wulkanowy/utils/AdsHelper.kt
 create mode 100644 app/src/hms/java/io/github/wulkanowy/utils/AdsHelper.kt
 rename app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/{ => adapters}/DashboardAdapter.kt (96%)
 rename app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/{ => adapters}/DashboardAnnouncementsAdapter.kt (95%)
 rename app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/{ => adapters}/DashboardConferencesAdapter.kt (95%)
 rename app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/{ => adapters}/DashboardExamsAdapter.kt (97%)
 rename app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/{ => adapters}/DashboardGradesAdapter.kt (96%)
 rename app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/{ => adapters}/DashboardHomeworkAdapter.kt (97%)
 create mode 100644 app/src/main/res/layout/dialog_ads_consent.xml
 create mode 100644 app/src/main/res/layout/item_dashboard_ads.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3e491206..29325abf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,7 @@ android {
         }
 
         buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
+        buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
 
         if (System.env.SET_BUILD_TIMESTAMP) {
             buildConfigField "long", "BUILD_TIMESTAMP", String.valueOf(System.currentTimeMillis())
@@ -99,6 +100,8 @@ android {
                     admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
             ]
             buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "\"${System.getenv("SINGLE_SUPPORT_AD_ID") ?: "ca-app-pub-3940256099942544/5354046379"}\""
+            buildConfigField "String", "DASHBOARD_TILE_AD_ID", "\"${System.getenv("DASHBOARD_TILE_AD_ID") ?: "ca-app-pub-3940256099942544/6300978111"}\""
+
         }
 
         fdroid {
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/AdsHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/AdsHelper.kt
new file mode 100644
index 00000000..461d2995
--- /dev/null
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/AdsHelper.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import android.view.View
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import javax.inject.Inject
+
+@Suppress("unused")
+class AdsHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    fun initialize() {
+        preferencesRepository.isAdsEnabled = false
+        preferencesRepository.isAgreeToProcessData = false
+        preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
+    }
+
+    @Suppress("RedundantSuspendModifier", "UNUSED_PARAMETER")
+    suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
+        throw IllegalStateException("Can't get ad banner (F-droid)")
+    }
+}
+
+data class AdBanner(val view: View)
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/AdsHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/AdsHelper.kt
new file mode 100644
index 00000000..0e922702
--- /dev/null
+++ b/app/src/hms/java/io/github/wulkanowy/utils/AdsHelper.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import android.view.View
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import javax.inject.Inject
+
+@Suppress("unused")
+class AdsHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    fun initialize() {
+        preferencesRepository.isAdsEnabled = false
+        preferencesRepository.isAgreeToProcessData = false
+        preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
+    }
+
+    @Suppress("RedundantSuspendModifier", "UNUSED_PARAMETER")
+    suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
+        throw IllegalStateException("Can't get ad banner (HMS)")
+    }
+}
+
+data class AdBanner(val view: View)
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index b5103e3e..7d2eeb1e 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -31,10 +31,14 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
+    @Inject
+    lateinit var adsHelper: AdsHelper
+
     override fun onCreate() {
         super.onCreate()
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
+        adsHelper.initialize()
         initLogging()
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 4cd85586..237fb1a0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -222,16 +222,14 @@ class PreferencesRepository @Inject constructor(
         get() = selectedDashboardTilesPreference.asFlow()
             .map { set ->
                 set.map { DashboardItem.Tile.valueOf(it) }
-                    .plus(DashboardItem.Tile.ACCOUNT)
-                    .plus(DashboardItem.Tile.ADMIN_MESSAGE)
+                    .plus(listOf(DashboardItem.Tile.ACCOUNT, DashboardItem.Tile.ADMIN_MESSAGE))
                     .toSet()
             }
 
     var selectedDashboardTiles: Set<DashboardItem.Tile>
         get() = selectedDashboardTilesPreference.get()
             .map { DashboardItem.Tile.valueOf(it) }
-            .plus(DashboardItem.Tile.ACCOUNT)
-            .plus(DashboardItem.Tile.ADMIN_MESSAGE)
+            .plus(listOf(DashboardItem.Tile.ACCOUNT, DashboardItem.Tile.ADMIN_MESSAGE))
             .toSet()
         set(value) {
             val filteredValue = value.filterNot { it == DashboardItem.Tile.ACCOUNT }
@@ -271,7 +269,33 @@ class PreferencesRepository @Inject constructor(
 
     var isAppReviewDone: Boolean
         get() = sharedPref.getBoolean(PREF_KEY_IN_APP_REVIEW_DONE, false)
-        set(value) = sharedPref.edit().putBoolean(PREF_KEY_IN_APP_REVIEW_DONE, value).apply()
+        set(value) = sharedPref.edit { putBoolean(PREF_KEY_IN_APP_REVIEW_DONE, value) }
+
+    var isAppSupportShown: Boolean
+        get() = sharedPref.getBoolean(PREF_KEY_APP_SUPPORT_SHOWN, false)
+        set(value) = sharedPref.edit { putBoolean(PREF_KEY_APP_SUPPORT_SHOWN, value) }
+
+    var isAgreeToProcessData: Boolean
+        get() = getBoolean(
+            R.string.pref_key_ads_consent_data_processing,
+            R.bool.pref_default_ads_consent_data_processing
+        )
+        set(value) = sharedPref.edit {
+            putBoolean(context.getString(R.string.pref_key_ads_consent_data_processing), value)
+        }
+
+    var isPersonalizedAdsEnabled: Boolean
+        get() = sharedPref.getBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, false)
+        set(value) = sharedPref.edit { putBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, value) }
+
+    var isAdsEnabled: Boolean
+        get() = getBoolean(
+            R.string.pref_key_ads_enabled,
+            R.bool.pref_default_ads_enabled
+        )
+        set(value) = sharedPref.edit {
+            putBoolean(context.getString(R.string.pref_key_ads_enabled), value)
+        }
 
     private fun getLong(id: Int, default: Int) = getLong(context.getString(id), default)
 
@@ -301,6 +325,10 @@ class PreferencesRepository @Inject constructor(
 
         private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done"
 
+        private const val PREF_KEY_APP_SUPPORT_SHOWN = "app_support_shown"
+
+        private const val PREF_KEY_PERSONALIZED_ADS_ENABLED = "personalized_ads_enabled"
+
         private const val PREF_KEY_ADMIN_DISMISSED_MESSAGE_IDS = "admin_message_dismissed_ids"
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
index 65832bdb..de0b4a6c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
@@ -18,6 +18,7 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.conference.ConferenceFragment
+import io.github.wulkanowy.ui.modules.dashboard.adapters.DashboardAdapter
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
@@ -47,6 +48,14 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
     override var subtitleString =
         LocalDate.now().toFormattedString("EEEE, d MMMM yyyy").capitalise()
 
+    override val tileWidth: Int
+        get() {
+            val recyclerWidth = binding.dashboardRecycler.width
+            val margin = requireContext().dpToPx(24f).toInt()
+
+            return ((recyclerWidth - margin) / resources.displayMetrics.density).toInt()
+        }
+
     companion object {
 
         fun newInstance() = DashboardFragment()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
index c20bae7f..e220ae23 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
@@ -1,13 +1,9 @@
 package io.github.wulkanowy.ui.modules.dashboard
 
-import io.github.wulkanowy.data.db.entities.AdminMessage
-import io.github.wulkanowy.data.db.entities.Conference
-import io.github.wulkanowy.data.db.entities.Exam
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.enums.GradeColorTheme
 import io.github.wulkanowy.data.pojos.TimetableFull
+import io.github.wulkanowy.utils.AdBanner
 import io.github.wulkanowy.data.db.entities.Homework as EntitiesHomework
 
 sealed class DashboardItem(val type: Type) {
@@ -106,17 +102,26 @@ sealed class DashboardItem(val type: Type) {
         override val isDataLoaded get() = conferences != null
     }
 
+    data class Ads(
+        val adBanner: AdBanner? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.ADS) {
+
+        override val isDataLoaded get() = adBanner != null
+    }
+
     enum class Type {
         ADMIN_MESSAGE,
         ACCOUNT,
         HORIZONTAL_GROUP,
         LESSONS,
+        ADS,
         GRADES,
         HOMEWORK,
         ANNOUNCEMENTS,
         EXAMS,
         CONFERENCES,
-        ADS
     }
 
     enum class Tile {
@@ -126,12 +131,12 @@ sealed class DashboardItem(val type: Type) {
         MESSAGES,
         ATTENDANCE,
         LESSONS,
+        ADS,
         GRADES,
         HOMEWORK,
         ANNOUNCEMENTS,
         EXAMS,
         CONFERENCES,
-        ADS
     }
 }
 
@@ -148,4 +153,4 @@ fun DashboardItem.Tile.toDashboardItemType() = when (this) {
     DashboardItem.Tile.EXAMS -> DashboardItem.Type.EXAMS
     DashboardItem.Tile.CONFERENCES -> DashboardItem.Type.CONFERENCES
     DashboardItem.Tile.ADS -> DashboardItem.Type.ADS
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt
index b9625570..9c15acc3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt
@@ -2,7 +2,8 @@ package io.github.wulkanowy.ui.modules.dashboard
 
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import java.util.Collections
+import io.github.wulkanowy.ui.modules.dashboard.adapters.DashboardAdapter
+import java.util.*
 
 class DashboardItemMoveCallback(
     private val dashboardAdapter: DashboardAdapter,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index c33955bc..e963a020 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -8,6 +8,7 @@ import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.repositories.*
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.calculatePercentage
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import kotlinx.coroutines.flow.*
@@ -31,7 +32,8 @@ class DashboardPresenter @Inject constructor(
     private val conferenceRepository: ConferenceRepository,
     private val preferencesRepository: PreferencesRepository,
     private val schoolAnnouncementRepository: SchoolAnnouncementRepository,
-    private val adminMessageRepository: AdminMessageRepository
+    private val adminMessageRepository: AdminMessageRepository,
+    private val adsHelper: AdsHelper
 ) : BasePresenter<DashboardView>(errorHandler, studentRepository) {
 
     private val dashboardItemLoadedList = mutableListOf<DashboardItem>()
@@ -166,7 +168,7 @@ class DashboardPresenter @Inject constructor(
                     DashboardItem.Type.CONFERENCES -> {
                         loadConferences(student, forceRefresh)
                     }
-                    DashboardItem.Type.ADS -> TODO()
+                    DashboardItem.Type.ADS -> loadAds(forceRefresh)
                     DashboardItem.Type.ADMIN_MESSAGE -> loadAdminMessage(student, forceRefresh)
                 }
             }
@@ -595,6 +597,23 @@ class DashboardPresenter @Inject constructor(
             .launchWithUniqueRefreshJob("dashboard_admin_messages", forceRefresh)
     }
 
+    private fun loadAds(forceRefresh: Boolean) {
+        presenterScope.launch {
+            if (!forceRefresh) {
+                updateData(DashboardItem.Ads(), forceRefresh)
+            }
+
+            val dashboardAdItem =
+                runCatching {
+                    DashboardItem.Ads(adsHelper.getDashboardTileAdBanner(view!!.tileWidth))
+                }
+                    .onFailure { Timber.e(it) }
+                    .getOrElse { DashboardItem.Ads(error = it) }
+
+            updateData(dashboardAdItem, forceRefresh)
+        }
+    }
+
     private fun updateData(dashboardItem: DashboardItem, forceRefresh: Boolean) {
         val isForceRefreshError = forceRefresh && dashboardItem.error != null
         val isFirstRunDataLoadedError =
@@ -619,6 +638,18 @@ class DashboardPresenter @Inject constructor(
             }
         }
 
+        if (dashboardItem is DashboardItem.Ads) {
+            if (!dashboardItem.isDataLoaded) {
+                dashboardItemsToLoad = dashboardItemsToLoad - DashboardItem.Type.ADS
+                dashboardTileLoadedList = dashboardTileLoadedList - DashboardItem.Tile.ADS
+
+                dashboardItemLoadedList.removeAll { it.type == DashboardItem.Type.ADS }
+            } else {
+                dashboardItemsToLoad = dashboardItemsToLoad + DashboardItem.Type.ADS
+                dashboardTileLoadedList = dashboardTileLoadedList + DashboardItem.Tile.ADS
+            }
+        }
+
         if (forceRefresh) {
             updateForceRefreshData(dashboardItem)
         } else {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardView.kt
index 2cc2f1d2..76788543 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardView.kt
@@ -4,6 +4,8 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface DashboardView : BaseView {
 
+    val tileWidth: Int
+
     fun initView()
 
     fun updateData(data: List<DashboardItem>)
@@ -27,4 +29,4 @@ interface DashboardView : BaseView {
     fun openNotificationsCenterView()
 
     fun openInternetBrowser(url: String)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
similarity index 96%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
index 9191d43c..a3c423a8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.dashboard
+package io.github.wulkanowy.ui.modules.dashboard.adapters
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
@@ -22,24 +22,15 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.entities.TimetableHeader
 import io.github.wulkanowy.data.enums.GradeColorTheme
-import io.github.wulkanowy.databinding.ItemDashboardAccountBinding
-import io.github.wulkanowy.databinding.ItemDashboardAdminMessageBinding
-import io.github.wulkanowy.databinding.ItemDashboardAnnouncementsBinding
-import io.github.wulkanowy.databinding.ItemDashboardConferencesBinding
-import io.github.wulkanowy.databinding.ItemDashboardExamsBinding
-import io.github.wulkanowy.databinding.ItemDashboardGradesBinding
-import io.github.wulkanowy.databinding.ItemDashboardHomeworkBinding
-import io.github.wulkanowy.databinding.ItemDashboardHorizontalGroupBinding
-import io.github.wulkanowy.databinding.ItemDashboardLessonsBinding
-import io.github.wulkanowy.utils.createNameInitialsDrawable
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.left
-import io.github.wulkanowy.utils.nickOrName
-import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.databinding.*
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import io.github.wulkanowy.utils.*
 import timber.log.Timber
-import java.time.*
-import java.util.Timer
+import java.time.Duration
+import java.time.Instant
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.util.*
 import javax.inject.Inject
 import kotlin.concurrent.timer
 
@@ -120,6 +111,9 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             DashboardItem.Type.ADMIN_MESSAGE.ordinal -> AdminMessageViewHolder(
                 ItemDashboardAdminMessageBinding.inflate(inflater, parent, false)
             )
+            DashboardItem.Type.ADS.ordinal -> AdsViewHolder(
+                ItemDashboardAdsBinding.inflate(inflater, parent, false)
+            )
             else -> throw IllegalArgumentException()
         }
     }
@@ -135,6 +129,7 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             is ExamsViewHolder -> bindExamsViewHolder(holder, position)
             is ConferencesViewHolder -> bindConferencesViewHolder(holder, position)
             is AdminMessageViewHolder -> bindAdminMessage(holder, position)
+            is AdsViewHolder -> bindAdsViewHolder(holder, position)
         }
     }
 
@@ -746,6 +741,20 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         }
     }
 
+    private fun bindAdsViewHolder(adsViewHolder: AdsViewHolder, position: Int) {
+        val item = (items[position] as DashboardItem.Ads).adBanner ?: return
+        val binding = adsViewHolder.binding
+
+        binding.dashboardAdminMessageItemContent.removeAllViews()
+        binding.dashboardAdminMessageItemContent.addView(
+            item.view,
+            ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+        )
+    }
+
     class AccountViewHolder(val binding: ItemDashboardAccountBinding) :
         RecyclerView.ViewHolder(binding.root)
 
@@ -788,6 +797,9 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
     class AdminMessageViewHolder(val binding: ItemDashboardAdminMessageBinding) :
         RecyclerView.ViewHolder(binding.root)
 
+    class AdsViewHolder(val binding: ItemDashboardAdsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
     private class DiffCallback(
         private val newList: List<DashboardItem>,
         private val oldList: List<DashboardItem>
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAnnouncementsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAnnouncementsAdapter.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAnnouncementsAdapter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAnnouncementsAdapter.kt
index 7a4c2b25..da588015 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAnnouncementsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAnnouncementsAdapter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.dashboard
+package io.github.wulkanowy.ui.modules.dashboard.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -33,4 +33,4 @@ class DashboardAnnouncementsAdapter :
 
     class ViewHolder(val binding: SubitemDashboardAnnouncementsBinding) :
         RecyclerView.ViewHolder(binding.root)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardConferencesAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardConferencesAdapter.kt
similarity index 95%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardConferencesAdapter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardConferencesAdapter.kt
index 64cf599c..1244ff60 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardConferencesAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardConferencesAdapter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.dashboard
+package io.github.wulkanowy.ui.modules.dashboard.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -33,4 +33,4 @@ class DashboardConferencesAdapter :
 
     class ViewHolder(val binding: SubitemDashboardConferencesBinding) :
         RecyclerView.ViewHolder(binding.root)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardExamsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardExamsAdapter.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardExamsAdapter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardExamsAdapter.kt
index 060f224b..583bf29d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardExamsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardExamsAdapter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.dashboard
+package io.github.wulkanowy.ui.modules.dashboard.adapters
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -56,4 +56,4 @@ class DashboardExamsAdapter :
 
     class ViewHolder(val binding: SubitemDashboardExamsBinding) :
         RecyclerView.ViewHolder(binding.root)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardGradesAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardGradesAdapter.kt
similarity index 96%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardGradesAdapter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardGradesAdapter.kt
index afffcc51..d00df9d4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardGradesAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardGradesAdapter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.dashboard
+package io.github.wulkanowy.ui.modules.dashboard.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardHomeworkAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardHomeworkAdapter.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardHomeworkAdapter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardHomeworkAdapter.kt
index 55ec9029..8105ff9c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardHomeworkAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardHomeworkAdapter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.dashboard
+package io.github.wulkanowy.ui.modules.dashboard.adapters
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -53,4 +53,4 @@ class DashboardHomeworkAdapter : RecyclerView.Adapter<DashboardHomeworkAdapter.V
 
     class ViewHolder(val binding: SubitemDashboardHomeworkBinding) :
         RecyclerView.ViewHolder(binding.root)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 260cf76c..5cd6fa10 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -12,6 +12,7 @@ import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
@@ -20,6 +21,7 @@ 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.ActivityMainBinding
+import io.github.wulkanowy.databinding.DialogAdsConsentBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.account.accountquick.AccountQuickDialog
@@ -288,6 +290,50 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         inAppReviewHelper.showInAppReview(this)
     }
 
+    override fun showAppSupport() {
+        MaterialAlertDialogBuilder(this)
+            .setTitle(R.string.main_support_title)
+            .setMessage(R.string.main_support_description)
+            .setPositiveButton(R.string.main_support_positive) { _, _ -> presenter.onEnableAdsSelected() }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .setOnDismissListener { }
+            .show()
+    }
+
+    override fun showPrivacyPolicyDialog() {
+        val dialogAdsConsentBinding = DialogAdsConsentBinding.inflate(layoutInflater)
+
+        val dialog = MaterialAlertDialogBuilder(this)
+            .setTitle(R.string.pref_ads_consent_title)
+            .setMessage(R.string.pref_ads_consent_description)
+            .setView(dialogAdsConsentBinding.root)
+            .show()
+
+        dialogAdsConsentBinding.adsConsentOver.setOnCheckedChangeListener { _, isChecked ->
+            dialogAdsConsentBinding.adsConsentPersonalised.isEnabled = isChecked
+        }
+
+        dialogAdsConsentBinding.adsConsentPersonalised.setOnClickListener {
+            presenter.onPrivacyAgree(true)
+            dialog.dismiss()
+        }
+
+        dialogAdsConsentBinding.adsConsentNonPersonalised.setOnClickListener {
+            presenter.onPrivacyAgree(false)
+            dialog.dismiss()
+        }
+
+        dialogAdsConsentBinding.adsConsentPrivacy.setOnClickListener { presenter.onPrivacySelected() }
+        dialogAdsConsentBinding.adsConsentCancel.setOnClickListener { dialog.cancel() }
+    }
+
+    override fun openPrivacyPolicy() {
+        openInternetBrowser(
+            "https://wulkanowy.github.io/polityka-prywatnosci.html",
+            ::showMessage
+        )
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         navController.onSaveInstanceState(outState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index a07bdb37..8f457d92 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -14,11 +14,15 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.account.AccountView
 import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsView
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.message.MessageView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersView
 import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
+import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.AppInfo
+import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import timber.log.Timber
@@ -29,10 +33,12 @@ import javax.inject.Inject
 class MainPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val prefRepository: PreferencesRepository,
+    private val preferencesRepository: PreferencesRepository,
     private val syncManager: SyncManager,
     private val analytics: AnalyticsHelper,
-    private val json: Json
+    private val json: Json,
+    private val adsHelper: AdsHelper,
+    private val appInfo: AppInfo
 ) : BasePresenter<MainView>(errorHandler, studentRepository) {
 
     private var studentsWitSemesters: List<StudentWithSemesters>? = null
@@ -47,7 +53,7 @@ class MainPresenter @Inject constructor(
 
     private val Destination?.startMenuIndex
         get() = when {
-            this == null -> prefRepository.startMenuIndex
+            this == null -> preferencesRepository.startMenuIndex
             destinationType in rootDestinationTypeList -> {
                 rootDestinationTypeList.indexOf(destinationType)
             }
@@ -71,6 +77,8 @@ class MainPresenter @Inject constructor(
 
         syncManager.startPeriodicSyncWorker()
 
+        checkAppSupport()
+
         analytics.logEvent("app_open", "destination" to initDestination.toString())
         Timber.i("Main view was initialized with $initDestination")
     }
@@ -155,18 +163,53 @@ class MainPresenter @Inject constructor(
         } == true
     }
 
-    private fun checkInAppReview() {
-        prefRepository.inAppReviewCount++
+    fun onEnableAdsSelected() {
+        view?.showPrivacyPolicyDialog()
+    }
 
-        if (prefRepository.inAppReviewDate == null) {
-            prefRepository.inAppReviewDate = Instant.now()
+    fun onPrivacyAgree(isPersonalizedAds: Boolean) {
+        preferencesRepository.isAdsEnabled = true
+        preferencesRepository.isAgreeToProcessData = true
+        preferencesRepository.isPersonalizedAdsEnabled = isPersonalizedAds
+
+        adsHelper.initialize()
+
+        preferencesRepository.selectedDashboardTiles += DashboardItem.Tile.ADS
+    }
+
+    fun onPrivacySelected() {
+        view?.openPrivacyPolicy()
+    }
+
+    private fun checkInAppReview() {
+        preferencesRepository.inAppReviewCount++
+
+        if (preferencesRepository.inAppReviewDate == null) {
+            preferencesRepository.inAppReviewDate = Instant.now()
         }
 
-        if (!prefRepository.isAppReviewDone && prefRepository.inAppReviewCount >= 50 &&
-            Instant.now().minus(Duration.ofDays(14)).isAfter(prefRepository.inAppReviewDate)
+        if (!preferencesRepository.isAppReviewDone && preferencesRepository.inAppReviewCount >= 50 &&
+            Instant.now().minus(Duration.ofDays(14)).isAfter(preferencesRepository.inAppReviewDate)
         ) {
             view?.showInAppReview()
-            prefRepository.isAppReviewDone = true
+            preferencesRepository.isAppReviewDone = true
+        }
+    }
+
+    private fun checkAppSupport() {
+        if (!preferencesRepository.isAppSupportShown && !preferencesRepository.isAdsEnabled
+            && appInfo.buildFlavor == "play"
+        ) {
+            presenterScope.launch {
+                val student = runCatching { studentRepository.getCurrentStudent(false) }
+                    .onFailure { Timber.e(it) }
+                    .getOrElse { return@launch }
+
+                if (Instant.now().minus(Duration.ofDays(28)).isAfter(student.registrationDate)) {
+                    view?.showAppSupport()
+                    preferencesRepository.isAppSupportShown = true
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 3a57fcc6..3d018e3d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -41,6 +41,12 @@ interface MainView : BaseView {
 
     fun showInAppReview()
 
+    fun showAppSupport()
+
+    fun showPrivacyPolicyDialog()
+
+    fun openPrivacyPolicy()
+
     fun openMoreDestination(destination: Destination)
 
     interface MainChildView {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index 323e1e47..dd91d36d 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -13,6 +13,7 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawable
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import androidx.core.graphics.drawable.toBitmap
 
+
 @ColorInt
 fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
     val array = obtainStyledAttributes(null, intArrayOf(colorAttr))
diff --git a/app/src/main/res/layout/dialog_ads_consent.xml b/app/src/main/res/layout/dialog_ads_consent.xml
new file mode 100644
index 00000000..39510162
--- /dev/null
+++ b/app/src/main/res/layout/dialog_ads_consent.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/ads_consent_privacy"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        android:layout_marginHorizontal="24dp"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:padding="0dp"
+        android:text="Privacy Policy"
+        android:textAllCaps="false"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.checkbox.MaterialCheckBox
+        android:id="@+id/ads_consent_over"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="17dp"
+        android:layout_marginTop="8dp"
+        android:text="I am over 18 years old"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14dp"
+        app:layout_constraintTop_toBottomOf="@id/ads_consent_privacy" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/ads_consent_personalised"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:enabled="false"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:text="Yes, personalized ads"
+        app:layout_constraintTop_toBottomOf="@id/ads_consent_over" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/ads_consent_non_personalised"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:text="Yes, non-personalized ads"
+        app:layout_constraintBottom_toTopOf="@id/ads_consent_cancel"
+        app:layout_constraintTop_toBottomOf="@id/ads_consent_personalised"
+        app:layout_constraintVertical_bias="0" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/ads_consent_cancel"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:text="Cancel"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintVertical_bias="0" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_dashboard_ads.xml b/app/src/main/res/layout/item_dashboard_ads.xml
new file mode 100644
index 00000000..b75bb27e
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_ads.xml
@@ -0,0 +1,15 @@
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/dashboard_admin_message_item_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index deeb3696..9c092ec5 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -37,4 +37,6 @@
         <item>GRADES</item>
         <item>ANNOUNCEMENTS</item>
     </string-array>
+    <bool name="pref_default_ads_enabled">false</bool>
+    <bool name="pref_default_ads_consent_data_processing">false</bool>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 849d989e..f29080b3 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -37,4 +37,8 @@
     <string name="pref_key_notifications_piggyback">notifications_piggyback</string>
     <string name="pref_key_notifications_piggyback_cancel_original">notifications_piggyback_cancel_original</string>
     <string name="pref_key_ads_single_support">single_ad_support</string>
+    <string name="pref_key_ads_enabled">ads_enabled</string>
+    <string name="pref_key_ads_privacy_policy">ads_privacy_policy</string>
+    <string name="pref_key_ads_consent_data_processing">ads_consent_data_processing</string>
+    <string name="pref_key_ads_over_eighteen">ads_over_eighteen</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ca516ad..db591309 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,9 @@
     <string name="main_log_in">Log in</string>
     <string name="main_session_expired">Session expired</string>
     <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
 
 
     <!--Grade-->
@@ -715,6 +718,10 @@
     <string name="pref_ads_privacy_link">Privacy policy</string>
     <string name="pref_ads_loading">Ad is loading</string>
     <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
+    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
+    <string name="pref_ads_summary_personalized">Personalized ads</string>
+    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
 
     <string name="pref_settings_advanced_title">Advanced</string>
     <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
index 8d31928b..48a6fc3e 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
@@ -2,12 +2,15 @@ package io.github.wulkanowy.ui.modules.settings.ads
 
 import android.os.Bundle
 import android.view.View
+import androidx.preference.CheckBoxPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreferenceCompat
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.DialogAdsConsentBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -36,6 +39,22 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
             presenter.onWatchSingleAdSelected()
             true
         }
+
+        findPreference<Preference>(getString(R.string.pref_key_ads_privacy_policy))?.setOnPreferenceClickListener {
+            presenter.onPrivacySelected()
+            true
+        }
+
+        findPreference<CheckBoxPreference>(getString(R.string.pref_key_ads_consent_data_processing))
+            ?.setOnPreferenceChangeListener { _, newValue ->
+                presenter.onConsentSelected(newValue as Boolean)
+                true
+            }
+
+        findPreference<SwitchPreferenceCompat>(getString(R.string.pref_key_ads_enabled))?.setOnPreferenceChangeListener { _, newValue ->
+            presenter.onAddEnabled(newValue as Boolean)
+            true
+        }
     }
 
     override fun showAd(ad: RewardedInterstitialAd) {
@@ -45,13 +64,50 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
     }
 
     override fun showPrivacyPolicyDialog() {
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(getString(R.string.pref_ads_privacy_title))
-            .setMessage(getString(R.string.pref_ads_privacy_description))
-            .setPositiveButton(getString(R.string.pref_ads_privacy_agree)) { _, _ -> presenter.onAgreedPrivacy() }
-            .setNegativeButton(android.R.string.cancel) { _, _ -> }
-            .setNeutralButton(getString(R.string.pref_ads_privacy_link)) { _, _ -> presenter.onPrivacySelected() }
+        val dialogAdsConsentBinding = DialogAdsConsentBinding.inflate(layoutInflater)
+
+        val dialog = MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.pref_ads_consent_title)
+            .setMessage(R.string.pref_ads_consent_description)
+            .setView(dialogAdsConsentBinding.root)
+            .setOnCancelListener { presenter.onPrivacyDialogCanceled() }
             .show()
+
+        dialogAdsConsentBinding.adsConsentOver.setOnCheckedChangeListener { _, isChecked ->
+            dialogAdsConsentBinding.adsConsentPersonalised.isEnabled = isChecked
+        }
+
+        dialogAdsConsentBinding.adsConsentPersonalised.setOnClickListener {
+            presenter.onPersonalizedAgree()
+            dialog.dismiss()
+        }
+
+        dialogAdsConsentBinding.adsConsentNonPersonalised.setOnClickListener {
+            presenter.onNonPersonalizedAgree()
+            dialog.dismiss()
+        }
+
+        dialogAdsConsentBinding.adsConsentPrivacy.setOnClickListener { presenter.onPrivacySelected() }
+        dialogAdsConsentBinding.adsConsentCancel.setOnClickListener { dialog.cancel() }
+    }
+
+    override fun showProcessingDataSummary(isPersonalized: Boolean?) {
+        val summaryText = isPersonalized?.let {
+            getString(if (it) R.string.pref_ads_summary_personalized else R.string.pref_ads_summary_non_personalized)
+        }
+
+        findPreference<CheckBoxPreference>(getString(R.string.pref_key_ads_consent_data_processing))
+            ?.summary = summaryText
+    }
+
+    override fun setCheckedProcessingData(checked: Boolean) {
+        findPreference<CheckBoxPreference>(getString(R.string.pref_key_ads_consent_data_processing))
+            ?.isChecked = checked
+    }
+
+    override fun setCheckedAdsEnabled(checked: Boolean) {
+        findPreference<SwitchPreferenceCompat>(getString(R.string.pref_key_ads_enabled))
+            ?.isChecked = checked
     }
 
     override fun openPrivacyPolicy() {
@@ -98,4 +154,4 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
index 5ccbce1e..85c14c0a 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
@@ -1,8 +1,10 @@
 package io.github.wulkanowy.ui.modules.settings.ads
 
+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.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.utils.AdsHelper
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -11,24 +13,22 @@ import javax.inject.Inject
 class AdsPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val adsHelper: AdsHelper
+    private val adsHelper: AdsHelper,
+    private val preferencesRepository: PreferencesRepository
 ) : BasePresenter<AdsView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: AdsView) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Settings ads view was initialized")
+
+        view.showProcessingDataSummary(
+            preferencesRepository.isPersonalizedAdsEnabled.takeIf {
+                preferencesRepository.isAgreeToProcessData
+            })
     }
 
     fun onWatchSingleAdSelected() {
-        view?.showPrivacyPolicyDialog()
-    }
-
-    fun onPrivacySelected() {
-        view?.openPrivacyPolicy()
-    }
-
-    fun onAgreedPrivacy() {
         view?.showLoadingSupportAd(true)
         presenterScope.launch {
             runCatching { adsHelper.getSupportAd() }
@@ -41,4 +41,48 @@ class AdsPresenter @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+
+    fun onConsentSelected(isChecked: Boolean) {
+        if (isChecked) {
+            view?.showPrivacyPolicyDialog()
+        } else {
+            view?.showProcessingDataSummary(null)
+            view?.setCheckedAdsEnabled(false)
+            onAddEnabled(false)
+        }
+    }
+
+    fun onPrivacySelected() {
+        view?.openPrivacyPolicy()
+    }
+
+    fun onPrivacyDialogCanceled() {
+        view?.setCheckedProcessingData(false)
+    }
+
+    fun onNonPersonalizedAgree() {
+        preferencesRepository.isPersonalizedAdsEnabled = false
+
+        adsHelper.initialize()
+
+        view?.setCheckedProcessingData(true)
+        view?.showProcessingDataSummary(false)
+    }
+
+    fun onPersonalizedAgree() {
+        preferencesRepository.isPersonalizedAdsEnabled = true
+
+        adsHelper.initialize()
+
+        view?.setCheckedProcessingData(true)
+        view?.showProcessingDataSummary(true)
+    }
+
+    fun onAddEnabled(isEnabled: Boolean) {
+        if (isEnabled) {
+            preferencesRepository.selectedDashboardTiles += DashboardItem.Tile.ADS
+        } else {
+            preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
+        }
+    }
+}
diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsView.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsView.kt
index 89de7bd1..8de6e60d 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsView.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsView.kt
@@ -16,4 +16,10 @@ interface AdsView : BaseView {
     fun showLoadingSupportAd(show: Boolean)
 
     fun showWatchAdOncePerVisit(show: Boolean)
-}
\ No newline at end of file
+
+    fun setCheckedAdsEnabled(checked: Boolean)
+
+    fun setCheckedProcessingData(checked: Boolean)
+
+    fun showProcessingDataSummary(isPersonalized: Boolean?)
+}
diff --git a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
index dde4d012..6be8e924 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
@@ -2,27 +2,39 @@ package io.github.wulkanowy.utils
 
 import android.content.Context
 import android.os.Bundle
+import android.view.View
 import com.google.ads.mediation.admob.AdMobAdapter
-import com.google.android.gms.ads.AdRequest
-import com.google.android.gms.ads.LoadAdError
-import com.google.android.gms.ads.MobileAds
+import com.google.android.gms.ads.*
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAdLoadCallback
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.BuildConfig
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import javax.inject.Inject
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 
-class AdsHelper @Inject constructor(@ApplicationContext private val context: Context) {
+
+class AdsHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val preferencesRepository: PreferencesRepository
+) {
+
+    fun initialize() {
+        if (preferencesRepository.isAgreeToProcessData) {
+            MobileAds.initialize(context)
+        }
+    }
 
     suspend fun getSupportAd(): RewardedInterstitialAd? {
-        MobileAds.initialize(context)
-
         val extra = Bundle().apply { putString("npa", "1") }
         val adRequest = AdRequest.Builder()
-            .addNetworkExtrasBundle(AdMobAdapter::class.java, extra)
+            .apply {
+                if (!preferencesRepository.isPersonalizedAdsEnabled) {
+                    addNetworkExtrasBundle(AdMobAdapter::class.java, extra)
+                }
+            }
             .build()
 
         return suspendCoroutine {
@@ -41,4 +53,35 @@ class AdsHelper @Inject constructor(@ApplicationContext private val context: Con
                 })
         }
     }
-}
\ No newline at end of file
+
+    suspend fun getDashboardTileAdBanner(width: Int): AdBanner {
+        val extra = Bundle().apply { putString("npa", "1") }
+        val adRequest = AdRequest.Builder()
+            .apply {
+                if (!preferencesRepository.isPersonalizedAdsEnabled) {
+                    addNetworkExtrasBundle(AdMobAdapter::class.java, extra)
+                }
+            }
+            .build()
+
+        return suspendCoroutine {
+            val adView = AdView(context).apply {
+                adSize = AdSize.getPortraitAnchoredAdaptiveBannerAdSize(context, width)
+                adUnitId = BuildConfig.DASHBOARD_TILE_AD_ID
+                adListener = object : AdListener() {
+                    override fun onAdFailedToLoad(loadAdError: LoadAdError) {
+                        it.resumeWithException(IllegalArgumentException(loadAdError.message))
+                    }
+
+                    override fun onAdLoaded() {
+                        it.resume(AdBanner(this@apply))
+                    }
+                }
+            }
+
+            adView.loadAd(adRequest)
+        }
+    }
+}
+
+data class AdBanner(val view: View)
diff --git a/app/src/play/res/xml/scheme_preferences_ads.xml b/app/src/play/res/xml/scheme_preferences_ads.xml
index 52a3df58..d5e93a35 100644
--- a/app/src/play/res/xml/scheme_preferences_ads.xml
+++ b/app/src/play/res/xml/scheme_preferences_ads.xml
@@ -2,11 +2,34 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         app:iconSpaceReserved="false"
-        app:title="@string/pref_ads_support_category_name">
+        app:title="Agreements">
         <Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_ads_privacy_policy"
+            app:singleLineTitle="false"
+            app:title="Privacy Policy" />
+        <CheckBoxPreference
+            app:defaultValue="@bool/pref_default_ads_consent_data_processing"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_ads_consent_data_processing"
+            app:singleLineTitle="false"
+            app:title="Consent to processing of data related to ads" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_ads_support_category_name">
+        <SwitchPreferenceCompat
+            app:defaultValue="@string/pref_key_ads_enabled"
+            app:dependency="@string/pref_key_ads_consent_data_processing"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_ads_enabled"
+            app:singleLineTitle="false"
+            app:title="Show ads in app" />
+        <Preference
+            app:dependency="@string/pref_key_ads_consent_data_processing"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_single_support"
             app:singleLineTitle="false"
             app:title="@string/pref_ads_support" />
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 720239e6..6cfab199 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -4,7 +4,9 @@ import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.AppInfo
 import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import kotlinx.serialization.json.Json
@@ -31,6 +33,12 @@ class MainPresenterTest {
     @MockK(relaxed = true)
     lateinit var analytics: AnalyticsHelper
 
+    @MockK(relaxed = true)
+    lateinit var appInfo: AppInfo
+
+    @MockK(relaxed = true)
+    lateinit var adsHelper: AdsHelper
+
     private lateinit var presenter: MainPresenter
 
     @Before
@@ -42,10 +50,12 @@ class MainPresenterTest {
         presenter = MainPresenter(
             errorHandler = errorHandler,
             studentRepository = studentRepository,
-            prefRepository = prefRepository,
+            preferencesRepository = prefRepository,
             syncManager = syncManager,
             analytics = analytics,
-            json = Json
+            json = Json,
+            appInfo = appInfo,
+            adsHelper = adsHelper
         )
         presenter.onAttachView(mainView, null)
     }

From c4689fcbb38f7055f5378d7c6a537a79841e3a96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 26 Jun 2022 12:44:06 +0000
Subject: [PATCH 057/429] Bump agconnect-crash from 1.6.6.200 to 1.7.0.300
 (#1899)

---
 app/build.gradle                            |   2 +-
 app/src/debug/agconnect-services.json       | 115 +++++++++++++++-----
 app/src/release/agconnect-services.json.gpg | Bin 608 -> 972 bytes
 build.gradle                                |   2 +-
 4 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 29325abf..ab1d0aef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -248,7 +248,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:21.0.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.5.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.6.200'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
diff --git a/app/src/debug/agconnect-services.json b/app/src/debug/agconnect-services.json
index 48192df0..52426f54 100644
--- a/app/src/debug/agconnect-services.json
+++ b/app/src/debug/agconnect-services.json
@@ -1,33 +1,92 @@
 {
-	"agcgw":{
-		"backurl":"connect-dre.dbankcloud.cn",
-		"url":"connect-dre.hispace.hicloud.com"
-	},
-	"client":{
-		"cp_id":"890048000024105546",
-		"product_id":"",
-		"client_id":"",
-		"client_secret":"",
-		"app_id":"101440411",
-		"package_name":"io.github.wulkanowy.dev",
-		"api_key":""
-	},
-	"service":{
-		"analytics":{
-			"collector_url":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-			"resource_id":"p1",
-			"channel_id":""
-		},
+  "agcgw": {
+    "backurl": "connect-dre.hispace.hicloud.com",
+    "url": "connect-dre.dbankcloud.cn",
+    "websocketbackurl": "connect-ws-dre.hispace.dbankcloud.com",
+    "websocketurl": "connect-ws-dre.hispace.dbankcloud.cn"
+  },
+  "agcgw_all": {
+    "CN": "connect-drcn.dbankcloud.cn",
+    "CN_back": "connect-drcn.hispace.hicloud.com",
+    "DE": "connect-dre.dbankcloud.cn",
+    "DE_back": "connect-dre.hispace.hicloud.com",
+    "RU": "connect-drru.hispace.dbankcloud.ru",
+    "RU_back": "connect-drru.hispace.dbankcloud.cn",
+    "SG": "connect-dra.dbankcloud.cn",
+    "SG_back": "connect-dra.hispace.hicloud.com"
+  },
+  "websocketgw_all": {
+    "CN": "connect-ws-drcn.hispace.dbankcloud.cn",
+    "CN_back": "connect-ws-drcn.hispace.dbankcloud.com",
+    "DE": "connect-ws-dre.hispace.dbankcloud.cn",
+    "DE_back": "connect-ws-dre.hispace.dbankcloud.com",
+    "RU": "connect-ws-drru.hispace.dbankcloud.ru",
+    "RU_back": "connect-ws-drru.hispace.dbankcloud.cn",
+    "SG": "connect-ws-dra.hispace.dbankcloud.cn",
+    "SG_back": "connect-ws-dra.hispace.dbankcloud.com"
+  },
+  "client": {
+    "cp_id": "890048000024105546",
+    "product_id": "736430079244736562",
+    "client_id": "514530959291319360",
+    "client_secret": "C42522DBF17D3D4BBE9D9C1783A54484B7E6844B388B7A67502D36A633A4186B",
+    "project_id": "736430079244736562",
+    "app_id": "106552551",
+    "api_key": "CgB6e3x9BUNiq+r8ebCHNojjjYsMT4pJSjjNDOkm9owtBb6rVI6LjnASoZBRxbjjhObcrV5gANo99fI/eKZDTbWS",
+    "package_name": "io.github.wulkanowy.dev"
+  },
+  "oauth_client": {
+    "client_id": "106552551",
+    "client_type": 1
+  },
+  "app_info": {
+    "app_id": "106552551",
+    "package_name": "io.github.wulkanowy.dev"
+  },
+  "service": {
+    "analytics": {
+      "collector_url": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+      "collector_url_ru": "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+      "collector_url_sg": "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+      "collector_url_de": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+      "collector_url_cn": "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+      "resource_id": "p1",
+      "channel_id": ""
+    },
 		"search":{
 			"url":"https://search-dre.cloud.huawei.com"
 		},
-		"cloudstorage":{
-			"storage_url":"https://ops-dre.agcstorage.link"
-		},
-		"ml":{
-			"mlservice_url":"ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
-		}
-	},
-	"region":"DE",
-	"configuration_version":"1.0"
+		"cloudstorage": {
+      "storage_url_sg_back": "https://agc-storage-dra.cloud.huawei.asia",
+      "storage_url_ru_back": "https://agc-storage-drru.cloud.huawei.ru",
+      "storage_url_ru": "https://agc-storage-drru.cloud.huawei.ru",
+      "storage_url_de_back": "https://agc-storage-dre.cloud.huawei.eu",
+      "storage_url_de": "https://ops-dre.agcstorage.link",
+      "storage_url": "https://agc-storage-drcn.platform.dbankcloud.cn",
+      "storage_url_sg": "https://ops-dra.agcstorage.link",
+      "storage_url_cn_back": "https://agc-storage-drcn.cloud.huawei.com.cn",
+      "storage_url_cn": "https://agc-storage-drcn.platform.dbankcloud.cn"
+    },
+    "ml": {
+      "mlservice_url": "ml-api-dre.ai.dbankcloud.com,ml-api-dre.ai.dbankcloud.cn"
+    }
+  },
+  "region": "DE",
+  "configuration_version": "3.0",
+  "appInfos": [
+    {
+      "package_name": "io.github.wulkanowy.dev",
+      "client": {
+        "app_id": "106552551"
+      },
+      "app_info": {
+        "package_name": "io.github.wulkanowy.dev",
+        "app_id": "106552551"
+      },
+      "oauth_client": {
+        "client_type": 1,
+        "client_id": "106552551"
+      }
+    }
+  ]
 }
diff --git a/app/src/release/agconnect-services.json.gpg b/app/src/release/agconnect-services.json.gpg
index 484d8bc72d7a15b689a3fb76cddd91f1992cebf4..149b9b26818f97db4ac68202bbde3c1fde04f422 100644
GIT binary patch
literal 972
zcmeC-W#MFI%CvVWn)pF~)2B->8E2?+NK~+wEmA%j+80#$WVzsb?=#N){B2s#L*)Xl
zZftqWws;5gwPRWTW0pQkYnQlnt96a~2Ih|&t&Yz4^>Vsy1%Lha8+soXZ;TK;wAb-c
zrbc&sd2mi||2EUv+>Ym7Zc%gXTsGnJd1E!n9efv(w#Qj7esS%=ulUx5GvhiIxz#_P
zAa8$t|J~n{H%3hk+)<;rJ>W_7&Yi7mBc?8J-Bw@S<{#Nnd-zXuRmZmZPxzC=rd>DG
zt~}u2vEbt;!7KMp7@ZQk-uP{z2}AR24dvn+%J%|3UOd$m+kRe?<E`j&OL>tsiSI56
zGami;<DMN~QUupm_lU0-_|059mV4_rFAt6RS(*K$t~f?*v6jleIbCnhnyxvhRP6m~
zg<YwB+9h9|2|I1gH%#_e|B{ozwB_akll9hbPff@^GH=ttl)d(yVt#=f99Q{{v0Y!e
z=aS=z@6z2F*(Y`_SvN~*wn)IWYjx?>DkoQPrL^AiuG+U-!(Wc&MA)@%%}{p^851=%
zrr$g3pL@LHZlAr>@WN@kJ@Ow_I4zbIo3<9eIc%x@Xj&!5jQUq`|7{doV&wf#@kMD@
zG}q+tJvq1H@ACiQKY9MSolknG!ancx=JoR?>qkpYlT^ripBuN$E1e;Tb)iaU-O;nF
zKFpgPW$%=K=>FN$imm@!!XIinUKLEYx4R-MsOFS&udE<-)*0T92YyEExY57zP@&-F
zO`9Cv)OvRcU-Dihozx$pJ>}D-kjC6Q78zz`C7A+`-PfqRJ$ZHU=GN<x8VUD`xso!|
z&P|@}vUu&jlE^KSvZj4K-s6?TRuJ5<@I6!Qg$h5>%2{QzB@UgFw)%4P>D`2a!wQ?_
z*t6rbZ}piinpM2|wokEc{NXCQMT%`=R?8yi-LUw{@AjehVSJr|T}orT%!4hCac3Cx
z4p%KtU8bn2ov@VA#qW1A$ByD7C&j<!E_>iUU3GDL^X{z^EL66&iv3sFV(yXorruHL
z;FS4MCbdWI6g_k~z;f-%pF8^Anwt`f<4(-p*%JAahnJt7+wqHO!CVvlX6{+%yG1u0
zva4IZZGQcln_j21_lX|jEN{D%z0lypyr3&Po?X(Lf4cVH9K*Psyvnz^{@YGTo#R(E
z-)!YF*$SZrk{4~6qIHsHx~5$Y(qDPeN<VCK?ELRhj0czbC;h)Q_4U&o(o=6eooTh(
z<7b`v4vV}$=MH+QUJ+pzzWzp_HO(eW*MiMrQ#d!@B6+i@1;u@fumARZ-EPvqP`%mj
r<^%DYP0yx$cTE#nXUMIo=aMcp@8F%n1zzb9iWgf9FTHydv-m#%ja=O)

literal 608
zcmeC-WnpJ#x{|fQYq?^{?hlt<GU`uz)O%gE=C@x8Z_muV*Vg>WG3LCrj>*&9acxT8
zenrbN!D{v|T*0w*XS%L^Sb9*_Tk4?jeV1R2JD1dM64L&9A>>KjrzZ`;kK~(Y{Jt+;
z)bDJ0?*Ej1c}}9y4D0U}&d9vu6Z%xe-qF&wPk++Yy*F;Zs*2Q7TXvaKwqe?>E3b?G
zdK9<bu~)pgJ~O3FKj_!d3BHBR8h#>-XSUz(@jfchUcT{rL0@)a|GUkmJOb{FkC$JQ
z<9qd5f0pN$s^e^HO*OcBV|XsGG3abCtw>m8GjY=T)lWH+f*=1sbi*lPLHV{M=biou
zOO4-7_<UviHm~(75AWQ$=Equvlv^go2FIi{?(xsrv}&Od$F>h*9V_;&zm=sJ!mvAJ
zv*7Qg%cn7C#@vW}SJ9r;-}HOaW}{FS^<({6qQ&2CW+=M^_A?7Hd^j4{7;^OKjI<uV
zMYH>SKR7LmZLtn6cQ|L6U~ur$r?+|kZ4&s-FIg{O8v5|;#tTV|E&Ch8nEZvEA51G>
zF!yZDzuEVEENhqdm7inF+p=lJozs`nSoU)+3l5pHXw5z|rgldYkJ)}+E2c5G2Bdgw
zz0~8>ILTT}KlYGWN?rQT$!WL$)~*a`F5Ta>kSltz^?%p-Nm54^bL|gZ(O44p<o<Rh
zPrH+MIB)dE*<Tb|n7-RP?8k}6O%no@7rs)|lJnuz-~NyHIrn{aKLuXXuRnTY|Cw3a
zIqZo0u=ES-64{)me9MFG^~LR8{AFUnf&beQ<Nuh8e?7bJ!Y{2||Fhcz)efxO{QG^3
YVB%5p^qz9(#S(%3yZBUBG48$y01&(`wg3PC

diff --git a/build.gradle b/build.gradle
index 9dde0b28..0391e282 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.huawei.agconnect:agcp:1.6.6.200'
+        classpath 'com.huawei.agconnect:agcp:1.7.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.3"

From 7b13684137684f61d4c9788ee1a2c9152a8ae552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sun, 26 Jun 2022 15:50:35 +0200
Subject: [PATCH 058/429] Fix ads tile (#1905)

---
 .../repositories/PreferencesRepository.kt     | 25 ++++++++++++++++---
 .../modules/dashboard/DashboardPresenter.kt   |  6 ++++-
 .../ui/modules/main/MainPresenter.kt          |  4 +--
 .../ui/modules/settings/ads/AdsFragment.kt    |  5 ----
 .../ui/modules/settings/ads/AdsPresenter.kt   | 10 --------
 .../io/github/wulkanowy/utils/AdsHelper.kt    |  2 +-
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 237fb1a0..486538e0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -222,17 +222,31 @@ class PreferencesRepository @Inject constructor(
         get() = selectedDashboardTilesPreference.asFlow()
             .map { set ->
                 set.map { DashboardItem.Tile.valueOf(it) }
-                    .plus(listOf(DashboardItem.Tile.ACCOUNT, DashboardItem.Tile.ADMIN_MESSAGE))
+                    .plus(
+                        listOfNotNull(
+                            DashboardItem.Tile.ACCOUNT,
+                            DashboardItem.Tile.ADMIN_MESSAGE,
+                            DashboardItem.Tile.ADS.takeIf { isAdsEnabled }
+                        )
+                    )
                     .toSet()
             }
 
     var selectedDashboardTiles: Set<DashboardItem.Tile>
         get() = selectedDashboardTilesPreference.get()
             .map { DashboardItem.Tile.valueOf(it) }
-            .plus(listOf(DashboardItem.Tile.ACCOUNT, DashboardItem.Tile.ADMIN_MESSAGE))
+            .plus(
+                listOfNotNull(
+                    DashboardItem.Tile.ACCOUNT,
+                    DashboardItem.Tile.ADMIN_MESSAGE,
+                    DashboardItem.Tile.ADS.takeIf { isAdsEnabled }
+                )
+            )
             .toSet()
         set(value) {
-            val filteredValue = value.filterNot { it == DashboardItem.Tile.ACCOUNT }
+            val filteredValue = value.filterNot {
+                it == DashboardItem.Tile.ACCOUNT || it == DashboardItem.Tile.ADMIN_MESSAGE
+            }
                 .map { it.name }
                 .toSet()
 
@@ -288,6 +302,11 @@ class PreferencesRepository @Inject constructor(
         get() = sharedPref.getBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, false)
         set(value) = sharedPref.edit { putBoolean(PREF_KEY_PERSONALIZED_ADS_ENABLED, value) }
 
+    val isAdsEnabledFlow = flowSharedPref.getBoolean(
+        context.getString(R.string.pref_key_ads_enabled),
+        context.resources.getBoolean(R.bool.pref_default_ads_enabled)
+    ).asFlow()
+
     var isAdsEnabled: Boolean
         get() = getBoolean(
             R.string.pref_key_ads_enabled,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index e963a020..5d7c7df4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -57,7 +57,11 @@ class DashboardPresenter @Inject constructor(
             showContent(false)
         }
 
-        preferencesRepository.selectedDashboardTilesFlow
+        merge(
+            preferencesRepository.selectedDashboardTilesFlow,
+            preferencesRepository.isAdsEnabledFlow
+                .map { preferencesRepository.selectedDashboardTiles }
+        )
             .onEach { loadData(tilesToLoad = it) }
             .launch("dashboard_pref")
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 8f457d92..9c32d858 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -14,7 +14,6 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.account.AccountView
 import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsView
-import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.message.MessageView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersView
@@ -168,13 +167,12 @@ class MainPresenter @Inject constructor(
     }
 
     fun onPrivacyAgree(isPersonalizedAds: Boolean) {
-        preferencesRepository.isAdsEnabled = true
         preferencesRepository.isAgreeToProcessData = true
         preferencesRepository.isPersonalizedAdsEnabled = isPersonalizedAds
 
         adsHelper.initialize()
 
-        preferencesRepository.selectedDashboardTiles += DashboardItem.Tile.ADS
+        preferencesRepository.isAdsEnabled = true
     }
 
     fun onPrivacySelected() {
diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
index 48a6fc3e..de4c591e 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
@@ -50,11 +50,6 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
                 presenter.onConsentSelected(newValue as Boolean)
                 true
             }
-
-        findPreference<SwitchPreferenceCompat>(getString(R.string.pref_key_ads_enabled))?.setOnPreferenceChangeListener { _, newValue ->
-            presenter.onAddEnabled(newValue as Boolean)
-            true
-        }
     }
 
     override fun showAd(ad: RewardedInterstitialAd) {
diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
index 85c14c0a..772d616d 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
@@ -4,7 +4,6 @@ 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.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.utils.AdsHelper
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -48,7 +47,6 @@ class AdsPresenter @Inject constructor(
         } else {
             view?.showProcessingDataSummary(null)
             view?.setCheckedAdsEnabled(false)
-            onAddEnabled(false)
         }
     }
 
@@ -77,12 +75,4 @@ class AdsPresenter @Inject constructor(
         view?.setCheckedProcessingData(true)
         view?.showProcessingDataSummary(true)
     }
-
-    fun onAddEnabled(isEnabled: Boolean) {
-        if (isEnabled) {
-            preferencesRepository.selectedDashboardTiles += DashboardItem.Tile.ADS
-        } else {
-            preferencesRepository.selectedDashboardTiles -= DashboardItem.Tile.ADS
-        }
-    }
 }
diff --git a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
index 6be8e924..c536e221 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
@@ -66,7 +66,7 @@ class AdsHelper @Inject constructor(
 
         return suspendCoroutine {
             val adView = AdView(context).apply {
-                adSize = AdSize.getPortraitAnchoredAdaptiveBannerAdSize(context, width)
+                setAdSize(AdSize.getPortraitAnchoredAdaptiveBannerAdSize(context, width))
                 adUnitId = BuildConfig.DASHBOARD_TILE_AD_ID
                 adListener = object : AdListener() {
                     override fun onAdFailedToLoad(loadAdError: LoadAdError) {

From b70649f13672b45e8574cdc2f92c8ebc6299bfec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 15:05:51 +0000
Subject: [PATCH 059/429] Bump about_libraries from 10.3.0 to 10.3.1 (#1907)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0391e282..21964d49 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.7.0'
-        about_libraries = '10.3.0'
+        about_libraries = '10.3.1'
         hilt_version = "2.42"
     }
     repositories {

From e70fe6f097039ea0ddd8e92d96627d82ea6ac925 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 15:06:20 +0000
Subject: [PATCH 060/429] Bump firebase-crashlytics-gradle from 2.9.0 to 2.9.1
 (#1910)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 21964d49..7949ceaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.huawei.agconnect:agcp:1.7.0.300'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.3"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513"

From 0f11f14c3e3df07a3a77c7405df8245689831d12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 15:07:33 +0000
Subject: [PATCH 061/429] Bump firebase-bom from 30.1.0 to 30.2.0 (#1909)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab1d0aef..b7a5c04b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,7 +239,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.7.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.1.0')
+    playImplementation platform('com.google.firebase:firebase-bom:30.2.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 1b74bffc06bab18be850a9a2be80a75385fb6166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 2 Jul 2022 19:10:57 +0200
Subject: [PATCH 062/429] Fix no mobile devices on parent account (#1896)

---
 .../50.json                                   | 2445 +++++++++++++++++
 .../github/wulkanowy/data/db/AppDatabase.kt   |    5 +-
 .../wulkanowy/data/db/dao/MobileDeviceDao.kt  |    2 +-
 .../data/db/entities/MobileDevice.kt          |    2 +-
 .../data/db/migrations/Migration50.kt         |   21 +
 .../data/mappers/MobileDeviceMapper.kt        |    6 +-
 .../repositories/MobileDeviceRepository.kt    |    4 +-
 .../MobileDeviceRepositoryTest.kt             |   20 +-
 8 files changed, 2486 insertions(+), 19 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/50.json
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration50.kt

diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/50.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/50.json
new file mode 100644
index 00000000..4361db95
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/50.json
@@ -0,0 +1,2445 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 50,
+    "identityHash": "87455aae2b15baa976386c833afa9cd9",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '87455aae2b15baa976386c833afa9cd9')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 17fd7d69..87915a9e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -55,7 +55,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 49
+        const val VERSION_SCHEMA = 50
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -102,7 +102,8 @@ abstract class AppDatabase : RoomDatabase() {
             Migration43(),
             Migration44(),
             Migration46(),
-            Migration49()
+            Migration49(),
+            Migration50()
         )
 
         fun newInstance(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
index 081e859a..96382cc1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
@@ -8,6 +8,6 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
-    @Query("SELECT * FROM MobileDevices WHERE student_id = :userLoginId ORDER BY date DESC")
+    @Query("SELECT * FROM MobileDevices WHERE user_login_id = :userLoginId ORDER BY date DESC")
     fun loadAll(userLoginId: Int): Flow<List<MobileDevice>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
index 887e4323..89b04ccc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
@@ -9,7 +9,7 @@ import java.time.Instant
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
 
-    @ColumnInfo(name = "student_id")
+    @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
     @ColumnInfo(name = "device_id")
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration50.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration50.kt
new file mode 100644
index 00000000..d45a8157
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration50.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration50 : Migration(49, 50) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS MobileDevices")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `MobileDevices` (
+            `user_login_id` INTEGER NOT NULL, 
+            `device_id` INTEGER NOT NULL, 
+            `name` TEXT NOT NULL, 
+            `date` INTEGER NOT NULL, 
+            `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)
+        """.trimIndent()
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
index b1e96a27..1a1c501f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
@@ -1,14 +1,14 @@
 package io.github.wulkanowy.data.mappers
 
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.pojo.Device as SdkDevice
 import io.github.wulkanowy.sdk.pojo.Token as SdkToken
 
-fun List<SdkDevice>.mapToEntities(semester: Semester) = map {
+fun List<SdkDevice>.mapToEntities(student: Student) = map {
     MobileDevice(
-        userLoginId = semester.studentId,
+        userLoginId = student.userLoginId,
         date = it.createDateZoned.toInstant(),
         deviceId = it.id,
         name = it.name
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
index eda40cac..07c6959e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MobileDeviceRepository.kt
@@ -39,12 +39,12 @@ class MobileDeviceRepository @Inject constructor(
             val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
             it.isEmpty() || forceRefresh || isExpired
         },
-        query = { mobileDb.loadAll(student.userLoginId.takeIf { it != 0 } ?: student.studentId) },
+        query = { mobileDb.loadAll(student.userLoginId) },
         fetch = {
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getRegisteredDevices()
-                .mapToEntities(semester)
+                .mapToEntities(student)
         },
         saveFetchResult = { old, new ->
             mobileDb.deleteAll(old uniqueSubtract new)
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
index b9a958d4..6865aa7d 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
@@ -56,8 +56,8 @@ class MobileDeviceRepositoryTest {
         // prepare
         coEvery { sdk.getRegisteredDevices() } returns remoteList
         coEvery { mobileDeviceDb.loadAll(student.studentId) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester))
+            flowOf(remoteList.mapToEntities(student)),
+            flowOf(remoteList.mapToEntities(student))
         )
         coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
@@ -79,9 +79,9 @@ class MobileDeviceRepositoryTest {
         // prepare
         coEvery { sdk.getRegisteredDevices() } returns remoteList
         coEvery { mobileDeviceDb.loadAll(1) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
+            flowOf(remoteList.dropLast(1).mapToEntities(student)),
+            flowOf(remoteList.dropLast(1).mapToEntities(student)), // after fetch end before save result
+            flowOf(remoteList.mapToEntities(student))
         )
         coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
@@ -96,7 +96,7 @@ class MobileDeviceRepositoryTest {
         coVerify { mobileDeviceDb.loadAll(1) }
         coVerify {
             mobileDeviceDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
+                it.size == 1 && it[0] == remoteList.mapToEntities(student)[1]
             })
         }
         coVerify { mobileDeviceDb.deleteAll(match { it.isEmpty() }) }
@@ -107,9 +107,9 @@ class MobileDeviceRepositoryTest {
         // prepare
         coEvery { sdk.getRegisteredDevices() } returns remoteList.dropLast(1)
         coEvery { mobileDeviceDb.loadAll(1) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.dropLast(1).mapToEntities(semester))
+            flowOf(remoteList.mapToEntities(student)),
+            flowOf(remoteList.mapToEntities(student)), // after fetch end before save result
+            flowOf(remoteList.dropLast(1).mapToEntities(student))
         )
         coEvery { mobileDeviceDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { mobileDeviceDb.deleteAll(any()) } just Runs
@@ -125,7 +125,7 @@ class MobileDeviceRepositoryTest {
         coVerify { mobileDeviceDb.insertAll(match { it.isEmpty() }) }
         coVerify {
             mobileDeviceDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
+                it.size == 1 && it[0] == remoteList.mapToEntities(student)[1]
             })
         }
     }

From fcc7dc0913227c595a2575326b80d3ba51ca15d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Jul 2022 07:33:27 +0000
Subject: [PATCH 063/429] Bump fragment-ktx from 1.4.1 to 1.5.0 (#1915)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7a5c04b..50c572ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,7 +195,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
     implementation "androidx.activity:activity-ktx:1.4.0"
     implementation "androidx.appcompat:appcompat:1.4.2"
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
+    implementation "androidx.fragment:fragment-ktx:1.5.0"
     implementation "androidx.annotation:annotation:1.4.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From 89a6a98bbf7e15e808b35bea3d8364c5e1cacdca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Jul 2022 07:33:46 +0000
Subject: [PATCH 064/429] Bump google-services from 4.3.10 to 4.3.13 (#1913)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7949ceaa..b96c8582 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.huawei.agconnect:agcp:1.7.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"

From 344e0d55ffb83c0acd75b1d2ed2755a7c9033329 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Jul 2022 07:34:03 +0000
Subject: [PATCH 065/429] Bump lifecycle-livedata-ktx from 2.4.1 to 2.5.0
 (#1911)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 50c572ed..83e18e95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -212,7 +212,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"

From 4b6277abf517162b695788d082126a7e25ba6953 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Jul 2022 07:34:24 +0000
Subject: [PATCH 066/429] Bump activity-ktx from 1.4.0 to 1.5.0 (#1912)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 83e18e95..91c45876 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -193,7 +193,7 @@ dependencies {
 
     implementation "androidx.core:core-ktx:1.8.0"
     implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
-    implementation "androidx.activity:activity-ktx:1.4.0"
+    implementation "androidx.activity:activity-ktx:1.5.0"
     implementation "androidx.appcompat:appcompat:1.4.2"
     implementation "androidx.fragment:fragment-ktx:1.5.0"
     implementation "androidx.annotation:annotation:1.4.0"

From f1c217b087e46faef8279ab9b0bd47d415c0745a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Jul 2022 10:20:28 +0000
Subject: [PATCH 067/429] Bump kotlin_version from 1.7.0 to 1.7.10 (#1918)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b96c8582..71eb2def 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.7.0'
+        kotlin_version = '1.7.10'
         about_libraries = '10.3.1'
         hilt_version = "2.42"
     }

From bdb6c962ea2ac017b3a46c7d7f743b24a6fb7545 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Jul 2022 10:20:42 +0000
Subject: [PATCH 068/429] Bump hianalytics from 6.5.0.300 to 6.6.0.300 (#1919)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 91c45876..588f8dcc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,7 +247,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:21.0.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.5.0.300'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.6.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From 7c4f1c7b22a8a67df9c5575ab74b7651555e4b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 12 Jul 2022 12:23:55 +0200
Subject: [PATCH 069/429] Add auto refresh to reporting units (#1916)

---
 .../repositories/ReportingUnitRepository.kt   | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
index b9caf978..84055cef 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
@@ -5,6 +5,8 @@ import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import javax.inject.Inject
@@ -13,30 +15,39 @@ import javax.inject.Singleton
 @Singleton
 class ReportingUnitRepository @Inject constructor(
     private val reportingUnitDb: ReportingUnitDao,
-    private val sdk: Sdk
+    private val sdk: Sdk,
+    private val refreshHelper: AutoRefreshHelper,
 ) {
 
+    private val cacheKey = "reporting_unit"
+
     suspend fun refreshReportingUnits(student: Student) {
         val new = sdk.init(student).getReportingUnits().mapToEntities(student)
         val old = reportingUnitDb.load(student.id.toInt())
 
         reportingUnitDb.deleteAll(old.uniqueSubtract(new))
         reportingUnitDb.insertAll(new.uniqueSubtract(old))
+
+        refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
     }
 
     suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        return reportingUnitDb.load(student.id.toInt()).ifEmpty {
-            refreshReportingUnits(student)
+        val cached = reportingUnitDb.load(student.id.toInt())
+        val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
 
+        return if (cached.isEmpty() || isExpired) {
+            refreshReportingUnits(student)
             reportingUnitDb.load(student.id.toInt())
-        }
+        } else cached
     }
 
     suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
-        return reportingUnitDb.loadOne(student.id.toInt(), unitId) ?: run {
-            refreshReportingUnits(student)
+        val cached = reportingUnitDb.loadOne(student.id.toInt(), unitId)
+        val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
 
-            return reportingUnitDb.loadOne(student.id.toInt(), unitId)
-        }
+        return if (cached == null || isExpired) {
+            refreshReportingUnits(student)
+            reportingUnitDb.loadOne(student.id.toInt(), unitId)
+        } else cached
     }
 }

From fd18583df2ce86969eeab953754c7f7680448d01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 21:28:20 +0000
Subject: [PATCH 070/429] Bump play-services-ads from 21.0.0 to 21.1.0 (#1922)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 588f8dcc..b51c87f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -245,7 +245,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:21.0.0'
+    playImplementation 'com.google.android.gms:play-services-ads:21.1.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.6.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.0.300'

From 08c9539abee8d52ecd3b16738056333ba1aee665 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 21:28:37 +0000
Subject: [PATCH 071/429] Bump coroutines from 1.6.3 to 1.6.4 (#1921)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b51c87f1..0a848a44 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -180,7 +180,7 @@ ext {
     room = "2.4.2"
     chucker = "3.5.2"
     mockk = "1.12.4"
-    coroutines = "1.6.3"
+    coroutines = "1.6.4"
 }
 
 dependencies {

From dfc4553fc61540aae4bf84f28b4474f1469ab3c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 21:28:53 +0000
Subject: [PATCH 072/429] Bump firebase-bom from 30.2.0 to 30.3.0 (#1920)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0a848a44..d5df6579 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,7 +239,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.7.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.2.0')
+    playImplementation platform('com.google.firebase:firebase-bom:30.3.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From b9be85d99cc11c526431931bf927c52e9a1d446b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Jul 2022 10:09:28 +0000
Subject: [PATCH 073/429] Bump hilt_version from 2.42 to 2.43 (#1923)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 71eb2def..bb9afab3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.7.10'
         about_libraries = '10.3.1'
-        hilt_version = "2.42"
+        hilt_version = "2.43"
     }
     repositories {
         mavenCentral()

From efa68f50447f3eb66240cebafb5d156a4e57d780 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:16:46 +0000
Subject: [PATCH 074/429] Bump mockk from 1.12.4 to 1.12.5 (#1933)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d5df6579..2f284d0a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.4.2"
     chucker = "3.5.2"
-    mockk = "1.12.4"
+    mockk = "1.12.5"
     coroutines = "1.6.4"
 }
 

From cf7c6f78eaa7e4f6227b173d30b3bac6b4808539 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:17:00 +0000
Subject: [PATCH 075/429] Bump lifecycle-livedata-ktx from 2.5.0 to 2.5.1
 (#1932)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2f284d0a..2f4f7021 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -212,7 +212,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"

From d337be0f40c3e1becf59178ff813ff295eef7842 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:17:20 +0000
Subject: [PATCH 076/429] Bump firebase-bom from 30.3.0 to 30.3.1 (#1931)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2f4f7021..80e3dab4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,7 +239,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.7.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.3.0')
+    playImplementation platform('com.google.firebase:firebase-bom:30.3.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From c23a90f1043fc19aa0b71095bb71d9625e4e2c63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:17:35 +0000
Subject: [PATCH 077/429] Bump fragment-ktx from 1.5.0 to 1.5.1 (#1930)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 80e3dab4..ac8df81b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,7 +195,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
     implementation "androidx.activity:activity-ktx:1.5.0"
     implementation "androidx.appcompat:appcompat:1.4.2"
-    implementation "androidx.fragment:fragment-ktx:1.5.0"
+    implementation "androidx.fragment:fragment-ktx:1.5.1"
     implementation "androidx.annotation:annotation:1.4.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From cf87339ac40aca6121a863829933cff8f6af935c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:18:52 +0000
Subject: [PATCH 078/429] Bump hilt_version from 2.43 to 2.43.1 (#1927)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bb9afab3..c88cd35f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.7.10'
         about_libraries = '10.3.1'
-        hilt_version = "2.43"
+        hilt_version = "2.43.1"
     }
     repositories {
         mavenCentral()

From 378ed0100f7847ee7a25b9479cb9f188a17a080e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:26:15 +0000
Subject: [PATCH 079/429] Bump huawei-publish-gradle-plugin from 1.3.3 to 1.3.4
 (#1934)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c88cd35f..c4dc9c27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         classpath 'com.huawei.agconnect:agcp:1.7.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
-        classpath "ru.cian:huawei-publish-gradle-plugin:1.3.3"
+        classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"

From 1175740ba22860f27075e12f2c56f4cf6710bc7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:26:34 +0000
Subject: [PATCH 080/429] Bump activity-ktx from 1.5.0 to 1.5.1 (#1926)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac8df81b..4eaa79f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -193,7 +193,7 @@ dependencies {
 
     implementation "androidx.core:core-ktx:1.8.0"
     implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
-    implementation "androidx.activity:activity-ktx:1.5.0"
+    implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "androidx.appcompat:appcompat:1.4.2"
     implementation "androidx.fragment:fragment-ktx:1.5.1"
     implementation "androidx.annotation:annotation:1.4.0"

From b67ecbba4b74bb1336910fe20f0b8ad2754b787f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:26:37 +0000
Subject: [PATCH 081/429] Bump room from 2.4.2 to 2.4.3 (#1928)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4eaa79f1..28aa8584 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,7 +177,7 @@ huaweiPublish {
 ext {
     work_manager = "2.7.1"
     android_hilt = "1.0.0"
-    room = "2.4.2"
+    room = "2.4.3"
     chucker = "3.5.2"
     mockk = "1.12.5"
     coroutines = "1.6.4"

From dc3a941e24d6cf920a9c52b1a9980e2f76e7230d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:36:28 +0000
Subject: [PATCH 082/429] Bump core-splashscreen from 1.0.0-rc01 to 1.0.0
 (#1929)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 28aa8584..542dda10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -192,7 +192,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.8.0"
-    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
+    implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "androidx.appcompat:appcompat:1.4.2"
     implementation "androidx.fragment:fragment-ktx:1.5.1"

From b4117aa62eb66497fc43a5ad7574fefc0207229e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 10:56:41 +0000
Subject: [PATCH 083/429] Bump flow-preferences from 1.7.0 to 1.8.0 (#1925)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 542dda10..a4549f08 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -237,7 +237,7 @@ dependencies {
     implementation "io.coil-kt:coil:2.1.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-    implementation 'com.fredporciuncula:flow-preferences:1.7.0'
+    implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
     playImplementation platform('com.google.firebase:firebase-bom:30.3.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'

From 9339e7d9168a695656fb88c5678f008dfee2308e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:27:24 +0000
Subject: [PATCH 084/429] Bump gradle from 7.2.1 to 7.2.2 (#1942)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c4dc9c27..35665b25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.huawei.agconnect:agcp:1.7.0.300'

From 96067946d034845495ae7ed074ad9a495cb1c494 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:27:46 +0000
Subject: [PATCH 085/429] Bump firebase-bom from 30.3.1 to 30.3.2 (#1940)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a4549f08..f8cb8440 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,7 +239,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.3.1')
+    playImplementation platform('com.google.firebase:firebase-bom:30.3.2')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From ffc0cd840b37b38630ab2b5ca360b5805421ac0e Mon Sep 17 00:00:00 2001
From: Patryk <43276401+Zaptyp@users.noreply.github.com>
Date: Wed, 10 Aug 2022 11:28:22 +0200
Subject: [PATCH 086/429] Update workflow dependency (#1937)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 .github/workflows/deploy-store.yml | 20 +++++----
 .github/workflows/deploy-test.yml  | 20 +++++----
 .github/workflows/test.yml         | 66 +++++++++++++++++++++++++++---
 app/build.gradle                   | 16 ++++----
 build.gradle                       |  2 +-
 5 files changed, 92 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
index 12338fef..cfb0fb52 100644
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@@ -1,4 +1,4 @@
-name: Deploy to app stores
+name: Deploy release
 
 on:
   release:
@@ -7,16 +7,17 @@ on:
 jobs:
 
   deploy-google-play:
-    name: Deploy to google play
+    name: Google Play
     runs-on: ubuntu-latest
     timeout-minutes: 10
     environment: google-play
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -41,16 +42,17 @@ jobs:
         run: ./gradlew publishPlayReleaseApps -PenableFirebase --stacktrace;
 
   deploy-app-gallery:
-    name: Deploy to AppGallery
+    name: AppGallery
     runs-on: ubuntu-latest
     timeout-minutes: 10
     environment: app-gallery
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
index 88edca05..20082590 100644
--- a/.github/workflows/deploy-test.yml
+++ b/.github/workflows/deploy-test.yml
@@ -1,4 +1,4 @@
-name: Deploy to app tests
+name: Deploy DEV
 
 on:
   push:
@@ -18,11 +18,12 @@ jobs:
     timeout-minutes: 10
     environment: app-center
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -66,7 +67,7 @@ jobs:
           BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
         run: ./gradlew assembleFdroidDebug --stacktrace
       - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wulkanowyDEV-${{ env.RUN_NUMBER }}.apk
           path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk
@@ -87,11 +88,12 @@ jobs:
     environment: app-distribution
     if: github.event_name != 'pull_request_target'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -131,7 +133,7 @@ jobs:
           BITRISE_KEY_PASSWORD: ${{ secrets.BITRISE_KEY_PASSWORD }}
         run: ./gradlew assemblePlayDebug -PenableFirebase --stacktrace
       - name: Upload apk to github artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wulkanowyDEV-${{ env.RUN_NUMBER }}-dev.apk
           path: app/build/outputs/apk/play/debug/app-play-debug.apk
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ee16041f..3def0895 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,18 +8,20 @@ on:
     branches: [ master, develop ]
 
 jobs:
-  unit-tests:
-      name: Unit tests
+
+  tests-fdroid:
+      name: F-Droid
       runs-on: ubuntu-latest
       timeout-minutes: 10
       steps:
         - uses: fkirc/skip-duplicate-actions@master
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
         - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v1
+        - uses: actions/setup-java@v2
           with:
+            distribution: 'zulu'
             java-version: 11
-        - uses: actions/cache@v2
+        - uses: actions/cache@v3
           with:
             path: |
               ~/.gradle/caches
@@ -29,6 +31,58 @@ jobs:
           run: |
             ./gradlew testFdroidDebugUnitTest --stacktrace
             ./gradlew jacocoTestReport --stacktrace
-        - uses: codecov/codecov-action@v1
+        - uses: codecov/codecov-action@v3
+          with:
+              flags: unit
+
+  tests-play:
+      name: Play
+      runs-on: ubuntu-latest
+      timeout-minutes: 10
+      steps:
+        - uses: fkirc/skip-duplicate-actions@master
+        - uses: actions/checkout@v3
+        - uses: gradle/wrapper-validation-action@v1
+        - uses: actions/setup-java@v2
+          with:
+            distribution: 'zulu'
+            java-version: 11
+        - uses: actions/cache@v3
+          with:
+            path: |
+              ~/.gradle/caches
+              ~/.gradle/wrapper
+            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+        - name: Unit tests
+          run: |
+            ./gradlew testPlayDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
+        - uses: codecov/codecov-action@v3
+          with:
+              flags: unit
+
+  tests-hms:
+      name: HMS
+      runs-on: ubuntu-latest
+      timeout-minutes: 10
+      steps:
+        - uses: fkirc/skip-duplicate-actions@master
+        - uses: actions/checkout@v3
+        - uses: gradle/wrapper-validation-action@v1
+        - uses: actions/setup-java@v2
+          with:
+            distribution: 'zulu'
+            java-version: 11
+        - uses: actions/cache@v3
+          with:
+            path: |
+              ~/.gradle/caches
+              ~/.gradle/wrapper
+            key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
+        - name: Unit tests
+          run: |
+            ./gradlew testHmsDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
+        - uses: codecov/codecov-action@v3
           with:
               flags: unit
diff --git a/app/build.gradle b/app/build.gradle
index f8cb8440..78eebff8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,14 +30,14 @@ android {
         resValue "string", "app_name", "Wulkanowy"
 
         manifestPlaceholders = [
-                firebase_enabled: project.hasProperty("enableFirebase"),
-                admob_project_id: ""
+            firebase_enabled: project.hasProperty("enableFirebase"),
+            admob_project_id: ""
         ]
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments += [
-                        "room.schemaLocation": "$projectDir/schemas".toString(),
-                        "room.incremental"   : "true"
+                    "room.schemaLocation": "$projectDir/schemas".toString(),
+                    "room.incremental"   : "true"
                 ]
             }
         }
@@ -96,8 +96,8 @@ android {
         play {
             dimension "platform"
             manifestPlaceholders = [
-                    install_channel : "Google Play",
-                    admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
+                install_channel : "Google Play",
+                admob_project_id: System.getenv("ADMOB_PROJECT_ID") ?: "ca-app-pub-3940256099942544~3347511713"
             ]
             buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "\"${System.getenv("SINGLE_SUPPORT_AD_ID") ?: "ca-app-pub-3940256099942544/5354046379"}\""
             buildConfigField "String", "DASHBOARD_TILE_AD_ID", "\"${System.getenv("DASHBOARD_TILE_AD_ID") ?: "ca-app-pub-3940256099942544/6300978111"}\""
@@ -126,6 +126,8 @@ android {
 
     testOptions.unitTests {
         includeAndroidResources = true
+        // workaround HMS test errors https://github.com/robolectric/robolectric/issues/2750
+        all { jvmArgs '-noverify' }
     }
 
     compileOptions {
@@ -184,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:16811fbe90"
+    implementation "io.github.wulkanowy:sdk:9032e33686"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
diff --git a/build.gradle b/build.gradle
index 35665b25..84ed29b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.7.10'
         about_libraries = '10.3.1'
-        hilt_version = "2.43.1"
+        hilt_version = "2.43.2"
     }
     repositories {
         mavenCentral()

From c55fd9817991081e24ee9cf1a49fc28eb406c001 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:37:53 +0000
Subject: [PATCH 087/429] Bump about_libraries from 10.3.1 to 10.4.0 (#1941)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 84ed29b9..bc4ca519 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.7.10'
-        about_libraries = '10.3.1'
+        about_libraries = '10.4.0'
         hilt_version = "2.43.2"
     }
     repositories {

From 5a884a4c56117a04fd21916c2c59c28f70d3439a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:38:15 +0000
Subject: [PATCH 088/429] Bump agcp from 1.7.0.300 to 1.7.1.300 (#1938)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bc4ca519..98c9dfb8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'com.huawei.agconnect:agcp:1.7.0.300'
+        classpath 'com.huawei.agconnect:agcp:1.7.1.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"

From 274f9dde07249c79277cc6d5cde1452dfb40fc4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:48:02 +0000
Subject: [PATCH 089/429] Bump agconnect-crash from 1.7.0.300 to 1.7.1.300
 (#1943)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 78eebff8..52b2aad3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -250,7 +250,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:21.1.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.6.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.0.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.1.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From d64a21b50c2ddee1cce67a5cd02483504df1e1a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 09:56:20 +0000
Subject: [PATCH 090/429] Bump hianalytics from 6.6.0.300 to 6.7.0.300 (#1944)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 52b2aad3..1f68b65c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -249,7 +249,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:21.1.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.6.0.300'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.7.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.1.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From 793952cb4479d0838d8dedff5467bf99d60d3ce1 Mon Sep 17 00:00:00 2001
From: Patryk <43276401+Zaptyp@users.noreply.github.com>
Date: Sun, 14 Aug 2022 22:16:47 +0200
Subject: [PATCH 091/429] Fix typo in README DE.md (#1936)

* Update README.de.md

* Change in README-DE.md file
---
 README.de.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.de.md b/README.de.md
index 3f806e9f..b9e1d1ec 100644
--- a/README.de.md
+++ b/README.de.md
@@ -51,7 +51,7 @@ Die aktuelle Version können Sie von der Google Play, F-Droid oder Huawei AppGal
     alt="Explore it on AppGallery"
     height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
     
-Sie können auch ein [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) das beinhaltet neue Funktionen, die für die nächste Version vorbereitet werden
+Sie können auch eine [Entwicklungsversion herunterladen](https://wulkanowy.github.io/#download) die beinhaltet neue Funktionen, die für die nächste Version vorbereitet werden
 
 ## Gebaut mit
 

From 9fe1151a043ba337816269fc0e485d2c356a7d34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Aug 2022 22:22:47 +0000
Subject: [PATCH 092/429] Bump fragment-ktx from 1.5.1 to 1.5.2 (#1947)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1f68b65c..eace462d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,7 +197,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "androidx.appcompat:appcompat:1.4.2"
-    implementation "androidx.fragment:fragment-ktx:1.5.1"
+    implementation "androidx.fragment:fragment-ktx:1.5.2"
     implementation "androidx.annotation:annotation:1.4.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From 08a3bd77bde75f066099f276d887b9d44615a7f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 07:00:10 +0000
Subject: [PATCH 093/429] Bump appcompat from 1.4.2 to 1.5.0 (#1946)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index eace462d..6d33ac47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,7 +196,7 @@ dependencies {
     implementation "androidx.core:core-ktx:1.8.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.5.1"
-    implementation "androidx.appcompat:appcompat:1.4.2"
+    implementation "androidx.appcompat:appcompat:1.5.0"
     implementation "androidx.fragment:fragment-ktx:1.5.2"
     implementation "androidx.annotation:annotation:1.4.0"
 

From 9d47127921d5a1d8bff07bb708e284f00ef10bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 22 Aug 2022 14:30:50 +0200
Subject: [PATCH 094/429] Add support for messages plus API (#1945)

---
 app/build.gradle                              |    2 +-
 .../51.json                                   | 2409 +++++++++++++++++
 .../io/github/wulkanowy/data/DataModule.kt    |    4 +-
 .../github/wulkanowy/data/db/AppDatabase.kt   |    9 +-
 .../wulkanowy/data/db/dao/MailboxDao.kt       |   17 +
 .../wulkanowy/data/db/dao/MessagesDao.kt      |    8 +-
 .../wulkanowy/data/db/dao/RecipientDao.kt     |    5 +-
 .../wulkanowy/data/db/dao/ReportingUnitDao.kt |   17 -
 .../wulkanowy/data/db/entities/Mailbox.kt     |   25 +
 .../wulkanowy/data/db/entities/Message.kt     |   27 +-
 .../data/db/entities/MessageAttachment.kt     |    7 +-
 .../data/db/entities/MessageWithAttachment.kt |    2 +-
 .../wulkanowy/data/db/entities/Recipient.kt   |   31 +-
 .../data/db/entities/ReportingUnit.kt         |   32 -
 .../data/db/migrations/Migration51.kt         |   88 +
 .../wulkanowy/data/mappers/MailboxMapper.kt   |   18 +
 .../wulkanowy/data/mappers/MessageMapper.kt   |   46 +-
 .../wulkanowy/data/mappers/RecipientMapper.kt |   17 +-
 .../data/mappers/ReportingUnitMapper.kt       |   16 -
 .../data/repositories/MailboxRepository.kt    |   48 +
 .../data/repositories/MessageRepository.kt    |  114 +-
 .../data/repositories/RecipientRepository.kt  |   37 +-
 .../repositories/ReportingUnitRepository.kt   |   53 -
 .../notifications/NewMessageNotification.kt   |    2 +-
 .../services/sync/works/MessageWork.kt        |    7 +-
 .../services/sync/works/RecipientWork.kt      |   15 +-
 .../modules/dashboard/DashboardPresenter.kt   |    4 +-
 .../debug/notification/mock/message.kt        |   13 +-
 .../message/preview/MessagePreviewAdapter.kt  |   26 +-
 .../message/preview/MessagePreviewFragment.kt |    4 +-
 .../preview/MessagePreviewPresenter.kt        |  114 +-
 .../message/preview/MessagePreviewView.kt     |    2 +-
 .../message/send/SendMessageActivity.kt       |   31 +-
 .../message/send/SendMessagePresenter.kt      |  128 +-
 .../modules/message/send/SendMessageView.kt   |   12 +-
 .../modules/message/tab/MessageTabAdapter.kt  |   11 +-
 .../message/tab/MessageTabPresenter.kt        |   22 +-
 .../main/res/layout/activity_send_message.xml |    3 +-
 app/src/main/res/values/strings.xml           |    5 +-
 .../io/github/wulkanowy/TestEnityCreator.kt   |   12 +
 .../repositories/MessageRepositoryTest.kt     |  116 +-
 .../data/repositories/RecipientLocalTest.kt   |   81 +-
 42 files changed, 3065 insertions(+), 575 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/51.json
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration51.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt

diff --git a/app/build.gradle b/app/build.gradle
index 6d33ac47..0efb9c30 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:9032e33686"
+    implementation "io.github.wulkanowy:sdk:dbe87aac"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/51.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/51.json
new file mode 100644
index 00000000..271b8c90
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/51.json
@@ -0,0 +1,2409 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 51,
+    "identityHash": "51f9cb1d80df003c03bb655c0162487c",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `userLoginId` INTEGER NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "userLoginId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalKey"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '51f9cb1d80df003c03bb655c0162487c')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
index cac3ffc2..22123cbe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
@@ -19,7 +19,6 @@ import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AppInfo
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
@@ -110,7 +109,6 @@ internal class DataModule {
     fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
         PreferenceManager.getDefaultSharedPreferences(context)
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Singleton
     @Provides
     fun provideFlowSharedPref(sharedPreferences: SharedPreferences) =
@@ -197,7 +195,7 @@ internal class DataModule {
 
     @Singleton
     @Provides
-    fun provideReportingUnitDao(database: AppDatabase) = database.reportingUnitDao
+    fun provideMailboxesDao(database: AppDatabase) = database.mailboxDao
 
     @Singleton
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 87915a9e..15b38805 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -30,7 +30,7 @@ import javax.inject.Singleton
         Subject::class,
         LuckyNumber::class,
         CompletedLesson::class,
-        ReportingUnit::class,
+        Mailbox::class,
         Recipient::class,
         MobileDevice::class,
         Teacher::class,
@@ -55,7 +55,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 50
+        const val VERSION_SCHEMA = 51
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -103,7 +103,8 @@ abstract class AppDatabase : RoomDatabase() {
             Migration44(),
             Migration46(),
             Migration49(),
-            Migration50()
+            Migration50(),
+            Migration51(),
         )
 
         fun newInstance(
@@ -154,7 +155,7 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val completedLessonsDao: CompletedLessonsDao
 
-    abstract val reportingUnitDao: ReportingUnitDao
+    abstract val mailboxDao: MailboxDao
 
     abstract val recipientDao: RecipientDao
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
new file mode 100644
index 00000000..8589db31
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.Mailbox
+import javax.inject.Singleton
+
+@Singleton
+@Dao
+interface MailboxDao : BaseDao<Mailbox> {
+
+    @Query("SELECT * FROM Mailboxes WHERE userLoginId = :userLoginId ")
+    suspend fun loadAll(userLoginId: Int): List<Mailbox>
+
+    @Query("SELECT * FROM Mailboxes WHERE userLoginId = :userLoginId AND studentName = :studentName ")
+    suspend fun load(userLoginId: Int, studentName: String): Mailbox?
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 729ba6a6..8c730c9b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -11,9 +11,9 @@ import kotlinx.coroutines.flow.Flow
 interface MessagesDao : BaseDao<Message> {
 
     @Transaction
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
-    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment?>
+    @Query("SELECT * FROM Messages WHERE message_global_key = :messageGlobalKey")
+    fun loadMessageWithAttachment(messageGlobalKey: String): Flow<MessageWithAttachment?>
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
-    fun loadAll(studentId: Int, folder: Int): Flow<List<Message>>
+    @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
+    fun loadAll(mailboxKey: String, folder: Int): Flow<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
index c2787ac3..1956261e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Recipient
 import javax.inject.Singleton
 
@@ -9,6 +10,6 @@ import javax.inject.Singleton
 @Dao
 interface RecipientDao : BaseDao<Recipient> {
 
-    @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND unit_id = :unitId AND role = :role")
-    suspend fun loadAll(studentId: Int, unitId: Int, role: Int): List<Recipient>
+    @Query("SELECT * FROM Recipients WHERE type = :type AND studentMailboxGlobalKey = :studentMailboxGlobalKey")
+    suspend fun loadAll(type: MailboxType, studentMailboxGlobalKey: String): List<Recipient>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
deleted file mode 100644
index ca697eda..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.github.wulkanowy.data.db.dao
-
-import androidx.room.Dao
-import androidx.room.Query
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import javax.inject.Singleton
-
-@Singleton
-@Dao
-interface ReportingUnitDao : BaseDao<ReportingUnit> {
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    suspend fun load(studentId: Int): List<ReportingUnit>
-
-    @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    suspend fun loadOne(studentId: Int, unitId: Int): ReportingUnit?
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt
new file mode 100644
index 00000000..7c08e481
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "Mailboxes")
+data class Mailbox(
+
+    @PrimaryKey
+    val globalKey: String,
+    val fullName: String,
+    val userName: String,
+    val userLoginId: Int,
+    val studentName: String,
+    val schoolNameShort: String,
+    val type: MailboxType,
+)
+
+enum class MailboxType {
+    STUDENT,
+    PARENT,
+    GUARDIAN,
+    EMPLOYEE,
+    UNKNOWN,
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 8782bc76..77874e03 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -9,23 +9,16 @@ import java.time.Instant
 @Entity(tableName = "Messages")
 data class Message(
 
-    @ColumnInfo(name = "student_id")
-    val studentId: Long,
+    @ColumnInfo(name = "message_global_key")
+    val messageGlobalKey: String,
 
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
+    @ColumnInfo(name = "mailbox_key")
+    val mailboxKey: String,
 
     @ColumnInfo(name = "message_id")
     val messageId: Int,
 
-    @ColumnInfo(name = "sender_name")
-    val sender: String,
-
-    @ColumnInfo(name = "sender_id")
-    val senderId: Int,
-
-    @ColumnInfo(name = "recipient_name")
-    val recipient: String,
+    val correspondents: String,
 
     val subject: String,
 
@@ -36,8 +29,6 @@ data class Message(
 
     var unread: Boolean,
 
-    val removed: Boolean,
-
     @ColumnInfo(name = "has_attachments")
     val hasAttachments: Boolean
 ) : Serializable {
@@ -48,11 +39,7 @@ data class Message(
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
 
-    @ColumnInfo(name = "unread_by")
-    var unreadBy: Int = 0
-
-    @ColumnInfo(name = "read_by")
-    var readBy: Int = 0
-
     var content: String = ""
+    var sender: String? = null
+    var recipients: String? = null
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
index d1886e91..93f04299 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
@@ -12,11 +12,8 @@ data class MessageAttachment(
     @ColumnInfo(name = "real_id")
     val realId: Int,
 
-    @ColumnInfo(name = "message_id")
-    val messageId: Int,
-
-    @ColumnInfo(name = "one_drive_id")
-    val oneDriveId: String,
+    @ColumnInfo(name = "message_global_key")
+    val messageGlobalKey: String,
 
     @ColumnInfo(name = "url")
     val url: String,
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
index 2e7af0f4..cd468215 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
@@ -7,6 +7,6 @@ data class MessageWithAttachment(
     @Embedded
     val message: Message,
 
-    @Relation(parentColumn = "message_id", entityColumn = "message_id")
+    @Relation(parentColumn = "message_global_key", entityColumn = "message_global_key")
     val attachments: List<MessageAttachment>
 )
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
index 22332270..d09742cd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Recipient.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.data.db.entities
 
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import java.io.Serializable
@@ -8,32 +7,16 @@ import java.io.Serializable
 @kotlinx.serialization.Serializable
 @Entity(tableName = "Recipients")
 data class Recipient(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val realId: String,
-
-    val name: String,
-
-    @ColumnInfo(name = "real_name")
-    val realName: String,
-
-    @ColumnInfo(name = "login_id")
-    val loginId: Int,
-
-    @ColumnInfo(name = "unit_id")
-    val unitId: Int,
-
-    val role: Int,
-
-    val hash: String
-
+    val mailboxGlobalKey: String,
+    val studentMailboxGlobalKey: String,
+    val fullName: String,
+    val userName: String,
+    val schoolShortName: String,
+    val type: MailboxType,
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
 
-    override fun toString() = name
+    override fun toString() = userName
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
deleted file mode 100644
index 0570a2ff..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/ReportingUnit.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.data.db.entities
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
-
-@Entity(tableName = "ReportingUnits")
-data class ReportingUnit(
-
-    @ColumnInfo(name = "student_id")
-    val studentId: Int,
-
-    @ColumnInfo(name = "real_id")
-    val unitId: Int,
-
-    @ColumnInfo(name = "short")
-    val shortName: String,
-
-    @ColumnInfo(name = "sender_id")
-    val senderId: Int,
-
-    @ColumnInfo(name = "sender_name")
-    val senderName: String,
-
-    val roles: List<Int>
-
-) : Serializable {
-
-    @PrimaryKey(autoGenerate = true)
-    var id: Long = 0
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration51.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration51.kt
new file mode 100644
index 00000000..e78e2e3a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration51.kt
@@ -0,0 +1,88 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration51 : Migration(50, 51) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        createMailboxTable(database)
+        recreateMessagesTable(database)
+        recreateMessageAttachmentsTable(database)
+        recreateRecipientsTable(database)
+        deleteReportingUnitTable(database)
+    }
+
+    private fun createMailboxTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Mailboxes")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `Mailboxes` (
+                `globalKey` TEXT NOT NULL,
+                `fullName` TEXT NOT NULL,
+                `userName` TEXT NOT NULL,
+                `userLoginId` INTEGER NOT NULL,
+                `studentName` TEXT NOT NULL,
+                `schoolNameShort` TEXT NOT NULL,
+                `type` TEXT NOT NULL,
+                PRIMARY KEY(`globalKey`)
+            )""".trimIndent()
+        )
+    }
+
+    private fun recreateMessagesTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `Messages` (
+                `message_global_key` TEXT NOT NULL,
+                `mailbox_key` TEXT NOT NULL,
+                `message_id` INTEGER NOT NULL,
+                `correspondents` TEXT NOT NULL,
+                `subject` TEXT NOT NULL,
+                `date` INTEGER NOT NULL,
+                `folder_id` INTEGER NOT NULL,
+                `unread` INTEGER NOT NULL,
+                `has_attachments` INTEGER NOT NULL,
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `is_notified` INTEGER NOT NULL,
+                `content` TEXT NOT NULL,
+                `sender` TEXT, `recipients` TEXT
+            )""".trimIndent()
+        )
+    }
+
+    private fun recreateMessageAttachmentsTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS MessageAttachments")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `MessageAttachments` (
+                `real_id` INTEGER NOT NULL,
+                `message_global_key` TEXT NOT NULL,
+                `url` TEXT NOT NULL,
+                `filename` TEXT NOT NULL,
+                PRIMARY KEY(`real_id`)
+            )""".trimIndent()
+        )
+    }
+
+    private fun recreateRecipientsTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Recipients")
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `Recipients` (
+                `mailboxGlobalKey` TEXT NOT NULL,
+                `studentMailboxGlobalKey` TEXT NOT NULL,
+                `fullName` TEXT NOT NULL,
+                `userName` TEXT NOT NULL,
+                `schoolShortName` TEXT NOT NULL,
+                `type` TEXT NOT NULL,
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
+            )""".trimIndent()
+        )
+    }
+
+    private fun deleteReportingUnitTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS ReportingUnits")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt
new file mode 100644
index 00000000..2ccca1b9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.MailboxType
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.pojo.Mailbox as SdkMailbox
+
+fun List<SdkMailbox>.mapToEntities(student: Student) = map {
+    Mailbox(
+        globalKey = it.globalKey,
+        fullName = it.fullName,
+        userName = it.userName,
+        userLoginId = student.userLoginId,
+        studentName = it.studentName,
+        schoolNameShort = it.schoolNameShort,
+        type = MailboxType.valueOf(it.type.name),
+    )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 13f0ab33..2e7967f0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -1,40 +1,31 @@
 package io.github.wulkanowy.data.mappers
 
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.MessageAttachment
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.Student
-import java.time.Instant
+import io.github.wulkanowy.data.db.entities.*
+import io.github.wulkanowy.sdk.pojo.MailboxType
 import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
-fun List<SdkMessage>.mapToEntities(student: Student) = map {
+fun List<SdkMessage>.mapToEntities(mailbox: Mailbox) = map {
     Message(
-        studentId = student.id,
-        realId = it.id ?: 0,
-        messageId = it.messageId ?: 0,
-        sender = it.sender?.name.orEmpty(),
-        senderId = it.sender?.loginId ?: 0,
-        recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
+        messageGlobalKey = it.globalKey,
+        mailboxKey = mailbox.globalKey,
+        messageId = it.id,
+        correspondents = it.correspondents,
         subject = it.subject.trim(),
-        date = it.dateZoned?.toInstant() ?: Instant.now(),
+        date = it.dateZoned.toInstant(),
         folderId = it.folderId,
-        unread = it.unread ?: false,
-        removed = it.removed,
+        unread = it.unread,
         hasAttachments = it.hasAttachments
     ).apply {
         content = it.content.orEmpty()
-        unreadBy = it.unreadBy ?: 0
-        readBy = it.readBy ?: 0
     }
 }
 
-fun List<SdkMessageAttachment>.mapToEntities() = map {
+fun List<SdkMessageAttachment>.mapToEntities(messageGlobalKey: String) = map {
     MessageAttachment(
-        realId = it.id,
-        messageId = it.messageId,
-        oneDriveId = it.oneDriveId,
+        messageGlobalKey = messageGlobalKey,
+        realId = it.url.hashCode(),
         url = it.url,
         filename = it.filename
     )
@@ -42,12 +33,11 @@ fun List<SdkMessageAttachment>.mapToEntities() = map {
 
 fun List<Recipient>.mapFromEntities() = map {
     SdkRecipient(
-        id = it.realId,
-        name = it.realName,
-        loginId = it.loginId,
-        reportingUnitId = it.unitId,
-        role = it.role,
-        hash = it.hash,
-        shortName = it.name
+        fullName = it.fullName,
+        userName = it.userName,
+        studentName = it.userName,
+        mailboxGlobalKey = it.mailboxGlobalKey,
+        schoolNameShort = it.schoolShortName,
+        type = MailboxType.valueOf(it.type.name),
     )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt
index 80bddaab..eb993a0f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/RecipientMapper.kt
@@ -1,17 +1,16 @@
 package io.github.wulkanowy.data.mappers
 
+import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
-fun List<SdkRecipient>.mapToEntities(userLoginId: Int) = map {
+fun List<SdkRecipient>.mapToEntities(studentMailboxGlobalKey: String) = map {
     Recipient(
-        studentId = userLoginId,
-        realId = it.id,
-        realName = it.name,
-        name = it.shortName,
-        hash = it.hash,
-        loginId = it.loginId,
-        role = it.role,
-        unitId = it.reportingUnitId ?: 0
+        mailboxGlobalKey = it.mailboxGlobalKey,
+        fullName = it.fullName,
+        userName = it.userName,
+        studentMailboxGlobalKey = studentMailboxGlobalKey,
+        schoolShortName = it.schoolNameShort,
+        type = MailboxType.valueOf(it.type.name),
     )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt
deleted file mode 100644
index 6a21d59f..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/ReportingUnitMapper.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.pojo.ReportingUnit as SdkReportingUnit
-
-fun List<SdkReportingUnit>.mapToEntities(student: Student) = map {
-    ReportingUnit(
-        studentId = student.id.toInt(),
-        unitId = it.id,
-        roles = it.roles,
-        senderId = it.senderId,
-        senderName = it.senderName,
-        shortName = it.short
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
new file mode 100644
index 00000000..7f597492
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
@@ -0,0 +1,48 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.MailboxDao
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.github.wulkanowy.utils.getRefreshKey
+import io.github.wulkanowy.utils.init
+import io.github.wulkanowy.utils.uniqueSubtract
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MailboxRepository @Inject constructor(
+    private val mailboxDao: MailboxDao,
+    private val sdk: Sdk,
+    private val refreshHelper: AutoRefreshHelper,
+) {
+    private val cacheKey = "mailboxes"
+
+    suspend fun refreshMailboxes(student: Student) {
+        val new = sdk.init(student).getMailboxes().mapToEntities(student)
+        val old = mailboxDao.loadAll(student.userLoginId)
+
+        mailboxDao.deleteAll(old uniqueSubtract new)
+        mailboxDao.insertAll(new uniqueSubtract old)
+
+        refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
+    }
+
+    suspend fun getMailbox(student: Student): Mailbox {
+        val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
+        val mailbox = mailboxDao.load(student.userLoginId, student.studentName)
+
+        return if (isExpired || mailbox == null) {
+            refreshMailboxes(student)
+            val newMailbox = mailboxDao.load(student.userLoginId, student.studentName)
+
+            requireNotNull(newMailbox) {
+                "Mailbox for ${student.userName} - ${student.studentName} not found!"
+            }
+
+            newMailbox
+        } else mailbox
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index 05fb9765..00cbffb8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -10,24 +10,24 @@ import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MessageDraft
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
-import io.github.wulkanowy.sdk.pojo.SentMessage
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import timber.log.Timber
-import java.time.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -49,7 +49,7 @@ class MessageRepository @Inject constructor(
     @Suppress("UNUSED_PARAMETER")
     fun getMessages(
         student: Student,
-        semester: Semester,
+        mailbox: Mailbox,
         folder: MessageFolder,
         forceRefresh: Boolean,
         notify: Boolean = false,
@@ -62,42 +62,20 @@ class MessageRepository @Inject constructor(
             )
             it.isEmpty() || forceRefresh || isExpired
         },
-        query = { messagesDb.loadAll(student.id.toInt(), folder.id) },
+        query = { messagesDb.loadAll(mailbox.globalKey, folder.id) },
         fetch = {
-            sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now())
-                .mapToEntities(student)
+            sdk.init(student).getMessages(Folder.valueOf(folder.name)).mapToEntities(mailbox)
         },
         saveFetchResult = { old, new ->
             messagesDb.deleteAll(old uniqueSubtract new)
             messagesDb.insertAll((new uniqueSubtract old).onEach {
                 it.isNotified = !notify
             })
-            messagesDb.updateAll(getMessagesWithReadByChange(old, new, !notify))
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder))
         }
     )
 
-    private fun getMessagesWithReadByChange(
-        old: List<Message>,
-        new: List<Message>,
-        setNotified: Boolean
-    ): List<Message> {
-        val oldMeta = old.map { Triple(it, it.readBy, it.unreadBy) }
-        val newMeta = new.map { Triple(it, it.readBy, it.unreadBy) }
-
-        val updatedItems = newMeta uniqueSubtract oldMeta
-
-        return updatedItems.map {
-            val oldItem = old.find { item -> item.messageId == it.first.messageId }
-            it.first.apply {
-                id = oldItem?.id ?: 0
-                isNotified = oldItem?.isNotified ?: setNotified
-                content = oldItem?.content.orEmpty()
-            }
-        }
-    }
-
     fun getMessage(
         student: Student,
         message: Message,
@@ -106,34 +84,34 @@ class MessageRepository @Inject constructor(
         isResultEmpty = { it?.message?.content.isNullOrBlank() },
         shouldFetch = {
             checkNotNull(it) { "This message no longer exist!" }
-            Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
-            it.message.unread || it.message.content.isEmpty()
+            Timber.d("Message content in db empty: ${it.message.content.isBlank()}")
+            it.message.unread || it.message.content.isBlank()
         },
-        query = { messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId) },
+        query = { messagesDb.loadMessageWithAttachment(message.messageGlobalKey) },
         fetch = {
-            sdk.init(student).getMessageDetails(
-                messageId = it!!.message.messageId,
-                folderId = message.folderId,
-                read = markAsRead,
-                id = message.realId
-            ).let { details ->
-                details.content to details.attachments.mapToEntities()
-            }
+            sdk.init(student).getMessageDetails(it!!.message.messageGlobalKey)
         },
-        saveFetchResult = { old, (downloadedMessage, attachments) ->
+        saveFetchResult = { old, new ->
             checkNotNull(old) { "Fetched message no longer exist!" }
-            messagesDb.updateAll(listOf(old.message.apply {
-                id = old.message.id
-                unread = !markAsRead
-                content = content.ifBlank { downloadedMessage }
-            }))
-            messageAttachmentDao.insertAttachments(attachments)
+            messagesDb.updateAll(
+                listOf(old.message.apply {
+                    id = message.id
+                    unread = !markAsRead
+                    sender = new.sender
+                    recipients = new.recipients.firstOrNull() ?: "Wielu adresoatów"
+                    content = content.ifBlank { new.content }
+                })
+            )
+            messageAttachmentDao.insertAttachments(
+                items = new.attachments.mapToEntities(message.messageGlobalKey),
+            )
+
             Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
         }
     )
 
-    fun getMessagesFromDatabase(student: Student): Flow<List<Message>> {
-        return messagesDb.loadAll(student.id.toInt(), RECEIVED.id)
+    fun getMessagesFromDatabase(mailbox: Mailbox): Flow<List<Message>> {
+        return messagesDb.loadAll(mailbox.globalKey, RECEIVED.id)
     }
 
     suspend fun updateMessages(messages: List<Message>) {
@@ -145,32 +123,48 @@ class MessageRepository @Inject constructor(
         subject: String,
         content: String,
         recipients: List<Recipient>,
-    ): SentMessage = sdk.init(student).sendMessage(
-        subject = subject,
-        content = content,
-        recipients = recipients.mapFromEntities()
-    )
+        mailboxId: String,
+    ) {
+        sdk.init(student).sendMessage(
+            subject = subject,
+            content = content,
+            recipients = recipients.mapFromEntities(),
+            mailboxId = mailboxId,
+        )
+    }
 
-    suspend fun deleteMessages(student: Student, messages: List<Message>) {
-        val folderId = messages.first().folderId
-        val isDeleted = sdk.init(student)
-            .deleteMessages(messages = messages.map { it.messageId }, folderId = folderId)
+    suspend fun deleteMessages(student: Student, mailbox: Mailbox, messages: List<Message>) {
+        val firstMessage = messages.first()
+        sdk.init(student).deleteMessages(
+            messages = messages.map { it.messageGlobalKey },
+            removeForever = firstMessage.folderId == TRASHED.id,
+        )
 
-        if (folderId != MessageFolder.TRASHED.id && isDeleted) {
+        if (firstMessage.folderId != TRASHED.id) {
             val deletedMessages = messages.map {
-                it.copy(folderId = MessageFolder.TRASHED.id)
+                it.copy(folderId = TRASHED.id)
                     .apply {
                         id = it.id
                         content = it.content
+                        sender = it.sender
+                        recipients = it.recipients
                     }
             }
 
             messagesDb.updateAll(deletedMessages)
         } else messagesDb.deleteAll(messages)
+
+        getMessages(
+            student = student,
+            mailbox = mailbox,
+            folder = TRASHED,
+            forceRefresh = true,
+        ).first()
     }
 
-    suspend fun deleteMessage(student: Student, message: Message) =
-        deleteMessages(student, listOf(message))
+    suspend fun deleteMessage(student: Student, mailbox: Mailbox, message: Message) {
+        deleteMessages(student, mailbox, listOf(message))
+    }
 
     var draftMessage: MessageDraft?
         get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft))
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
index 60e6f248..e80f028e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
@@ -1,10 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AutoRefreshHelper
@@ -23,9 +20,10 @@ class RecipientRepository @Inject constructor(
 
     private val cacheKey = "recipient"
 
-    suspend fun refreshRecipients(student: Student, unit: ReportingUnit, role: Int) {
-        val new = sdk.init(student).getRecipients(unit.unitId, role).mapToEntities(unit.studentId)
-        val old = recipientDb.loadAll(unit.studentId, unit.unitId, role)
+    suspend fun refreshRecipients(student: Student, mailbox: Mailbox, type: MailboxType) {
+        val new = sdk.init(student).getRecipients(mailbox.globalKey)
+            .mapToEntities(mailbox.globalKey)
+        val old = recipientDb.loadAll(type, mailbox.globalKey)
 
         recipientDb.deleteAll(old uniqueSubtract new)
         recipientDb.insertAll(new uniqueSubtract old)
@@ -33,18 +31,27 @@ class RecipientRepository @Inject constructor(
         refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
     }
 
-    suspend fun getRecipients(student: Student, unit: ReportingUnit, role: Int): List<Recipient> {
-        val cached = recipientDb.loadAll(unit.studentId, unit.unitId, role)
+    suspend fun getRecipients(
+        student: Student,
+        mailbox: Mailbox,
+        type: MailboxType
+    ): List<Recipient> {
+        val cached = recipientDb.loadAll(type, mailbox.globalKey)
 
         val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
         return if (cached.isEmpty() || isExpired) {
-            refreshRecipients(student, unit, role)
-            recipientDb.loadAll(unit.studentId, unit.unitId, role)
+            refreshRecipients(student, mailbox, type)
+            recipientDb.loadAll(type, mailbox.globalKey)
         } else cached
     }
 
-    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
-        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
-            .mapToEntities(student.studentId)
-    }
+    suspend fun getMessageSender(
+        student: Student,
+        mailbox: Mailbox,
+        message: Message
+    ): List<Recipient> = sdk.init(student)
+        .getMessageReplayDetails(message.messageGlobalKey)
+        .sender
+        .let(::listOf)
+        .mapToEntities(mailbox.globalKey)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
deleted file mode 100644
index 84055cef..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ReportingUnitRepository.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.ReportingUnitDao
-import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ReportingUnitRepository @Inject constructor(
-    private val reportingUnitDb: ReportingUnitDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-
-    private val cacheKey = "reporting_unit"
-
-    suspend fun refreshReportingUnits(student: Student) {
-        val new = sdk.init(student).getReportingUnits().mapToEntities(student)
-        val old = reportingUnitDb.load(student.id.toInt())
-
-        reportingUnitDb.deleteAll(old.uniqueSubtract(new))
-        reportingUnitDb.insertAll(new.uniqueSubtract(old))
-
-        refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
-    }
-
-    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
-        val cached = reportingUnitDb.load(student.id.toInt())
-        val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
-
-        return if (cached.isEmpty() || isExpired) {
-            refreshReportingUnits(student)
-            reportingUnitDb.load(student.id.toInt())
-        } else cached
-    }
-
-    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
-        val cached = reportingUnitDb.loadOne(student.id.toInt(), unitId)
-        val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
-
-        return if (cached == null || isExpired) {
-            refreshReportingUnits(student)
-            reportingUnitDb.loadOne(student.id.toInt(), unitId)
-        } else cached
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt
index 5c3c52c5..3b7bcff0 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt
@@ -21,7 +21,7 @@ class NewMessageNotification @Inject constructor(
         val notificationDataList = items.map {
             NotificationData(
                 title = context.getPlural(R.plurals.message_new_items, 1),
-                content = "${it.sender}: ${it.subject}",
+                content = "${it.correspondents}: ${it.subject}",
                 destination = Destination.Message,
             )
         }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index 26fac1a2..18056826 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.repositories.MailboxRepository
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewMessageNotification
@@ -11,19 +12,21 @@ import javax.inject.Inject
 
 class MessageWork @Inject constructor(
     private val messageRepository: MessageRepository,
+    private val mailboxRepository: MailboxRepository,
     private val newMessageNotification: NewMessageNotification,
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
+        val mailbox = mailboxRepository.getMailbox(student)
         messageRepository.getMessages(
             student = student,
-            semester = semester,
+            mailbox = mailbox,
             folder = RECEIVED,
             forceRefresh = true,
             notify = notify
         ).waitForResult()
 
-        messageRepository.getMessagesFromDatabase(student).first()
+        messageRepository.getMessagesFromDatabase(mailbox).first()
             .filter { !it.isNotified && it.unread }.let {
                 if (it.isNotEmpty()) newMessageNotification.notify(it, student)
                 messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
index 425e68b9..b1322ada 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -1,23 +1,22 @@
 package io.github.wulkanowy.services.sync.works
 
+import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.MailboxRepository
 import io.github.wulkanowy.data.repositories.RecipientRepository
-import io.github.wulkanowy.data.repositories.ReportingUnitRepository
 import javax.inject.Inject
 
 class RecipientWork @Inject constructor(
-    private val reportingUnitRepository: ReportingUnitRepository,
+    private val mailboxRepository: MailboxRepository,
     private val recipientRepository: RecipientRepository
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
-        reportingUnitRepository.refreshReportingUnits(student)
+        mailboxRepository.refreshMailboxes(student)
 
-        reportingUnitRepository.getReportingUnits(student).let { units ->
-            units.map {
-                recipientRepository.refreshRecipients(student, it, 2)
-            }
-        }
+        val mailbox = mailboxRepository.getMailbox(student)
+
+        recipientRepository.refreshRecipients(student, mailbox, MailboxType.EMPLOYEE)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index 5d7c7df4..35030093 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -25,6 +25,7 @@ class DashboardPresenter @Inject constructor(
     private val gradeRepository: GradeRepository,
     private val semesterRepository: SemesterRepository,
     private val messageRepository: MessageRepository,
+    private val mailboxRepository: MailboxRepository,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
     private val timetableRepository: TimetableRepository,
     private val homeworkRepository: HomeworkRepository,
@@ -227,6 +228,7 @@ class DashboardPresenter @Inject constructor(
     private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) {
         flow {
             val semester = semesterRepository.getCurrentSemester(student)
+            val mailbox = mailboxRepository.getMailbox(student)
             val selectedTiles = preferencesRepository.selectedDashboardTiles
 
             val flowSuccess = flowOf(Resource.Success(null))
@@ -238,7 +240,7 @@ class DashboardPresenter @Inject constructor(
 
             val messageFLow = messageRepository.getMessages(
                 student = student,
-                semester = semester,
+                mailbox = mailbox,
                 folder = MessageFolder.RECEIVED,
                 forceRefresh = forceRefresh
             ).takeIf { DashboardItem.Tile.MESSAGES in selectedTiles } ?: flowSuccess
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
index 53d43961..6ff26162 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
@@ -17,16 +17,13 @@ val debugMessageItems = listOf(
 )
 
 private fun generateMessage(sender: String, subject: String) = Message(
-    sender = sender,
     subject = subject,
-    studentId = 0,
-    realId = 0,
-    messageId = 0,
-    senderId = 0,
-    recipient = "",
+    messageId = 123,
     date = Instant.now(),
     folderId = 0,
     unread = true,
-    removed = false,
-    hasAttachments = false
+    hasAttachments = false,
+    messageGlobalKey = "",
+    correspondents = sender,
+    mailboxKey = "",
 )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
index d75128be..3c1c53d3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.text.HtmlCompat.FROM_HTML_MODE_COMPACT
+import androidx.core.text.parseAsHtml
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
@@ -75,29 +77,25 @@ class MessagePreviewAdapter @Inject constructor() :
     @SuppressLint("SetTextI18n")
     private fun bindMessage(holder: MessageViewHolder, message: Message) {
         val context = holder.binding.root.context
-        val recipientCount = message.unreadBy + message.readBy
 
-        val readText = when {
-            recipientCount > 1 -> {
-                context.getString(R.string.message_read_by, message.readBy, recipientCount)
-            }
-            message.readBy == 1 -> {
-                context.getString(R.string.message_read, context.getString(R.string.all_yes))
-            }
-            else -> context.getString(R.string.message_read, context.getString(R.string.all_no))
+        val readTextValue = when {
+            !message.unread -> R.string.all_yes
+            else -> R.string.all_no
         }
+        val readText = context.getString(R.string.message_read, context.getString(readTextValue))
 
         with(holder.binding) {
-            messagePreviewSubject.text =
-                message.subject.ifBlank { root.context.getString(R.string.message_no_subject) }
-            messagePreviewDate.text = root.context.getString(
+            messagePreviewSubject.text = message.subject.ifBlank {
+                context.getString(R.string.message_no_subject)
+            }
+            messagePreviewDate.text = context.getString(
                 R.string.message_date,
                 message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
             )
             messagePreviewRead.text = readText
-            messagePreviewContent.text = message.content
+            messagePreviewContent.text = message.content.parseAsHtml(FROM_HTML_MODE_COMPACT)
             messagePreviewFromSender.text = message.sender
-            messagePreviewToRecipient.text = message.recipient
+            messagePreviewToRecipient.text = message.recipients
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 4b2685c6..2a5523f4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -135,8 +135,8 @@ class MessagePreviewFragment :
         binding.messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun showOptions(show: Boolean) {
-        menuReplyButton?.isVisible = show
+    override fun showOptions(show: Boolean, isReplayable: Boolean) {
+        menuReplyButton?.isVisible = isReplayable
         menuForwardButton?.isVisible = show
         menuDeleteButton?.isVisible = show
         menuShareButton?.isVisible = show
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index 39c337bf..c011f41f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -1,10 +1,12 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
 import android.annotation.SuppressLint
+import androidx.core.text.parseAsHtml
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.enums.MessageFolder
+import io.github.wulkanowy.data.repositories.MailboxRepository
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -19,6 +21,7 @@ class MessagePreviewPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
+    private val mailboxRepository: MailboxRepository,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
 
@@ -52,7 +55,7 @@ class MessagePreviewPresenter @Inject constructor(
 
     private fun loadData(messageToLoad: Message) {
         flatResourceFlow {
-            val student = studentRepository.getStudentById(messageToLoad.studentId)
+            val student = studentRepository.getCurrentStudent()
             messageRepository.getMessage(student, messageToLoad, true)
         }
             .logResourceStatus("message ${messageToLoad.messageId} preview")
@@ -104,62 +107,69 @@ class MessagePreviewPresenter @Inject constructor(
     }
 
     fun onShare(): Boolean {
-        message?.let {
-            var text =
-                "Temat: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}\n" + when (it.sender.isNotEmpty()) {
-                    true -> "Od: ${it.sender}\n"
-                    false -> "Do: ${it.recipient}\n"
-                } + "Data: ${it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${it.content}"
+        val message = message ?: return false
+        val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
 
-            attachments?.let { attachments ->
-                if (attachments.isNotEmpty()) {
-                    text += "\n\nZałączniki:"
+        val text = buildString {
+            appendLine("Temat: $subject")
+            appendLine("Od: ${message.sender}")
+            appendLine("Do: ${message.recipients}")
+            appendLine("Data: ${message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}")
 
-                    attachments.forEach { attachment ->
-                        text += "\n${attachment.filename}: ${attachment.url}"
-                    }
-                }
+            appendLine()
+
+            appendLine(message.content.parseAsHtml())
+
+            if (!attachments.isNullOrEmpty()) {
+                appendLine()
+                appendLine("Załączniki:")
+
+                append(attachments.orEmpty().joinToString(separator = "\n") { attachment ->
+                    "${attachment.filename}: ${attachment.url}"
+                })
             }
-
-            view?.shareText(
-                text,
-                "FW: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}"
-            )
-            return true
         }
-        return false
+
+        view?.shareText(
+            subject = "FW: $subject",
+            text = text,
+        )
+        return true
     }
 
     @SuppressLint("NewApi")
     fun onPrint(): Boolean {
-        message?.let {
-            val dateString = it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
-            val infoContent = "<div><h4>Data wysłania</h4>$dateString</div>" + when {
-                it.sender.isNotEmpty() -> "<div><h4>Od</h4>${it.sender}</div>"
-                else -> "<div><h4>Do</h4>${it.recipient}</div>"
-            }
+        val message = message ?: return false
+        val subject = message.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }
 
-            val messageContent = "<p>${it.content}</p>"
-                .replace(Regex("[\\n\\r]{2,}"), "</p><p>")
-                .replace(Regex("[\\n\\r]"), "<br>")
+        val dateString = message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
 
-            val jobName = "Wiadomość " + when {
-                it.sender.isNotEmpty() -> "od ${it.sender}"
-                else -> "do ${it.recipient}"
-            } + " $dateString: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }} | Wulkanowy"
+        val infoContent = buildString {
+            append("<div><h4>Data wysłania</h4>$dateString</div>")
 
-            view?.apply {
-                val html = printHTML
-                    .replace(
-                        "%SUBJECT%",
-                        it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() })
-                    .replace("%CONTENT%", messageContent)
-                    .replace("%INFO%", infoContent)
-                printDocument(html, jobName)
-            }
-            return true
+            append("<div><h4>Od</h4>${message.sender}</div>")
+            append("<div><h4>DO</h4>${message.recipients}</div>")
         }
-        return false
+        val messageContent = "<p>${message.content}</p>"
+            .replace(Regex("[\\n\\r]{2,}"), "</p><p>")
+            .replace(Regex("[\\n\\r]"), "<br>")
+
+        val jobName = buildString {
+            append("Wiadomość ")
+            append("od ${message.correspondents}")
+            append("do ${message.correspondents}")
+            append(" $dateString: $subject | Wulkanowy")
+        }
+
+        view?.apply {
+            val html = printHTML
+                .replace("%SUBJECT%", subject)
+                .replace("%CONTENT%", messageContent)
+                .replace("%INFO%", infoContent)
+            printDocument(html, jobName)
+        }
+
+        return true
     }
 
     private fun deleteMessage() {
@@ -168,16 +178,17 @@ class MessagePreviewPresenter @Inject constructor(
         view?.run {
             showContent(false)
             showProgress(true)
-            showOptions(false)
+            showOptions(show = false, isReplayable = false)
             showErrorView(false)
         }
 
-        Timber.i("Delete message ${message?.id}")
+        Timber.i("Delete message ${message?.messageGlobalKey}")
 
         presenterScope.launch {
             runCatching {
-                val student = studentRepository.getCurrentStudent()
-                messageRepository.deleteMessage(student, message!!)
+                val student = studentRepository.getCurrentStudent(decryptPass = true)
+                val mailbox = mailboxRepository.getMailbox(student)
+                messageRepository.deleteMessage(student, mailbox, message!!)
             }
                 .onFailure {
                     retryCallback = { onMessageDelete() }
@@ -211,7 +222,10 @@ class MessagePreviewPresenter @Inject constructor(
 
     private fun initOptions() {
         view?.apply {
-            showOptions(message != null)
+            showOptions(
+                show = message != null,
+                isReplayable = message?.folderId != MessageFolder.SENT.id,
+            )
             message?.let {
                 when (it.folderId == MessageFolder.TRASHED.id) {
                     true -> setDeletedOptionsLabels()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index 88fe77d9..c5a94793 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -28,7 +28,7 @@ interface MessagePreviewView : BaseView {
 
     fun setErrorRetryCallback(callback: () -> Unit)
 
-    fun showOptions(show: Boolean)
+    fun showOptions(show: Boolean, isReplayable: Boolean)
 
     fun setDeletedOptionsLabels()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 70f9a9b5..334e389e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
+import android.text.Spanned
 import android.view.Menu
 import android.view.MenuItem
 import android.view.TouchDelegate
@@ -13,11 +14,12 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.core.text.parseAsHtml
+import androidx.core.text.toHtml
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.databinding.ActivitySendMessageBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.utils.dpToPx
@@ -72,17 +74,32 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     override val messageSuccess: String
         get() = getString(R.string.message_send_successful)
 
+    override val mailboxStudent: String
+        get() = getString(R.string.message_mailbox_type_student)
+
+    override val mailboxParent: String
+        get() = getString(R.string.message_mailbox_type_parent)
+
+    override val mailboxGuardian: String
+        get() = getString(R.string.message_mailbox_type_guardian)
+
+    override val mailboxEmployee: String
+        get() = getString(R.string.message_mailbox_type_employee)
+
     @Suppress("UNCHECKED_CAST")
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setContentView(
+            ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root
+        )
         setSupportActionBar(binding.sendMessageToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         messageContainer = binding.sendMessageContainer
 
         formRecipientsData = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
         formSubjectValue = binding.sendMessageSubject.text.toString()
-        formContentValue = binding.sendMessageMessageContent.text.toString()
+        formContentValue =
+            binding.sendMessageMessageContent.text.toString().parseAsHtml().toString()
 
         presenter.onAttachView(
             view = this,
@@ -110,7 +127,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     private fun onMessageContentChange(text: CharSequence?) {
-        formContentValue = text.toString()
+        formContentValue = (text as Spanned).toHtml()
         presenter.onMessageContentChange()
     }
 
@@ -132,8 +149,8 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         return presenter.onUpNavigate()
     }
 
-    override fun setReportingUnit(unit: ReportingUnit) {
-        binding.sendMessageFrom.text = unit.senderName
+    override fun setMailbox(mailbox: String) {
+        binding.sendMessageFrom.text = mailbox
     }
 
     override fun setRecipients(recipients: List<RecipientChipItem>) {
@@ -165,7 +182,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun setContent(content: String) {
-        binding.sendMessageMessageContent.setText(content)
+        binding.sendMessageMessageContent.setText(content.parseAsHtml())
     }
 
     override fun showMessage(text: String) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index e5770955..6c07ee6a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.ui.modules.message.send
 
 import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.logResourceStatus
@@ -25,9 +27,8 @@ import javax.inject.Inject
 class SendMessagePresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val semesterRepository: SemesterRepository,
     private val messageRepository: MessageRepository,
-    private val reportingUnitRepository: ReportingUnitRepository,
+    private val mailboxRepository: MailboxRepository,
     private val recipientRepository: RecipientRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: AnalyticsHelper
@@ -52,20 +53,21 @@ class SendMessagePresenter @Inject constructor(
             message?.let {
                 setSubject(
                     when (reply) {
-                        true -> "Re: "
+                        true -> "RE: "
                         else -> "FW: "
                     } + message.subject
                 )
                 if (preferencesRepository.fillMessageContent || reply != true) {
-                    setContent(
-                        when (reply) {
-                            true -> "\n\n"
-                            else -> ""
-                        } + when (message.sender.isNotEmpty()) {
-                            true -> "Od: ${message.sender}\n"
-                            false -> "Do: ${message.recipient}\n"
-                        } + "Data: ${message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${message.content}"
-                    )
+                    setContent(buildString {
+                        if (reply == true) {
+                            append("<br><br>")
+                        }
+
+                        append("Od: ${message.sender}<br>")
+                        append("Do: ${message.recipients}<br>")
+                        append("Data: ${message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}<br><br>")
+                        append(message.content)
+                    })
                 }
             }
         }
@@ -111,21 +113,24 @@ class SendMessagePresenter @Inject constructor(
     private fun loadData(message: Message?, reply: Boolean?) {
         resourceFlow {
             val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            val unit = reportingUnitRepository.getReportingUnit(student, semester.unitId)
+            val mailbox = mailboxRepository.getMailbox(student)
 
             Timber.i("Loading recipients started")
-            val recipients = when {
-                unit != null -> recipientRepository.getRecipients(student, unit, 2)
-                else -> listOf()
-            }.let { createChips(it) }
+            val recipients = createChips(
+                recipients = recipientRepository.getRecipients(
+                    student = student,
+                    mailbox = mailbox,
+                    type = MailboxType.EMPLOYEE,
+                )
+            )
             Timber.i("Loading recipients result: Success, fetched %d recipients", recipients.size)
 
             Timber.i("Loading message recipients started")
             val messageRecipients = when {
-                message != null && reply == true -> recipientRepository.getMessageRecipients(
-                    student,
-                    message
+                message != null && reply == true -> recipientRepository.getMessageSender(
+                    student = student,
+                    message = message,
+                    mailbox = mailbox,
                 )
                 else -> emptyList()
             }.let { createChips(it) }
@@ -134,7 +139,7 @@ class SendMessagePresenter @Inject constructor(
                 messageRecipients.size
             )
 
-            Triple(unit, recipients, messageRecipients)
+            Triple(mailbox, recipients, messageRecipients)
         }
             .logResourceStatus("load recipients")
             .onEach {
@@ -143,19 +148,14 @@ class SendMessagePresenter @Inject constructor(
                         showProgress(true)
                         showContent(false)
                     }
-                    is Resource.Success -> it.data.let { (reportingUnit, recipientChips, selectedRecipientChips) ->
+                    is Resource.Success -> it.data.let { (mailbox, recipientChips, selectedRecipientChips) ->
                         view?.run {
-                            if (reportingUnit != null) {
-                                setReportingUnit(reportingUnit)
-                                setRecipients(recipientChips)
-                                if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(
-                                    selectedRecipientChips
-                                )
-                                showContent(true)
-                            } else {
-                                Timber.i("Loading recipients result: Can't find the reporting unit")
-                                view?.showEmpty(true)
-                            }
+                            setMailbox(getMailboxName(mailbox))
+                            setRecipients(recipientChips)
+                            if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(
+                                selectedRecipientChips
+                            )
+                            showContent(true)
                         }
                     }
                     is Resource.Error -> {
@@ -171,7 +171,14 @@ class SendMessagePresenter @Inject constructor(
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
         resourceFlow {
             val student = studentRepository.getCurrentStudent()
-            messageRepository.sendMessage(student, subject, content, recipients)
+            val mailbox = mailboxRepository.getMailbox(student)
+            messageRepository.sendMessage(
+                student = student,
+                subject = subject,
+                content = content,
+                recipients = recipients,
+                mailboxId = mailbox.globalKey,
+            )
         }.logResourceStatus("sending message").onEach {
             when (it) {
                 is Resource.Loading -> view?.run {
@@ -201,31 +208,44 @@ class SendMessagePresenter @Inject constructor(
     }
 
     private fun createChips(recipients: List<Recipient>): List<RecipientChipItem> {
-        fun generateCorrectSummary(recipientRealName: String): String {
-            val substring = recipientRealName.substringBeforeLast("-")
-            return when {
-                substring == recipientRealName -> recipientRealName
-                substring.indexOf("(") != -1 -> {
-                    recipientRealName.indexOf("(")
-                        .let { recipientRealName.substring(if (it != -1) it else 0) }
-                }
-                substring.indexOf("[") != -1 -> {
-                    recipientRealName.indexOf("[")
-                        .let { recipientRealName.substring(if (it != -1) it else 0) }
-                }
-                else -> recipientRealName.substringAfter("-")
-            }.trim()
-        }
-
         return recipients.map {
             RecipientChipItem(
-                title = it.name,
-                summary = generateCorrectSummary(it.realName),
+                title = it.userName,
+                summary = buildString {
+                    getMailboxType(it.type)?.let(::append)
+                    if (isNotBlank()) append(" ")
+
+                    append("(${it.schoolShortName})")
+                },
                 recipient = it
             )
         }
     }
 
+    private fun getMailboxName(mailbox: Mailbox): String {
+        return buildString {
+            append(mailbox.userName)
+            append(" - ")
+            append(getMailboxType(mailbox.type))
+
+            if (mailbox.type == MailboxType.PARENT) {
+                append(" - ")
+                append(mailbox.studentName)
+            }
+
+            append(" - ")
+            append("(${mailbox.schoolNameShort})")
+        }
+    }
+
+    private fun getMailboxType(type: MailboxType): String? = when (type) {
+        MailboxType.STUDENT -> view?.mailboxStudent
+        MailboxType.PARENT -> view?.mailboxParent
+        MailboxType.GUARDIAN -> view?.mailboxGuardian
+        MailboxType.EMPLOYEE -> view?.mailboxEmployee
+        MailboxType.UNKNOWN -> null
+    }
+
     fun onMessageContentChange() {
         presenterScope.launch {
             messageUpdateChannel.send(Unit)
@@ -263,7 +283,7 @@ class SendMessagePresenter @Inject constructor(
 
     fun getRecipientsNames(): String {
         return messageRepository.draftMessage?.recipients.orEmpty()
-            .joinToString { it.recipient.name }
+            .joinToString { it.recipient.userName }
     }
 
     fun clearDraft() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
index 21b42e3e..1057114b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.send
 
-import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.ui.base.BaseView
 
 interface SendMessageView : BaseView {
@@ -18,9 +18,17 @@ interface SendMessageView : BaseView {
 
     val messageSuccess: String
 
+    val mailboxStudent: String
+
+    val mailboxParent: String
+
+    val mailboxGuardian: String
+
+    val mailboxEmployee: String
+
     fun initView()
 
-    fun setReportingUnit(unit: ReportingUnit)
+    fun setMailbox(mailbox: String)
 
     fun setRecipients(recipients: List<RecipientChipItem>)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
index af0923b9..55f03ef8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -8,7 +8,6 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.databinding.ItemMessageBinding
 import io.github.wulkanowy.databinding.ItemMessageChipsBinding
 import io.github.wulkanowy.utils.toFormattedString
@@ -88,12 +87,8 @@ class MessageTabAdapter @Inject constructor() :
         with(holder.binding) {
             val style = if (message.unread) Typeface.BOLD else Typeface.NORMAL
 
-            messageItemAuthor.run {
-                text = if (message.folderId == MessageFolder.SENT.id) {
-                    message.recipient
-                } else {
-                    message.sender
-                }
+            with(messageItemAuthor) {
+                text = message.correspondents
                 setTypeface(null, style)
             }
             messageItemSubject.run {
@@ -145,7 +140,7 @@ class MessageTabAdapter @Inject constructor() :
             val newItem = new[newItemPosition]
 
             return if (oldItem is MessageTabDataItem.MessageItem && newItem is MessageTabDataItem.MessageItem) {
-                oldItem.message.id == newItem.message.id
+                oldItem.message.messageGlobalKey == newItem.message.messageGlobalKey
             } else {
                 oldItem.viewType == newItem.viewType
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index 870b6433..54711a68 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.ui.modules.message.tab
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.enums.MessageFolder
+import io.github.wulkanowy.data.repositories.MailboxRepository
 import io.github.wulkanowy.data.repositories.MessageRepository
-import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -26,7 +26,7 @@ class MessageTabPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val semesterRepository: SemesterRepository,
+    private val mailboxRepository: MailboxRepository,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<MessageTabView>(errorHandler, studentRepository) {
 
@@ -122,7 +122,8 @@ class MessageTabPresenter @Inject constructor(
 
             runCatching {
                 val student = studentRepository.getCurrentStudent(true)
-                messageRepository.deleteMessages(student, messageList)
+                val mailbox = mailboxRepository.getMailbox(student)
+                messageRepository.deleteMessages(student, mailbox, messageList)
             }
                 .onFailure(errorHandler::dispatch)
                 .onSuccess { view?.showMessagesDeleted() }
@@ -159,7 +160,7 @@ class MessageTabPresenter @Inject constructor(
     }
 
     fun onMessageItemSelected(messageItem: MessageTabDataItem.MessageItem, position: Int) {
-        Timber.i("Select message ${messageItem.message.id} item (position: $position)")
+        Timber.i("Select message ${messageItem.message.messageGlobalKey} item (position: $position)")
 
         if (!isActionMode) {
             view?.run {
@@ -206,8 +207,8 @@ class MessageTabPresenter @Inject constructor(
 
         flatResourceFlow {
             val student = studentRepository.getCurrentStudent()
-            val semester = semesterRepository.getCurrentSemester(student)
-            messageRepository.getMessages(student, semester, folder, forceRefresh)
+            val mailbox = mailboxRepository.getMailbox(student)
+            messageRepository.getMessages(student, mailbox, folder, forceRefresh)
         }
             .logResourceStatus("load $folder message")
             .onResourceData {
@@ -333,7 +334,7 @@ class MessageTabPresenter @Inject constructor(
             addAll(data.map { message ->
                 MessageTabDataItem.MessageItem(
                     message = message,
-                    isSelected = messagesToDelete.any { it.id == message.id },
+                    isSelected = messagesToDelete.any { it.messageGlobalKey == message.messageGlobalKey },
                     isActionMode = isActionMode
                 )
             })
@@ -345,10 +346,9 @@ class MessageTabPresenter @Inject constructor(
     private fun calculateMatchRatio(message: Message, query: String): Int {
         val subjectRatio = FuzzySearch.tokenSortPartialRatio(query.lowercase(), message.subject)
 
-        val senderOrRecipientRatio = FuzzySearch.tokenSortPartialRatio(
+        val correspondentsRatio = FuzzySearch.tokenSortPartialRatio(
             query.lowercase(),
-            if (message.sender.isNotEmpty()) message.sender.lowercase()
-            else message.recipient.lowercase()
+            message.correspondents
         )
 
         val dateRatio = listOf(
@@ -364,7 +364,7 @@ class MessageTabPresenter @Inject constructor(
 
 
         return (subjectRatio.toDouble().pow(2)
-            + senderOrRecipientRatio.toDouble().pow(2)
+            + correspondentsRatio.toDouble().pow(2)
             + dateRatio.toDouble().pow(2) * 2
             ).toInt()
     }
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index 10b581f7..320782bd 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -16,8 +16,7 @@
         app:layout_constraintBottom_toTopOf="@id/sendMessageScroll"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:targetApi="lollipop" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <io.github.wulkanowy.materialchipsinput.ConsumedNestedScrollView
         android:id="@+id/sendMessageScroll"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db591309..2eee4cce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -289,6 +289,10 @@
     <string name="message_move_to_trash">Move to trash</string>
     <string name="message_delete_forever">Delete permanently</string>
     <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
     <string name="message_share">Share</string>
     <string name="message_print">Print</string>
     <string name="message_subject">Subject</string>
@@ -300,7 +304,6 @@
     <string name="message_chip_only_unread">Only unread</string>
     <string name="message_chip_only_with_attachments">Only with attachments</string>
     <string name="message_read">Read: %s</string>
-    <string name="message_read_by">Read by: %1$d of %2$d people</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d message</item>
         <item quantity="other">%1$d messages</item>
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
index 22539930..ff0a5313 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -1,5 +1,7 @@
 package io.github.wulkanowy
 
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
@@ -21,6 +23,16 @@ fun getSemesterEntity(diaryId: Int = 1, semesterId: Int = 1, start: LocalDate =
     end = end
 )
 
+fun getMailboxEntity() = Mailbox(
+    globalKey = "v4",
+    fullName = "",
+    userName = "",
+    userLoginId = 0,
+    studentName = "",
+    schoolNameShort = "",
+    type = MailboxType.UNKNOWN,
+)
+
 fun getSemesterPojo(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1) = SdkSemester(
     diaryId = diaryId,
     kindergartenDiaryId = 0,
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
index 2a5d2e2b..24306bfe 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
@@ -10,12 +10,10 @@ import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.errorOrNull
 import io.github.wulkanowy.data.toFirstResult
-import io.github.wulkanowy.getSemesterEntity
+import io.github.wulkanowy.getMailboxEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
-import io.github.wulkanowy.sdk.pojo.MessageDetails
-import io.github.wulkanowy.sdk.pojo.Sender
 import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.github.wulkanowy.utils.Status
 import io.github.wulkanowy.utils.status
@@ -23,7 +21,6 @@ import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
@@ -60,7 +57,7 @@ class MessageRepositoryTest {
 
     private val student = getStudentEntity()
 
-    private val semester = getSemesterEntity()
+    private val mailbox = getMailboxEntity()
 
     private lateinit var repository: MessageRepository
 
@@ -80,59 +77,18 @@ class MessageRepositoryTest {
         )
     }
 
-    @Test
-    fun `get messages when read by values was changed on already read message`() = runTest {
-        every { messageDb.loadAll(any(), any()) } returns flow {
-            val dbMessage = getMessageEntity(3, "", false).apply {
-                unreadBy = 10
-                readBy = 5
-                isNotified = true
-            }
-            emit(listOf(dbMessage))
-        }
-        coEvery { sdk.getMessages(Folder.RECEIVED, any(), any()) } returns listOf(
-            getMessageDto(messageId = 3, content = "", unread = false).copy(
-                unreadBy = 5,
-                readBy = 10,
-            )
-        )
-        coEvery { messageDb.deleteAll(any()) } just Runs
-        coEvery { messageDb.insertAll(any()) } returns listOf()
-
-        repository.getMessages(
-            student = student,
-            semester = semester,
-            folder = MessageFolder.RECEIVED,
-            forceRefresh = true,
-            notify = true, // all new messages will be marked as not notified
-        ).toFirstResult().dataOrNull.orEmpty()
-
-        coVerify(exactly = 1) { messageDb.deleteAll(emptyList()) }
-        coVerify(exactly = 1) { messageDb.insertAll(emptyList()) }
-        coVerify(exactly = 1) {
-            messageDb.updateAll(withArg {
-                assertEquals(1, it.size)
-                assertEquals(5, it.single().unreadBy)
-                assertEquals(10, it.single().readBy)
-            })
-        }
-    }
-
     @Test
     fun `get messages when fetched completely new message without notify`() = runBlocking {
         every { messageDb.loadAll(any(), any()) } returns flowOf(emptyList())
-        coEvery { sdk.getMessages(Folder.RECEIVED, any(), any()) } returns listOf(
-            getMessageDto(messageId = 4, content = "Test", unread = true).copy(
-                unreadBy = 5,
-                readBy = 10,
-            )
+        coEvery { sdk.getMessages(Folder.RECEIVED, any()) } returns listOf(
+            getMessageDto()
         )
         coEvery { messageDb.deleteAll(any()) } just Runs
         coEvery { messageDb.insertAll(any()) } returns listOf()
 
         repository.getMessages(
             student = student,
-            semester = semester,
+            mailbox = mailbox,
             folder = MessageFolder.RECEIVED,
             forceRefresh = true,
             notify = false,
@@ -151,7 +107,7 @@ class MessageRepositoryTest {
     fun `throw error when message is not in the db`() {
         val testMessage = getMessageEntity(1, "", false)
         coEvery {
-            messageDb.loadMessageWithAttachment(1, 1)
+            messageDb.loadMessageWithAttachment("v4")
         } throws NoSuchElementException("No message in database")
 
         runBlocking { repository.getMessage(student, testMessage).toFirstResult() }
@@ -162,7 +118,7 @@ class MessageRepositoryTest {
         val testMessage = getMessageEntity(123, "Test", false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returns flowOf(
+        coEvery { messageDb.loadMessageWithAttachment("v4") } returns flowOf(
             messageWithAttachment
         )
 
@@ -174,7 +130,7 @@ class MessageRepositoryTest {
     }
 
     @Test
-    fun `get message when content in db is empty`() {
+    fun `get message when content in db is empty`() = runTest {
         val testMessage = getMessageEntity(123, "", true)
         val testMessageWithContent = testMessage.copy().apply { content = "Test" }
 
@@ -182,23 +138,19 @@ class MessageRepositoryTest {
         val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
 
         coEvery {
-            messageDb.loadMessageWithAttachment(
-                1,
-                testMessage.messageId
-            )
+            messageDb.loadMessageWithAttachment("v4")
         } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
         coEvery {
-            sdk.getMessageDetails(
-                messageId = testMessage.messageId,
-                folderId = 1,
-                read = false,
-                id = testMessage.realId
-            )
-        } returns MessageDetails("Test", emptyList())
+            sdk.getMessageDetails("v4")
+        } returns mockk {
+            every { sender } returns ""
+            every { recipients } returns listOf("")
+            every { attachments } returns listOf()
+        }
         coEvery { messageDb.updateAll(any()) } just Runs
         coEvery { messageAttachmentDao.insertAttachments(any()) } returns listOf(1)
 
-        val res = runBlocking { repository.getMessage(student, testMessage).toFirstResult() }
+        val res = repository.getMessage(student, testMessage).toFirstResult()
 
         assertEquals(null, res.errorOrNull)
         assertEquals(Status.SUCCESS, res.status)
@@ -211,7 +163,7 @@ class MessageRepositoryTest {
         val testMessage = getMessageEntity(123, "", false)
 
         coEvery {
-            messageDb.loadMessageWithAttachment(1, testMessage.messageId)
+            messageDb.loadMessageWithAttachment("v4")
         } throws UnknownHostException()
 
         runBlocking { repository.getMessage(student, testMessage).toFirstResult() }
@@ -222,7 +174,7 @@ class MessageRepositoryTest {
         val testMessage = getMessageEntity(123, "", true)
 
         coEvery {
-            messageDb.loadMessageWithAttachment(1, testMessage.messageId)
+            messageDb.loadMessageWithAttachment("v4")
         } throws UnknownHostException()
 
         runBlocking { repository.getMessage(student, testMessage).toList()[1] }
@@ -233,42 +185,30 @@ class MessageRepositoryTest {
         content: String,
         unread: Boolean
     ) = Message(
-        studentId = 1,
-        realId = 1,
+        messageGlobalKey = "v4",
+        mailboxKey = "",
+        correspondents = "",
         messageId = messageId,
-        sender = "",
-        senderId = 0,
-        recipient = "Wielu adresatów",
         subject = "",
         date = Instant.EPOCH,
         folderId = 1,
         unread = unread,
-        removed = false,
         hasAttachments = false
     ).apply {
         this.content = content
-        unreadBy = 1
-        readBy = 1
     }
 
-    private fun getMessageDto(
-        messageId: Int,
-        content: String,
-        unread: Boolean,
-    ) = io.github.wulkanowy.sdk.pojo.Message(
-        id = 1,
-        messageId = messageId,
-        sender = Sender("", "", 0, 0, 0, ""),
+    private fun getMessageDto() = io.github.wulkanowy.sdk.pojo.Message(
+        globalKey = "v4",
+        mailbox = "",
+        correspondents = "",
+        id = 4,
         recipients = listOf(),
         subject = "",
-        content = content,
-        date = Instant.EPOCH.atZone(ZoneOffset.UTC).toLocalDateTime(),
+        content = "Test",
         dateZoned = Instant.EPOCH.atZone(ZoneOffset.UTC),
         folderId = 1,
-        unread = unread,
-        unreadBy = 0,
-        readBy = 0,
-        removed = false,
+        unread = true,
         hasAttachments = false,
     )
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
index 980abac0..ae73a795 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/RecipientLocalTest.kt
@@ -1,19 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.RecipientDao
-import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.getMailboxEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.MailboxType
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.MockKAnnotations
-import io.mockk.Runs
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
+import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import io.mockk.just
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -36,9 +32,30 @@ class RecipientLocalTest {
     private lateinit var recipientRepository: RecipientRepository
 
     private val remoteList = listOf(
-        SdkRecipient("2rPracownik", "Kowalski Jan", 3, 4, 2, "hash", "Kowalski Jan [KJ] - Pracownik (Fake123456)"),
-        SdkRecipient("3rPracownik", "Kowalska Karolina", 4, 4, 2, "hash", "Kowalska Karolina [KK] - Pracownik (Fake123456)"),
-        SdkRecipient("4rPracownik", "Krupa Stanisław", 5, 4, 1, "hash", "Krupa Stanisław [KS] - Uczeń (Fake123456)")
+        SdkRecipient(
+            mailboxGlobalKey = "2rPracownik",
+            userName = "Kowalski Jan",
+            fullName = "Kowalski Jan [KJ] - Pracownik (Fake123456)",
+            studentName = "",
+            schoolNameShort = "",
+            type = MailboxType.UNKNOWN,
+        ),
+        SdkRecipient(
+            mailboxGlobalKey = "3rPracownik",
+            userName = "Kowalska Karolina",
+            fullName = "Kowalska Karolina [KK] - Pracownik (Fake123456)",
+            studentName = "",
+            schoolNameShort = "",
+            type = MailboxType.UNKNOWN,
+        ),
+        SdkRecipient(
+            mailboxGlobalKey = "4rPracownik",
+            userName = "Krupa Stanisław",
+            fullName = "Krupa Stanisław [KS] - Uczeń (Fake123456)",
+            studentName = "",
+            schoolNameShort = "",
+            type = MailboxType.UNKNOWN,
+        )
     )
 
     @Before
@@ -52,39 +69,61 @@ class RecipientLocalTest {
     @Test
     fun `load recipients when items already in database`() {
         // prepare
-        coEvery { recipientDb.loadAll(4, 123, 7) } returnsMany listOf(
-            remoteList.mapToEntities(4),
-            remoteList.mapToEntities(4)
+        coEvery { recipientDb.loadAll(io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN, "v4") } returnsMany listOf(
+            remoteList.mapToEntities("v4"),
+            remoteList.mapToEntities("v4")
         )
         coEvery { recipientDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { recipientDb.deleteAll(any()) } just Runs
 
         // execute
-        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(4, 123, "", 4, "", listOf()), 7) }
+        val res = runBlocking {
+            recipientRepository.getRecipients(
+                student = student,
+                mailbox = getMailboxEntity(),
+                type = io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN,
+            )
+        }
 
         // verify
         assertEquals(3, res.size)
-        coVerify { recipientDb.loadAll(4, 123, 7) }
+        coVerify {
+            recipientDb.loadAll(
+                type = io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN,
+                studentMailboxGlobalKey = "v4"
+            )
+        }
     }
 
     @Test
     fun `load recipients when database is empty`() {
         // prepare
-        coEvery { sdk.getRecipients(123, 7) } returns remoteList
-        coEvery { recipientDb.loadAll(4, 123, 7) } returnsMany listOf(
+        coEvery { sdk.getRecipients("v4") } returns remoteList
+        coEvery {
+            recipientDb.loadAll(
+                io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN,
+                "v4"
+            )
+        } returnsMany listOf(
             emptyList(),
-            remoteList.mapToEntities(4)
+            remoteList.mapToEntities("v4")
         )
         coEvery { recipientDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { recipientDb.deleteAll(any()) } just Runs
 
         // execute
-        val res = runBlocking { recipientRepository.getRecipients(student, ReportingUnit(4, 123, "", 4, "", listOf()), 7) }
+        val res = runBlocking {
+            recipientRepository.getRecipients(
+                student = student,
+                mailbox = getMailboxEntity(),
+                type = io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN,
+            )
+        }
 
         // verify
         assertEquals(3, res.size)
-        coVerify { sdk.getRecipients(123, 7) }
-        coVerify { recipientDb.loadAll(4, 123, 7) }
+        coVerify { sdk.getRecipients("v4") }
+        coVerify { recipientDb.loadAll(io.github.wulkanowy.data.db.entities.MailboxType.UNKNOWN, "v4") }
         coVerify { recipientDb.insertAll(match { it.isEmpty() }) }
         coVerify { recipientDb.deleteAll(match { it.isEmpty() }) }
     }

From bc0689a30df9ac9c7b35a802256e1922dbbe8264 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 13:28:27 +0000
Subject: [PATCH 095/429] Bump coil from 2.1.0 to 2.2.0 (#1949)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0efb9c30..d86f5f43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -236,7 +236,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.1.0"
+    implementation "io.coil-kt:coil:2.2.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'

From d9e22af5ef0672de79b122af8dfca08b5743ca49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 13:28:58 +0000
Subject: [PATCH 096/429] Bump desugar_jdk_libs from 1.1.5 to 1.1.6 (#1948)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d86f5f43..efa9b3e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ ext {
 dependencies {
     implementation "io.github.wulkanowy:sdk:dbe87aac"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"

From 71f1a55437e3b447b8d3e6b4fa87713c3f382027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 22 Aug 2022 16:45:59 +0200
Subject: [PATCH 097/429] New Crowdin updates (#1895)

---
 .../main/res/values-cs/preferences_values.xml    |  2 +-
 app/src/main/res/values-cs/strings.xml           | 14 ++++++++++++--
 .../main/res/values-de/preferences_values.xml    |  2 +-
 app/src/main/res/values-de/strings.xml           | 14 ++++++++++++--
 app/src/main/res/values-pl/strings.xml           | 16 +++++++++++++---
 app/src/main/res/values-ru/strings.xml           | 14 ++++++++++++--
 .../main/res/values-sk/preferences_values.xml    |  2 +-
 app/src/main/res/values-sk/strings.xml           | 16 +++++++++++++---
 app/src/main/res/values-uk/strings.xml           | 14 ++++++++++++--
 9 files changed, 77 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
index c8731372..23073adf 100644
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@@ -34,7 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Abecedně</item>
         <item>Podle data</item>
-        <item>By average</item>
+        <item>Podle průměru</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 11054a0e..5f76bb6e 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -77,6 +77,9 @@
     <string name="main_log_in">Přihlásit se</string>
     <string name="main_session_expired">Relace vypršela</string>
     <string name="main_session_relogin">Relace vypršela. Přihlaste se prosím znovu</string>
+    <string name="main_support_title">Podpora aplikace</string>
+    <string name="main_support_description">Líbí se Vám tato aplikace? Podpořte její vývoj tím, že povolíte neinvazivní reklamy, které můžete kdykoliv vypnout</string>
+    <string name="main_support_positive">Zapnout reklamy</string>
     <!--Grade-->
     <string name="grade_header">Známka</string>
     <string name="grade_semester">Semestr %d</string>
@@ -94,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Předpokládaná známka</string>
     <string name="grade_summary_calculated_average">Vypočítaný průměr</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Jak funguje vypočítaný průměr?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Vypočítaný průměr je aritmetický průměr vypočítaný z průměrů předmětů. Umožňuje vám to znát přibližný konečný průměr. Vypočítává se způsobem zvoleným uživatelem v nastavení aplikaci. Doporučuje se vybrat příslušnou možnost. Důvodem je rozdílný výpočet školních průměrů. Pokud vaše škola navíc uvádí průměr předmětů na stránce deníku Vulcan, aplikace si je stáhne a tyto průměry nepočítá. To lze změnit vynucením výpočtu průměru v nastavení aplikaci.\n\n<b>Průměr známek pouze z vybraného semestru</b>:\n1. Výpočet váženého průměru pro každý předmět v daném semestru\n2. Sčítání vypočítaných průměrů\n3. Výpočet aritmetického průměru součtených průměrů\n\n<b>Průměr průměrů z obou semestrů</b>:\n1. Výpočet váženého průměru pro každý předmět v semestru 1 a 2\n2. Výpočet aritmetického průměru vypočítaných průměrů za semestry 1 a 2 pro každý předmět.\n3. Sčítání vypočítaných průměrů\n4. Výpočet aritmetického průměru sečtených průměrů\n\n<b>Průměr známek z celého roku:</b>\n1. Výpočet váženého průměru za rok pro každý předmět. Konečný průměr v 1. semestru je nepodstatný.\n3. Sčítání vypočítaných průměrů\n4. Výpočet aritmetického průměru součtených průměrů</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Vypočítaný průměr je aritmetický průměr vypočítaný z průměrů předmětů. Umožňuje vám to znát přibližný konečný průměr. Vypočítává se způsobem zvoleným uživatelem v nastavení aplikaci. Doporučuje se vybrat příslušnou možnost. Důvodem je rozdílný výpočet školních průměrů. Pokud vaše škola navíc uvádí průměr předmětů na stránce deníku Vulcan, aplikace si je stáhne a tyto průměry nepočítá. To lze změnit vynucením výpočtu průměru v nastavení aplikaci.\n\n<b>Průměr známek pouze z vybraného semestru</b>:\n1. Výpočet váženého průměru pro každý předmět v daném semestru\n2. Sčítání vypočítaných průměrů\n3. Výpočet aritmetického průměru součtených průměrů\n\n<b>Průměr průměrů z obou semestrů</b>:\n1. Výpočet váženého průměru pro každý předmět v semestru 1 a 2\n2. Výpočet aritmetického průměru vypočítaných průměrů za semestry 1 a 2 pro každý předmět.\n3. Sčítání vypočítaných průměrů\n4. Výpočet aritmetického průměru sečtených průměrů\n\n<b>Průměr známek z celého roku:</b>\n1. Výpočet váženého průměru za rok pro každý předmět. Konečný průměr v 1. semestru je nepodstatný.\n2. Sčítání vypočítaných průměrů\n3. Výpočet aritmetického průměru součtených průměrů</string>
     <string name="grade_summary_final_average_help_dialog_title">Jak funguje konečný průměr?</string>
     <string name="grade_summary_final_average_help_dialog_message">Konečný průměr je aritmetický průměr vypočítaný ze všech aktuálně dostupných konečných známek v daném semestru.\n\nSchéma výpočtu se skládá z následujících kroků:\n1. Sčítání konečných známek zadaných učiteli\n2. Děleno počtem předmětů, pro které už byly uděleny známky</string>
     <string name="grade_summary_final_average">Konečný průměr</string>
@@ -294,6 +297,10 @@
     <string name="message_move_to_trash">Přesunout do koše</string>
     <string name="message_delete_forever">Odstranit natrvalo</string>
     <string name="message_delete_success">Zpráva byla úspěšně odstraněna</string>
+    <string name="message_mailbox_type_student">žák</string>
+    <string name="message_mailbox_type_parent">rodič</string>
+    <string name="message_mailbox_type_guardian">opatrovník</string>
+    <string name="message_mailbox_type_employee">pracovník</string>
     <string name="message_share">Sdílet</string>
     <string name="message_print">Vytisknout</string>
     <string name="message_subject">Předmět</string>
@@ -305,7 +312,6 @@
     <string name="message_chip_only_unread">Pouze nepřečtené</string>
     <string name="message_chip_only_with_attachments">Pouze s přílohami</string>
     <string name="message_read">Přečtena: %s</string>
-    <string name="message_read_by">Přečtena přes: %1$d z %2$d osob</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d zpráva</item>
         <item quantity="few">%1$d zprávy</item>
@@ -721,6 +727,10 @@
     <string name="pref_ads_privacy_link">Ochrana osobních údajů</string>
     <string name="pref_ads_loading">Reklama se načítá</string>
     <string name="pref_ads_once_per_visit">Děkujeme za vaši podporu, vraťte se později pro více reklam</string>
+    <string name="pref_ads_consent_title">Můžeme použít Vaše data k zobrazení reklam?</string>
+    <string name="pref_ads_consent_description">Volbu můžete kdykoliv změnit v nastavení aplikace. Můžeme použít Vaše data k zobrazení reklam šitých pro vás nebo pomocí méně vašich dat zobrazovat nepřizpůsobené reklamy. Podrobnosti naleznete v našich Zásadách ochrany osobních údajů</string>
+    <string name="pref_ads_summary_personalized">Přizpůsobené reklamy</string>
+    <string name="pref_ads_summary_non_personalized">Nepřizpůsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhled a chování</string>
     <string name="pref_settings_notifications_title">Oznámení</string>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index 097e90e9..d9cac195 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -34,7 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Alphabetisch</item>
         <item>Nach Datum</item>
-        <item>By average</item>
+        <item>Nach Durchschnitt</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 86308aa1..ef79cee1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -77,6 +77,9 @@
     <string name="main_log_in">Anmelden</string>
     <string name="main_session_expired">Die Sitzung ist abgelaufen</string>
     <string name="main_session_relogin">Die Sitzung ist abgelaufen, bitte loggen Sie sich erneut ein</string>
+    <string name="main_support_title">Anwendungsunterstützung</string>
+    <string name="main_support_description">Gefällt Ihnen diese App? Unterstützen Sie ihre Entwicklung, indem Sie nicht-invasive Werbung aktivieren, die Sie jederzeit deaktivieren können</string>
+    <string name="main_support_positive">Werbung aktivieren</string>
     <!--Grade-->
     <string name="grade_header">Note</string>
     <string name="grade_semester">Semester %d</string>
@@ -94,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Vorhergesagte Note</string>
     <string name="grade_summary_calculated_average">Berechnender Durchschnitt</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Wie funktioniert der berechnete Durchschnitt?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Der berechnete Mittelwert ist das arithmetische Mittel, das aus den Durchschnittswerten der Probanden errechnet wird. Es erlaubt Ihnen, den ungefähre endgültigen Durchschnitt zu kennen. Sie wird auf eine vom Anwender in den Anwendungseinstellungen gewählte Weise berechnet. Es wird empfohlen, die entsprechende Option zu wählen. Das liegt daran, dass die Berechnung der Schuldurchschnitte unterschiedlich ist. Wenn Ihre Schule den Durchschnitt der Fächer auf der Vulcan-Seite angibt, lädt die Anwendung diese Fächer herunter und berechnet nicht den Durchschnitt. Dies kann geändert werden, indem die Berechnung des Durchschnitts in den Anwendungseinstellungen erzwungen wird. \n\n<b>Durchschnitt der Noten nur aus dem ausgewählten Semester </b>:\n1. Berechnung des gewichteten Durchschnitts für jedes Fach in einem bestimmten Semester\n2. Addition der berechneten Durchschnittswerte\n3. Berechnung des arithmetischen Mittels der summierten Durchschnitte\n<b>Durchschnitt der Durchschnitte aus beiden Semestern</b>:\n1. Berechnung des gewichteten Durchschnitts für jedes Fach in Semester 1 und 2\n2. Berechnung des arithmetischen Mittels der berechneten Durchschnitte für Semester 1 und 2 für jedes Fach. \n3. Hinzufügen von berechneten Durchschnittswerten\n4. Berechnung des arithmetischen Mittels der summierten Durchschnitte\n<b>Durchschnitt der Noten aus dem ganzen Jahr:</b>\n1. Berechnung des gewichteten Jahresdurchschnitts für jedes Fach. Der Abschlussdurchschnitt im 1. Semester ist irrelevant. \n3. Addition der berechneten Durchschnittswerte\n4. Berechnung des arithmetischen Mittels der summierten Mittelwerte</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Der berechnete Mittelwert ist das arithmetische Mittel, das aus den Durchschnittswerten der Probanden errechnet wird. Es erlaubt Ihnen, den ungefähre endgültigen Durchschnitt zu kennen. Sie wird auf eine vom Anwender in den Anwendungseinstellungen gewählte Weise berechnet. Es wird empfohlen, die entsprechende Option zu wählen. Das liegt daran, dass die Berechnung der Schuldurchschnitte unterschiedlich ist. Wenn Ihre Schule den Durchschnitt der Fächer auf der Vulcan-Seite angibt, lädt die Anwendung diese Fächer herunter und berechnet nicht den Durchschnitt. Dies kann geändert werden, indem die Berechnung des Durchschnitts in den Anwendungseinstellungen erzwungen wird. \n\n<b>Durchschnitt der Noten nur aus dem ausgewählten Semester </b>:\n1. Berechnung des gewichteten Durchschnitts für jedes Fach in einem bestimmten Semester\n2. Addition der berechneten Durchschnittswerte\n3. Berechnung des arithmetischen Mittels der summierten Durchschnitte\n<b>Durchschnitt der Durchschnitte aus beiden Semestern</b>:\n1. Berechnung des gewichteten Durchschnitts für jedes Fach in Semester 1 und 2\n2. Berechnung des arithmetischen Mittels der berechneten Durchschnitte für Semester 1 und 2 für jedes Fach. \n3. Hinzufügen von berechneten Durchschnittswerten\n4. Berechnung des arithmetischen Mittels der summierten Durchschnitte\n<b>Durchschnitt der Noten aus dem ganzen Jahr:</b>\n1. Berechnung des gewichteten Jahresdurchschnitts für jedes Fach. Der Abschlussdurchschnitt im 1. Semester ist irrelevant. \n2. Addition der berechneten Durchschnittswerte\n3. Berechnung des arithmetischen Mittels der summierten Mittelwerte</string>
     <string name="grade_summary_final_average_help_dialog_title">Wie funktioniert der endgültige Durchschnitt?</string>
     <string name="grade_summary_final_average_help_dialog_message">Der Final Average ist das arithmetische Mittel, das aus allen derzeit verfügbaren Abschlussnoten des jeweiligen Semesters berechnet wird. \n\nDas Berechnungsschema besteht aus folgenden Schritten:\n1. Zusammenfassung der von den Lehrern gegebenen Abschlussnoten\n2. Division durch die Anzahl der Fächer, die bereits bewertet wurden</string>
     <string name="grade_summary_final_average">Finaler Durchschnitt</string>
@@ -260,6 +263,10 @@
     <string name="message_move_to_trash">In Papierkorb verschieben</string>
     <string name="message_delete_forever">Dauerhaft löschen</string>
     <string name="message_delete_success">Nachricht erfolgreich gelöscht</string>
+    <string name="message_mailbox_type_student">schüler</string>
+    <string name="message_mailbox_type_parent">Eltern</string>
+    <string name="message_mailbox_type_guardian">Betreuer</string>
+    <string name="message_mailbox_type_employee">Mitarbeiter</string>
     <string name="message_share">Teilen</string>
     <string name="message_print">Drucken</string>
     <string name="message_subject">Thema</string>
@@ -271,7 +278,6 @@
     <string name="message_chip_only_unread">Nur ungelesen</string>
     <string name="message_chip_only_with_attachments">Nur mit Anhängen</string>
     <string name="message_read">Lesen: %s</string>
-    <string name="message_read_by">Lesen von: %1$d von %2$d Personen</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d Nachricht</item>
         <item quantity="other">%1$d Nachrichten</item>
@@ -633,6 +639,10 @@
     <string name="pref_ads_privacy_link">Datenschutzerklärung</string>
     <string name="pref_ads_loading">Anzeige wird geladen</string>
     <string name="pref_ads_once_per_visit">Vielen Dank für Ihre Unterstützung, kommen Sie später wieder für weitere Anzeigen</string>
+    <string name="pref_ads_consent_title">Können wir Ihre Daten zur Anzeige von Werbung verwenden?</string>
+    <string name="pref_ads_consent_description">Sie können Ihre Wahl jederzeit in den App-Einstellungen ändern. Wir verwenden Ihre Daten, um auf Sie zugeschnittene Anzeigen anzuzeigen oder unter Verwendung weniger Ihrer Daten nicht personalisierte Werbung anzuzeigen. Bitte lesen Sie unsere Datenschutzerklärung für Details</string>
+    <string name="pref_ads_summary_personalized">Personalisierte Werbung</string>
+    <string name="pref_ads_summary_non_personalized">keine personalisierte Werbung</string>
     <string name="pref_settings_advanced_title">Erweitert</string>
     <string name="pref_settings_appearance_title">Aussehen &amp; Verhalten</string>
     <string name="pref_settings_notifications_title">Benachrichtigungen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 91e9fe7f..566519e8 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -77,6 +77,9 @@
     <string name="main_log_in">Zaloguj się</string>
     <string name="main_session_expired">Sesja wygasła</string>
     <string name="main_session_relogin">Sesja wygasła, zaloguj się ponownie</string>
+    <string name="main_support_title">Wparcie aplikacji</string>
+    <string name="main_support_description">Podoba Ci się ta aplikacja? Wspieraj jej rozwój poprzez włączenie nieinwazyjnych reklam, które możesz wyłączyć w dowolnym momencie</string>
+    <string name="main_support_positive">Włącz reklamy</string>
     <!--Grade-->
     <string name="grade_header">Ocena</string>
     <string name="grade_semester">Semestr %d</string>
@@ -94,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Przewidywana ocena</string>
     <string name="grade_summary_calculated_average">Obliczona średnia</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Jak działa obliczona średnia?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Obliczona średnia jest średnią arytmetyczną obliczoną ze średnich przedmiotów. Pozwala ona na poznanie przybliżonej średniej końcowej. Jest obliczana w sposób wybrany przez użytkownika w ustawieniach aplikacji. Zaleca się wybranie odpowiedniej opcji. Dzieje się tak dlatego, że obliczanie średnich w szkołach różni się. Dodatkowo, jeśli twoja szkoła ma włączone średnie przedmiotów na stronie dziennika Vulcan, aplikacja pobiera je i ich nie oblicza. Można to zmienić, wymuszając obliczanie średniej w ustawieniach aplikacji.\n\n<b>Średnia ocen tylko z wybranego semestru</b>:\n1. Obliczanie średniej arytmetycznej każdego przedmiotu w danym semestrze\n2. Zsumowanie obliczonych średnich\n3. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia ze średnich z obu semestrów</b>:\n1.Obliczanie średniej arytmetycznej każdego przedmiotu w semestrze 1 i 2\n2. Obliczanie średniej arytmetycznej obliczonych średnich w semestrze 1 i 2 każdego przedmiotu.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia wszystkich ocen z całego roku:</b>\n1. Obliczanie średniej arytmetycznej z każdego przedmiotu w ciągu całego roku. Końcowa ocena w 1 semestrze jest bez znaczenia.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej z zsumowanych średnich</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Obliczona średnia jest średnią arytmetyczną obliczoną ze średnich przedmiotów. Pozwala ona na poznanie przybliżonej średniej końcowej. Jest obliczana w sposób wybrany przez użytkownika w ustawieniach aplikacji. Zaleca się wybranie odpowiedniej opcji. Dzieje się tak dlatego, że obliczanie średnich w szkołach różni się. Dodatkowo, jeśli twoja szkoła ma włączone średnie przedmiotów na stronie dziennika Vulcan, aplikacja pobiera je i ich nie oblicza. Można to zmienić, wymuszając obliczanie średniej w ustawieniach aplikacji.\n\n<b>Średnia ocen tylko z wybranego semestru</b>:\n1. Obliczanie średniej arytmetycznej każdego przedmiotu w danym semestrze\n2. Zsumowanie obliczonych średnich\n3. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia ze średnich z obu semestrów</b>:\n1.Obliczanie średniej arytmetycznej każdego przedmiotu w semestrze 1 i 2\n2. Obliczanie średniej arytmetycznej obliczonych średnich w semestrze 1 i 2 każdego przedmiotu.\n3. Zsumowanie obliczonych średnich\n4. Obliczanie średniej arytmetycznej zsumowanych średnich\n\n<b>Średnia wszystkich ocen z całego roku:</b>\n1. Obliczanie średniej arytmetycznej z każdego przedmiotu w ciągu całego roku. Końcowa ocena w 1 semestrze jest bez znaczenia.\n2. Zsumowanie obliczonych średnich\n3. Obliczanie średniej arytmetycznej z zsumowanych średnich</string>
     <string name="grade_summary_final_average_help_dialog_title">Jak działa końcowa średnia?</string>
     <string name="grade_summary_final_average_help_dialog_message">Średnią końcową jest średnia arytmetyczna obliczona na podstawie wszystkich obecnie dostępnych ocen końcowych w danym semestrze.\n\nSchemat obliczeń składa się z następujących kroków:\n1. Sumowanie końcowych ocen wpisanych przez nauczycieli\n2. Dzielenie przez liczbę przedmiotów, z których oceny zostały już wystawione</string>
     <string name="grade_summary_final_average">Końcowa średnia</string>
@@ -294,6 +297,10 @@
     <string name="message_move_to_trash">Przenieś do kosza</string>
     <string name="message_delete_forever">Usuń trwale</string>
     <string name="message_delete_success">Wiadomość usunięta pomyślnie</string>
+    <string name="message_mailbox_type_student">uczeń</string>
+    <string name="message_mailbox_type_parent">rodzic</string>
+    <string name="message_mailbox_type_guardian">opiekun</string>
+    <string name="message_mailbox_type_employee">pracownik</string>
     <string name="message_share">Udostępnij</string>
     <string name="message_print">Drukuj</string>
     <string name="message_subject">Temat</string>
@@ -305,7 +312,6 @@
     <string name="message_chip_only_unread">Tylko nieprzeczytane</string>
     <string name="message_chip_only_with_attachments">Tylko z załącznikami</string>
     <string name="message_read">Przeczytana: %s</string>
-    <string name="message_read_by">Przeczytana przez: %1$d z %2$d osób</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d wiadomość</item>
         <item quantity="few">%1$d wiadomości</item>
@@ -701,7 +707,7 @@
     <string name="pref_notification_go_to_settings">Przejdź do ustawień</string>
     <string name="pref_services_header">Synchronizacja</string>
     <string name="pref_services_switch">Automatyczna aktualizacja</string>
-    <string name="pref_services_suspended">Zawieszona na wakacjach</string>
+    <string name="pref_services_suspended">Wstrzymana podczas wakacji</string>
     <string name="pref_services_interval">Interwał aktualizacji</string>
     <string name="pref_services_wifi">Tylko WiFi</string>
     <string name="pref_services_force_sync">Synchronizuj teraz</string>
@@ -721,6 +727,10 @@
     <string name="pref_ads_privacy_link">Polityka prywatności</string>
     <string name="pref_ads_loading">Ładowanie reklamy</string>
     <string name="pref_ads_once_per_visit">Dziękujemy za wsparcie, wróć później po więcej reklam</string>
+    <string name="pref_ads_consent_title">Czy możemy używać Twoich danych do wyświetlania reklam?</string>
+    <string name="pref_ads_consent_description">Możesz zmienić swój wybór w dowolnym momencie w ustawieniach aplikacji. Możemy wykorzystać Twoje dane do wyświetlania reklam dostosowanych do Ciebie lub, przy użyciu mniejszej ilości danych, wyświetlić niepersonalizowane reklamy. Zobacz naszą Politykę Prywatności, aby uzyskać więcej informacji</string>
+    <string name="pref_ads_summary_personalized">Spersonalizowane reklamy</string>
+    <string name="pref_ads_summary_non_personalized">Niespersonalizowane reklamy</string>
     <string name="pref_settings_advanced_title">Zaawansowane</string>
     <string name="pref_settings_appearance_title">Wygląd i zachowanie</string>
     <string name="pref_settings_notifications_title">Powiadomienia</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 662e0934..a3c5a62d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -77,6 +77,9 @@
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
     <string name="main_session_relogin">Сеанс истёк, авторизуйтесь снова</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
     <!--Grade-->
     <string name="grade_header">Оценка</string>
     <string name="grade_semester">%d семестр</string>
@@ -94,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Ожидаемая оценка</string>
     <string name="grade_summary_calculated_average">Рассчитанная средняя оценка</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Как работает \"Рассчитанная средняя оценка\"?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Рассчитанная средняя оценка - это среднее арифметическое, рассчитанное на основе средних оценок по предметам. Это позволяет узнать приблизительную итоговую среднюю оценку. Она рассчитывается способом, выбранным пользователем в настройках приложения. Рекомендуется выбрать подходящий вариант, так как каждая школа по разному считает среднюю оценку. Кроме того, если ваша школа выставляет средние оценки по предметам на странице Vulcan, приложение просто загрузит их. Это можно изменить, заставив приложение считать среднюю оценку в настройках.\n\n<b>Средняя из оценок выбранного семестра</b>:\n1. Вычисление средневзвешенного значения по каждому предмету за семестр\n2.Суммирование вычисленных значений\n3. Вычисление среднего арифметического суммированных значений\n\n<b>Средняя из средних оценок семестров</b>:\n1.Расчет средневзвешенного значения для каждого предмета в семестрах. \n2. Вычисление среднего арифметического из средневзвешенных значений для каждого предмета в семестрах.\n3. Суммирование средних арифметических\n4. Вычисление среднего арифматического из суммированных значений\n\n<b>Средняя из оценок со всего года:</b>\n1. Расчет средневзвешенного значения по каждому предмету за год. Итоговое среднее значение за 1 семестр не имеет значения.\n2. Суммирование вычисленных средних\n4. Расчет среднего арифметического суммированных чисел</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
     <string name="grade_summary_final_average_help_dialog_title">Как работает \"Итоговая средняя оценка\"?</string>
     <string name="grade_summary_final_average_help_dialog_message">Итоговая средняя оценка - это среднее арифметическое, рассчитанное из всех имеющихся на данный момент итоговых оценок в семестре.\n\nРассчет происходит следующим образом:\n1. Суммирование итоговых оценок, выставленных преподавателями\n2. Полученная сумма делится на число предметов, по которым выставлены оценки</string>
     <string name="grade_summary_final_average">Итоговая средняя оценка</string>
@@ -294,6 +297,10 @@
     <string name="message_move_to_trash">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
     <string name="message_delete_success">Письмо успешно удалено</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
     <string name="message_share">Поделиться</string>
     <string name="message_print">Печать</string>
     <string name="message_subject">Тема</string>
@@ -305,7 +312,6 @@
     <string name="message_chip_only_unread">Только непрочитанные</string>
     <string name="message_chip_only_with_attachments">Только с вложениями</string>
     <string name="message_read">Прочитано: %s</string>
-    <string name="message_read_by">Прочитано: %1$d из %2$d человек</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d сообщение</item>
         <item quantity="few">%1$d сообщения</item>
@@ -721,6 +727,10 @@
     <string name="pref_ads_privacy_link">Политика конфиденциальности</string>
     <string name="pref_ads_loading">Реклама загружается</string>
     <string name="pref_ads_once_per_visit">Спасибо за вашу поддержку, возвращайтесь позже для дополнительной рекламы</string>
+    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
+    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
+    <string name="pref_ads_summary_personalized">Personalized ads</string>
+    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
     <string name="pref_settings_advanced_title">Расширенные</string>
     <string name="pref_settings_appearance_title">Внешний вид и поведение</string>
     <string name="pref_settings_notifications_title">Уведомления</string>
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
index ab0a43b6..e4331315 100644
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@@ -34,7 +34,7 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Abecedne</item>
         <item>Podľa dátumu</item>
-        <item>By average</item>
+        <item>Podľa priemeru</item>
     </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 5ebd1e76..6a4505d7 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -77,6 +77,9 @@
     <string name="main_log_in">Prihlásiť sa</string>
     <string name="main_session_expired">Relácia vypršala</string>
     <string name="main_session_relogin">Relácia vypršala. Prihláste sa prosím znovu</string>
+    <string name="main_support_title">Podpora aplikácie</string>
+    <string name="main_support_description">Páči sa Vám táto aplikácia? Podporte jej vývoj tým, že povolíte neinvazívne reklamy, ktoré môžete kedykoľvek vypnúť</string>
+    <string name="main_support_positive">Zapnúť reklamy</string>
     <!--Grade-->
     <string name="grade_header">Známka</string>
     <string name="grade_semester">Semester %d</string>
@@ -94,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Predpokladaná známka</string>
     <string name="grade_summary_calculated_average">Vypočítaný priemer</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Ako funguje vypočítaný priemer?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Vypočítaný priemer je aritmetický priemer vypočítaný z priemerov predmetov. Umožňuje vám to poznať približný konečný priemer. Vypočítava sa spôsobom zvoleným užívateľom v nastaveniach aplikácii. Odporúča sa vybrať príslušnú možnosť. Dôvodom je rozdielny výpočet školských priemerov. Ak vaša škola navyše uvádza priemer predmetov na stránke denníka Vulcan, aplikácia si ich stiahne a tieto priemery nepočíta. To možno zmeniť vynútením výpočtu priemeru v nastavení aplikácii.\n\n<b>Priemer známok iba z vybraného semestra</b>:\n1. Výpočet váženého priemeru pre každý predmet v danom semestri\n2. Sčítanie vypočítaných priemerov\n3. Výpočet aritmetického priemeru součtených priemerov\n\n<b>Priemer priemerov z oboch semestrov</b>:\n1. Výpočet váženého priemeru pre každý predmet v semestri 1 a 2\n2. Výpočet aritmetického priemeru vypočítaných priemerov za semestre 1 a 2 pre každý predmet.\n3. Sčítanie vypočítaných priemerov\n4. Výpočet aritmetického priemeru součtených priemerov\n\n<b>Priemer známok z celého roka:</b>\n1. Výpočet váženého priemeru za rok pre každý predmet. Konečný priemer v 1. semestri je nepodstatný.\n3. Sčítanie vypočítaných priemerov\n4. Výpočet aritmetického priemeru součtených priemerov</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Vypočítaný priemer je aritmetický priemer vypočítaný z priemerov predmetov. Umožňuje vám to poznať približný konečný priemer. Vypočítava sa spôsobom zvoleným užívateľom v nastaveniach aplikácii. Odporúča sa vybrať príslušnú možnosť. Dôvodom je rozdielny výpočet školských priemerov. Ak vaša škola navyše uvádza priemer predmetov na stránke denníka Vulcan, aplikácia si ich stiahne a tieto priemery nepočíta. To možno zmeniť vynútením výpočtu priemeru v nastavení aplikácii.\n\n<b>Priemer známok iba z vybraného semestra</b>:\n1. Výpočet váženého priemeru pre každý predmet v danom semestri\n2. Sčítanie vypočítaných priemerov\n3. Výpočet aritmetického priemeru součtených priemerov\n\n<b>Priemer priemerov z oboch semestrov</b>:\n1. Výpočet váženého priemeru pre každý predmet v semestri 1 a 2\n2. Výpočet aritmetického priemeru vypočítaných priemerov za semestre 1 a 2 pre každý predmet.\n3. Sčítanie vypočítaných priemerov\n4. Výpočet aritmetického priemeru součtených priemerov\n\n<b>Priemer známok z celého roka:</b>\n1. Výpočet váženého priemeru za rok pre každý predmet. Konečný priemer v 1. semestri je nepodstatný.\n2. Sčítanie vypočítaných priemerov\n3. Výpočet aritmetického priemeru součtených priemerov</string>
     <string name="grade_summary_final_average_help_dialog_title">Ako funguje konečný priemer?</string>
     <string name="grade_summary_final_average_help_dialog_message">Konečný priemer je aritmetický priemer vypočítaný zo všetkých aktuálne dostupných konečných známok v danom semestri.\n\nSchéma výpočtu sa skladá z nasledujúcich krokov:\n1. Sčítanie konečných známok zadaných učiteľmi\n2. Delené počtom predmetov, pre ktoré už boli vydané známky</string>
     <string name="grade_summary_final_average">Konečný priemer</string>
@@ -110,7 +113,7 @@
     <string name="grade_statistics_student_average">Váš priemer: %1$s</string>
     <string name="grade_statistics_student_grade">Vaša známka: %1$s</string>
     <string name="grade_statistics_average_class">Trieda</string>
-    <string name="grade_statistics_average_student">Žiák</string>
+    <string name="grade_statistics_average_student">Žiak</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d známka</item>
         <item quantity="few">%d známky</item>
@@ -294,6 +297,10 @@
     <string name="message_move_to_trash">Presunúť do koša</string>
     <string name="message_delete_forever">Odstrániť natrvalo</string>
     <string name="message_delete_success">Správa bola úspešne odstránená</string>
+    <string name="message_mailbox_type_student">žiak</string>
+    <string name="message_mailbox_type_parent">rodič</string>
+    <string name="message_mailbox_type_guardian">opatrovník</string>
+    <string name="message_mailbox_type_employee">pracovník</string>
     <string name="message_share">Zdieľať</string>
     <string name="message_print">Vytlačiť</string>
     <string name="message_subject">Predmet</string>
@@ -305,7 +312,6 @@
     <string name="message_chip_only_unread">Iba neprečítané</string>
     <string name="message_chip_only_with_attachments">Iba s prílohami</string>
     <string name="message_read">Prečítaná: %s</string>
-    <string name="message_read_by">Prečítaná cez: %1$d z %2$d osôb</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d správa</item>
         <item quantity="few">%1$d správy</item>
@@ -721,6 +727,10 @@
     <string name="pref_ads_privacy_link">Ochrana osobných údajov</string>
     <string name="pref_ads_loading">Reklama sa načítava</string>
     <string name="pref_ads_once_per_visit">Ďakujeme za vašu podporu, vráťte sa neskôr pre viac reklám</string>
+    <string name="pref_ads_consent_title">Môžeme použiť Vaše údaje na zobrazenie reklám?</string>
+    <string name="pref_ads_consent_description">Voľbu môžete kedykoľvek zmeniť v nastavení aplikácie. Môžeme použiť vaše údaje na zobrazenie reklám šitých pre vás alebo pomocou menej vašich dát zobrazovať neprispôsobené reklamy. Podrobnosti nájdete v našich Zásadách ochrany osobných údajov</string>
+    <string name="pref_ads_summary_personalized">Prispôsobené reklamy</string>
+    <string name="pref_ads_summary_non_personalized">Neprispôsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhľad a správanie</string>
     <string name="pref_settings_notifications_title">Oznámenia</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0cc50dbe..742e800f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -77,6 +77,9 @@
     <string name="main_log_in">Увійти</string>
     <string name="main_session_expired">Минув термін дії сесії</string>
     <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
     <!--Grade-->
     <string name="grade_header">Оцінка</string>
     <string name="grade_semester">%d семестр</string>
@@ -94,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Передбачувана оцінка</string>
     <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Як працює \"Розрахована середня оцінка\"?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Розрахована середня оцінка - це середнє арифметичне, обчислене з середніх оцінок з предметів.Це дозволяє дізнатися приблизну кінцеву середню оцінку.Вона розраховується способом, обраним користувачем у налаштуваннях програми.Рекомендується вибрати відповідний варіант, тому що кожна школа по різному розраховує середню оцінку.Крім того, якщо у вашій школі повідомляється середня оцінка з предметів на сторінці Vulcan, програма тільки завантажує ці оцінки.Це можна змінити шляхом примусового розрахунку середньоЇ оцінки в налаштуваннях програми.\n\n<b>Середні оцінки тільки за обраний семестр</b>:\n1. Розрахунок середньозваженого числа для кожного предмета в даному семестрі\n2. Сумування розрахованих числ\n3. Розрахунок середнього арифметичного з сумованих чисел\n\n<b>Середнє значення з обох семестрів</b>:\n1. Обчислення середньозваженого числа для кожного предмета у 1 та 2 семестрі\n2. Обчислення середнього арифметичного з розрахованих середньозважених числ за 1 та 2 семестри для кожного предмета.\n3. Додавання розрахованих середніх\n4. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення оцінок за весь рік: </b>\n1. Розрахунок середньозваженого числа за рік для кожного предмета. Підсумковий середній показник у 1-му семестрі не має значення.\n2. Сумування розрахованих середніх\n3. Обчислення середнього арифметичного з суммованих середніх</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
     <string name="grade_summary_final_average_help_dialog_title">Як працює \"Підсумкова середня оцінка\"?</string>
     <string name="grade_summary_final_average_help_dialog_message">Підсумкове середнє значення - це середнє арифметичне, обчислене з усіх наявних наразі підсумкових оцінок у даному семестрі. \n\nСхема обчислення складається з таких кроків:\n1. Сумування підсумкових оцінок, виставленних викладачами\n2. Ділення на кількість предметів, з яких виставлені ці оцінки</string>
     <string name="grade_summary_final_average">Підсумкова середня оцінка</string>
@@ -294,6 +297,10 @@
     <string name="message_move_to_trash">Перемістити до кошика</string>
     <string name="message_delete_forever">Видалити назавжди</string>
     <string name="message_delete_success">Лист було успішно видалено</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
     <string name="message_share">Поділитись</string>
     <string name="message_print">Друк</string>
     <string name="message_subject">Тема</string>
@@ -305,7 +312,6 @@
     <string name="message_chip_only_unread">Лише непрочитані</string>
     <string name="message_chip_only_with_attachments">Тільки з вкладеннями</string>
     <string name="message_read">Прочитаний: %s</string>
-    <string name="message_read_by">Прочитаний: %1$d з %2$d осіб</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d лист</item>
         <item quantity="few">%1$d листи</item>
@@ -721,6 +727,10 @@
     <string name="pref_ads_privacy_link">Політика конфіденційності</string>
     <string name="pref_ads_loading">Реклама завантажується</string>
     <string name="pref_ads_once_per_visit">Дякуємо за вашу підтримку, повертайтеся пізніше для більшої кількості реклам</string>
+    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
+    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
+    <string name="pref_ads_summary_personalized">Personalized ads</string>
+    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
     <string name="pref_settings_advanced_title">Додатково</string>
     <string name="pref_settings_appearance_title">Вигляд та поведінка</string>
     <string name="pref_settings_notifications_title">Сповіщення</string>

From 09e07a17136cc7266706dc6a8764619cb2ab8277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 22 Aug 2022 17:58:35 +0200
Subject: [PATCH 098/429] Version 1.7.0

---
 app/build.gradle                                  | 10 +++++-----
 app/src/main/play/release-notes/pl-PL/default.txt |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index efa9b3e0..e99e8773 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 108
-        versionName "1.6.4"
+        versionCode 109
+        versionName "1.7.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,8 +161,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.50d
-    updatePriority = 3
+    userFraction = 0.05d
+    updatePriority = 5
     enabled.set(false)
 }
 
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:dbe87aac"
+    implementation "io.github.wulkanowy:sdk:1.7.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index b6340bb9..3eb42eb9 100644
--- 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,9 @@
-Wersja 1.6.4
+Wersja 1.7.0
 
-- naprawiliśmy błąd ładowania frekwencji na GPE i Lubelskim Portalu Oświatowym
+- naprawiliśmy logowanie do aplikacji
+- dodaliśmy wsparcie nowego modułu Wiadomości Plus
+- dodaliśmy nową możliwość wsparcia naszego projektu przez opcjonalne reklamy
+- dodaliśmy sortowanie po średniej
+- naprawiliśmy też kilka usterek wpływających na komfort używania aplikacji
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From de1bc4809fe93679e89b944e0feb9771e6d3a8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 23 Aug 2022 00:08:39 +0200
Subject: [PATCH 099/429] Fix ads translations (#1951)

---
 .github/workflows/deploy-store.yml              |  1 +
 app/src/main/res/layout/dialog_ads_consent.xml  | 12 ++++++------
 app/src/main/res/values/strings.xml             |  7 +++++++
 app/src/play/res/xml/scheme_preferences_ads.xml |  8 ++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
index cfb0fb52..3ce618ca 100644
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@@ -38,6 +38,7 @@ jobs:
           ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }}
           ADMOB_PROJECT_ID: ${{ secrets.ADMOB_PROJECT_ID }}
           SINGLE_SUPPORT_AD_ID: ${{ secrets.SINGLE_SUPPORT_AD_ID }}
+          DASHBOARD_TILE_AD_ID: ${{ secrets.DASHBOARD_TILE_AD_ID }}
           SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }}
         run: ./gradlew publishPlayReleaseApps -PenableFirebase --stacktrace;
 
diff --git a/app/src/main/res/layout/dialog_ads_consent.xml b/app/src/main/res/layout/dialog_ads_consent.xml
index 39510162..81607478 100644
--- a/app/src/main/res/layout/dialog_ads_consent.xml
+++ b/app/src/main/res/layout/dialog_ads_consent.xml
@@ -15,7 +15,7 @@
         android:insetRight="0dp"
         android:insetBottom="0dp"
         android:padding="0dp"
-        android:text="Privacy Policy"
+        android:text="@string/pref_ads_privacy_policy"
         android:textAllCaps="false"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -26,9 +26,9 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="17dp"
         android:layout_marginTop="8dp"
-        android:text="I am over 18 years old"
+        android:text="@string/pref_ads_over_18_years_old"
         android:textColor="?android:textColorSecondary"
-        android:textSize="14dp"
+        android:textSize="14sp"
         app:layout_constraintTop_toBottomOf="@id/ads_consent_privacy" />
 
     <com.google.android.material.button.MaterialButton
@@ -42,7 +42,7 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
-        android:text="Yes, personalized ads"
+        android:text="@string/pref_ads_option_personalized"
         app:layout_constraintTop_toBottomOf="@id/ads_consent_over" />
 
     <com.google.android.material.button.MaterialButton
@@ -56,7 +56,7 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
-        android:text="Yes, non-personalized ads"
+        android:text="@string/pref_ads_option_non_personalized"
         app:layout_constraintBottom_toTopOf="@id/ads_consent_cancel"
         app:layout_constraintTop_toBottomOf="@id/ads_consent_personalised"
         app:layout_constraintVertical_bias="0" />
@@ -73,7 +73,7 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
-        android:text="Cancel"
+        android:text="@android:string/cancel"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintVertical_bias="0" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2eee4cce..bcd49803 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -714,6 +714,10 @@
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
 
     <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_agreements">Privacy Policy</string>
+    <string name="pref_ads_privacy_policy">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
     <string name="pref_ads_support">Watch single ad to support project</string>
     <string name="pref_ads_privacy_title">Consent to data processing</string>
     <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
@@ -725,6 +729,9 @@
     <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
     <string name="pref_ads_summary_personalized">Personalized ads</string>
     <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
 
     <string name="pref_settings_advanced_title">Advanced</string>
     <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
diff --git a/app/src/play/res/xml/scheme_preferences_ads.xml b/app/src/play/res/xml/scheme_preferences_ads.xml
index d5e93a35..4165561a 100644
--- a/app/src/play/res/xml/scheme_preferences_ads.xml
+++ b/app/src/play/res/xml/scheme_preferences_ads.xml
@@ -2,18 +2,18 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         app:iconSpaceReserved="false"
-        app:title="Agreements">
+        app:title="@string/pref_ads_agreements">
         <Preference
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_privacy_policy"
             app:singleLineTitle="false"
-            app:title="Privacy Policy" />
+            app:title="@string/pref_ads_privacy_policy" />
         <CheckBoxPreference
             app:defaultValue="@bool/pref_default_ads_consent_data_processing"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_consent_data_processing"
             app:singleLineTitle="false"
-            app:title="Consent to processing of data related to ads" />
+            app:title="@string/pref_ads_consent" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
@@ -24,7 +24,7 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_ads_enabled"
             app:singleLineTitle="false"
-            app:title="Show ads in app" />
+            app:title="@string/pref_ads_show_in_app" />
         <Preference
             app:dependency="@string/pref_key_ads_consent_data_processing"
             app:iconSpaceReserved="false"

From 37d756b8fe9b4c6cb2fe54f3719e18b3a1c8f76e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 23 Aug 2022 00:54:19 +0200
Subject: [PATCH 100/429] New Crowdin updates (#1952)

---
 app/src/main/res/values-cs/strings.xml | 7 +++++++
 app/src/main/res/values-de/strings.xml | 7 +++++++
 app/src/main/res/values-pl/strings.xml | 7 +++++++
 app/src/main/res/values-ru/strings.xml | 7 +++++++
 app/src/main/res/values-sk/strings.xml | 7 +++++++
 app/src/main/res/values-uk/strings.xml | 7 +++++++
 app/src/main/res/values/strings.xml    | 4 ++--
 7 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5f76bb6e..d036e7e4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -720,6 +720,10 @@
     <string name="pref_other_fill_message_content">Odpovědět s historií zpráv</string>
     <string name="pref_other_optional_arithmetic_average">Vypočítat aritmetický průměr, pokud žádná známka nemá váhu</string>
     <string name="pref_ads_support_category_name">Podpora</string>
+    <string name="pref_ads_privacy_policy">Ochrana osobních údajů</string>
+    <string name="pref_ads_agreements">Souhlasy</string>
+    <string name="pref_ads_consent">Souhlas se zpracováním údajů souvisejících s reklamami</string>
+    <string name="pref_ads_show_in_app">Zobrazit reklamy v aplikaci</string>
     <string name="pref_ads_support">Podívejte se na jednu reklamu pro podporu projektu</string>
     <string name="pref_ads_privacy_title">Souhlas se zpracováním dat</string>
     <string name="pref_ads_privacy_description">Jestli chcete sledovat reklamu, musíte souhlasit s podmínkami zpracování údajů v našich Zásadách Ochrany Osobních Údajů</string>
@@ -731,6 +735,9 @@
     <string name="pref_ads_consent_description">Volbu můžete kdykoliv změnit v nastavení aplikace. Můžeme použít Vaše data k zobrazení reklam šitých pro vás nebo pomocí méně vašich dat zobrazovat nepřizpůsobené reklamy. Podrobnosti naleznete v našich Zásadách ochrany osobních údajů</string>
     <string name="pref_ads_summary_personalized">Přizpůsobené reklamy</string>
     <string name="pref_ads_summary_non_personalized">Nepřizpůsobené reklamy</string>
+    <string name="pref_ads_over_18_years_old">Mám ukončené 18 let</string>
+    <string name="pref_ads_option_personalized">Ano, přizpůsobené reklamy</string>
+    <string name="pref_ads_option_non_personalized">Ano, nepřizpůsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhled a chování</string>
     <string name="pref_settings_notifications_title">Oznámení</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ef79cee1..4dfeee4f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -632,6 +632,10 @@
     <string name="pref_other_fill_message_content">Antwort mit Nachrichtenhistorie</string>
     <string name="pref_other_optional_arithmetic_average">Arithmetisches Mittel anzeigen, wenn keine Gewichte angegeben sind</string>
     <string name="pref_ads_support_category_name">Unterstützung</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
     <string name="pref_ads_support">Einzelanzeige ansehen, um Projekt zu unterstützen</string>
     <string name="pref_ads_privacy_title">Einwilligung in die Datenverarbeitung</string>
     <string name="pref_ads_privacy_description">Um eine Anzeige zu sehen, müssen Sie mit den Datenverarbeitungsbedingungen unserer Datenschutzerklärung einverstanden sein</string>
@@ -643,6 +647,9 @@
     <string name="pref_ads_consent_description">Sie können Ihre Wahl jederzeit in den App-Einstellungen ändern. Wir verwenden Ihre Daten, um auf Sie zugeschnittene Anzeigen anzuzeigen oder unter Verwendung weniger Ihrer Daten nicht personalisierte Werbung anzuzeigen. Bitte lesen Sie unsere Datenschutzerklärung für Details</string>
     <string name="pref_ads_summary_personalized">Personalisierte Werbung</string>
     <string name="pref_ads_summary_non_personalized">keine personalisierte Werbung</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
     <string name="pref_settings_advanced_title">Erweitert</string>
     <string name="pref_settings_appearance_title">Aussehen &amp; Verhalten</string>
     <string name="pref_settings_notifications_title">Benachrichtigungen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 566519e8..c9abbd02 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -720,6 +720,10 @@
     <string name="pref_other_fill_message_content">Odpowiadaj z historią wiadomości</string>
     <string name="pref_other_optional_arithmetic_average">Licz średnią arytmetyczną, gdy żadna ocena nie ma wagi</string>
     <string name="pref_ads_support_category_name">Wsparcie</string>
+    <string name="pref_ads_privacy_policy">Polityka prywatności</string>
+    <string name="pref_ads_agreements">Zgody</string>
+    <string name="pref_ads_consent">Zgoda na przetwarzanie danych związanych z reklamami</string>
+    <string name="pref_ads_show_in_app">Pokazuj reklamy w aplikacji</string>
     <string name="pref_ads_support">Obejrzyj pojedynczą reklamę, aby wesprzeć projekt</string>
     <string name="pref_ads_privacy_title">Zgoda na przetwarzanie danych</string>
     <string name="pref_ads_privacy_description">Aby obejrzeć reklamę, musisz zaakceptować warunki przetwarzania danych zawarte w naszej Polityce Prywatności</string>
@@ -731,6 +735,9 @@
     <string name="pref_ads_consent_description">Możesz zmienić swój wybór w dowolnym momencie w ustawieniach aplikacji. Możemy wykorzystać Twoje dane do wyświetlania reklam dostosowanych do Ciebie lub, przy użyciu mniejszej ilości danych, wyświetlić niepersonalizowane reklamy. Zobacz naszą Politykę Prywatności, aby uzyskać więcej informacji</string>
     <string name="pref_ads_summary_personalized">Spersonalizowane reklamy</string>
     <string name="pref_ads_summary_non_personalized">Niespersonalizowane reklamy</string>
+    <string name="pref_ads_over_18_years_old">Mam ukończone 18 lat</string>
+    <string name="pref_ads_option_personalized">Tak, spersonalizowane reklamy</string>
+    <string name="pref_ads_option_non_personalized">Tak, niespersonalizowane reklamy</string>
     <string name="pref_settings_advanced_title">Zaawansowane</string>
     <string name="pref_settings_appearance_title">Wygląd i zachowanie</string>
     <string name="pref_settings_notifications_title">Powiadomienia</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a3c5a62d..e1abb029 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -720,6 +720,10 @@
     <string name="pref_other_fill_message_content">Отвечать с историей сообщений</string>
     <string name="pref_other_optional_arithmetic_average">Показывать среднее арифметическое при отсутствии стоимости</string>
     <string name="pref_ads_support_category_name">Поддержка</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
     <string name="pref_ads_support">Посмотреть рекламу для поддержки проекта</string>
     <string name="pref_ads_privacy_title">Согласие на обработку данных</string>
     <string name="pref_ads_privacy_description">Для просмотра рекламы вы должны согласиться с условиями обработки данных нашей Политики конфиденциальности</string>
@@ -731,6 +735,9 @@
     <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
     <string name="pref_ads_summary_personalized">Personalized ads</string>
     <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
     <string name="pref_settings_advanced_title">Расширенные</string>
     <string name="pref_settings_appearance_title">Внешний вид и поведение</string>
     <string name="pref_settings_notifications_title">Уведомления</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6a4505d7..1c6eae8c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -720,6 +720,10 @@
     <string name="pref_other_fill_message_content">Odpovedať s históriou správ</string>
     <string name="pref_other_optional_arithmetic_average">Vypočítať aritmetický priemer, ak žiadna známka nemá váhu</string>
     <string name="pref_ads_support_category_name">Podpora</string>
+    <string name="pref_ads_privacy_policy">Ochrana osobných údajov</string>
+    <string name="pref_ads_agreements">Súhlasy</string>
+    <string name="pref_ads_consent">Súhlas so spracovaním údajov súvisiacich s reklamami</string>
+    <string name="pref_ads_show_in_app">Zobraziť reklamy v aplikácii</string>
     <string name="pref_ads_support">Pozrite sa na jednu reklamu pre podporu projektu</string>
     <string name="pref_ads_privacy_title">Súhlas so spracovaním dát</string>
     <string name="pref_ads_privacy_description">Ak chcete sledovať reklamu, musíte súhlasiť s podmienkami spracovania údajov v našich Zásadách Ochrany Osobných Údajov</string>
@@ -731,6 +735,9 @@
     <string name="pref_ads_consent_description">Voľbu môžete kedykoľvek zmeniť v nastavení aplikácie. Môžeme použiť vaše údaje na zobrazenie reklám šitých pre vás alebo pomocou menej vašich dát zobrazovať neprispôsobené reklamy. Podrobnosti nájdete v našich Zásadách ochrany osobných údajov</string>
     <string name="pref_ads_summary_personalized">Prispôsobené reklamy</string>
     <string name="pref_ads_summary_non_personalized">Neprispôsobené reklamy</string>
+    <string name="pref_ads_over_18_years_old">Mám ukončené 18 rokov</string>
+    <string name="pref_ads_option_personalized">Áno, prispôsobené reklamy</string>
+    <string name="pref_ads_option_non_personalized">Áno, neprispôsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhľad a správanie</string>
     <string name="pref_settings_notifications_title">Oznámenia</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 742e800f..f90e78e7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -720,6 +720,10 @@
     <string name="pref_other_fill_message_content">Відповісти з історією повідомлень</string>
     <string name="pref_other_optional_arithmetic_average">Вилічити середню аритметичну, якщо оцінка немає вартості</string>
     <string name="pref_ads_support_category_name">Підтримка</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
     <string name="pref_ads_support">Подивіться одну рекламу для підтримки проєкту</string>
     <string name="pref_ads_privacy_title">Згода в обробці даних</string>
     <string name="pref_ads_privacy_description">Щоб переглянути рекламу, ви повинні погодитися з умовами обробки даних нашої Політики конфіденційності</string>
@@ -731,6 +735,9 @@
     <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
     <string name="pref_ads_summary_personalized">Personalized ads</string>
     <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
     <string name="pref_settings_advanced_title">Додатково</string>
     <string name="pref_settings_appearance_title">Вигляд та поведінка</string>
     <string name="pref_settings_notifications_title">Сповіщення</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcd49803..e4542547 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -714,8 +714,8 @@
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
 
     <string name="pref_ads_support_category_name">Support</string>
-    <string name="pref_ads_agreements">Privacy Policy</string>
-    <string name="pref_ads_privacy_policy">Agreements</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
     <string name="pref_ads_consent">Consent to processing of data related to ads</string>
     <string name="pref_ads_show_in_app">Show ads in app</string>
     <string name="pref_ads_support">Watch single ad to support project</string>

From 10c36f19bf13234c758b2ac2e96d65a71df8e82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 23 Aug 2022 00:56:12 +0200
Subject: [PATCH 101/429] Version 1.7.1

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e99e8773..5fb07377 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 109
-        versionName "1.7.0"
+        versionCode 110
+        versionName "1.7.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,7 +161,7 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.05d
+    userFraction = 0.95d
     updatePriority = 5
     enabled.set(false)
 }
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 3eb42eb9..4b6dcaf2 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 1.7.0
+Wersja 1.7.1
 
 - naprawiliśmy logowanie do aplikacji
 - dodaliśmy wsparcie nowego modułu Wiadomości Plus

From 70c2cb7dbf717c508bbec08b69931019b2430699 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 13:30:00 +0000
Subject: [PATCH 102/429] Bump desugar_jdk_libs from 1.1.6 to 1.1.8 (#1957)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5fb07377..52ae02dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ ext {
 dependencies {
     implementation "io.github.wulkanowy:sdk:1.7.0"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"

From f68a8e4215e719ecdfedeb72553ce58df1fcfbf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 13:30:28 +0000
Subject: [PATCH 103/429] Bump robolectric from 4.8.1 to 4.8.2 (#1956)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 52ae02dd..1dba83c5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -263,7 +263,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.8.1'
+    testImplementation 'org.robolectric:robolectric:4.8.2'
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation "androidx.test:core:1.4.0"

From 5c17c38d1d16214db4cc423ffe8556e7b7c64d8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 13:30:56 +0000
Subject: [PATCH 104/429] Bump mockk from 1.12.5 to 1.12.7 (#1955)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1dba83c5..10648c15 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.4.3"
     chucker = "3.5.2"
-    mockk = "1.12.5"
+    mockk = "1.12.7"
     coroutines = "1.6.4"
 }
 

From 54372e0a55e8e903f868d4e47897e9c1a868b505 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Aug 2022 13:40:14 +0000
Subject: [PATCH 105/429] Bump kotlinx-serialization-json from 1.3.3 to 1.4.0
 (#1950)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 10648c15..5977b347 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -190,7 +190,7 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.8.0"

From f2cb3b4f9edd69a1936d3ccb52b3b8eab0e0e320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 30 Aug 2022 09:06:29 +0200
Subject: [PATCH 106/429] Change message draft key in shared preferences
 (#1959)

---
 .../github/wulkanowy/data/repositories/MessageRepository.kt   | 4 ++--
 app/src/main/res/values/preferences_keys.xml                  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index 00cbffb8..5a43da4e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -167,10 +167,10 @@ class MessageRepository @Inject constructor(
     }
 
     var draftMessage: MessageDraft?
-        get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft))
+        get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_draft))
             ?.let { json.decodeFromString(it) }
         set(value) = sharedPrefProvider.putString(
-            context.getString(R.string.pref_key_message_send_draft),
+            context.getString(R.string.pref_key_message_draft),
             value?.let { json.encodeToString(it) }
         )
 }
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index f29080b3..80a71bc7 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -31,8 +31,7 @@
     <string name="pref_key_homework_fullscreen">homework_fullscreen</string>
     <string name="pref_key_subjects_without_grades">subjects_without_grades</string>
     <string name="pref_key_optional_arithmetic_average">optional_arithmetic_average</string>
-    <string name="pref_key_message_send_is_draft">message_send_is_draft</string>
-    <string name="pref_key_message_send_draft">message_send_recipients</string>
+    <string name="pref_key_message_draft">message_draft</string>
     <string name="pref_key_last_sync_date">last_sync_date</string>
     <string name="pref_key_notifications_piggyback">notifications_piggyback</string>
     <string name="pref_key_notifications_piggyback_cancel_original">notifications_piggyback_cancel_original</string>

From 535206056d9b385a5cea1e15a53f0a1c7f37cb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 30 Aug 2022 09:07:07 +0200
Subject: [PATCH 107/429] Fix selecting student mailbox based on studentName
 field (#1958)

---
 app/build.gradle                              |   2 +-
 .../wulkanowy/data/db/dao/MailboxDao.kt       |   3 -
 .../data/repositories/MailboxRepository.kt    |  11 +-
 .../repositories/MailboxRepositoryTest.kt     | 132 ++++++++++++++++++
 4 files changed, 141 insertions(+), 7 deletions(-)
 create mode 100644 app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt

diff --git a/app/build.gradle b/app/build.gradle
index 5977b347..62eb8e31 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.7.0"
+    implementation "io.github.wulkanowy:sdk:09e5215894"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
index 8589db31..c44ecd0c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
@@ -11,7 +11,4 @@ interface MailboxDao : BaseDao<Mailbox> {
 
     @Query("SELECT * FROM Mailboxes WHERE userLoginId = :userLoginId ")
     suspend fun loadAll(userLoginId: Int): List<Mailbox>
-
-    @Query("SELECT * FROM Mailboxes WHERE userLoginId = :userLoginId AND studentName = :studentName ")
-    suspend fun load(userLoginId: Int, studentName: String): Mailbox?
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
index 7f597492..8c1097bd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
@@ -32,17 +32,22 @@ class MailboxRepository @Inject constructor(
 
     suspend fun getMailbox(student: Student): Mailbox {
         val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
-        val mailbox = mailboxDao.load(student.userLoginId, student.studentName)
+        val mailboxes = mailboxDao.loadAll(student.userLoginId)
+        val mailbox = mailboxes.filterByStudent(student)
 
         return if (isExpired || mailbox == null) {
             refreshMailboxes(student)
-            val newMailbox = mailboxDao.load(student.userLoginId, student.studentName)
+            val newMailbox = mailboxDao.loadAll(student.userLoginId).filterByStudent(student)
 
             requireNotNull(newMailbox) {
-                "Mailbox for ${student.userName} - ${student.studentName} not found!"
+                "Mailbox for ${student.userName} - ${student.studentName} not found! Saved mailboxes: $mailboxes"
             }
 
             newMailbox
         } else mailbox
     }
+
+    private fun List<Mailbox>.filterByStudent(student: Student): Mailbox? = find {
+        it.studentName.trim() == student.studentName.trim()
+    }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
new file mode 100644
index 00000000..56e31563
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
@@ -0,0 +1,132 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.MailboxDao
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.MailboxType
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.AutoRefreshHelper
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.impl.annotations.MockK
+import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import java.time.Instant
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class MailboxRepositoryTest {
+
+    @SpyK
+    private var sdk = Sdk()
+
+    @MockK
+    private lateinit var mailboxDao: MailboxDao
+
+    @MockK
+    private lateinit var refreshHelper: AutoRefreshHelper
+
+    private lateinit var systemUnderTest: MailboxRepository
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+
+        coEvery { refreshHelper.shouldBeRefreshed(any()) } returns false
+        coEvery { refreshHelper.updateLastRefreshTimestamp(any()) } just Runs
+        coEvery { mailboxDao.deleteAll(any()) } just Runs
+        coEvery { mailboxDao.insertAll(any()) } returns emptyList()
+        coEvery { mailboxDao.loadAll(any()) } returns emptyList()
+        coEvery { sdk.getMailboxes() } returns emptyList()
+
+        systemUnderTest = MailboxRepository(
+            mailboxDao = mailboxDao,
+            sdk = sdk,
+            refreshHelper = refreshHelper,
+        )
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun `get mailbox that doesn't exist`() = runTest {
+        val student = getStudentEntity(
+            userName = "Stanisław Kowalski",
+            studentName = "Jan Kowalski",
+        )
+        coEvery { sdk.getMailboxes() } returns emptyList()
+
+        systemUnderTest.getMailbox(student)
+    }
+
+    @Test
+    fun `get mailbox for user with additional spaces`() = runTest {
+        val student = getStudentEntity(
+            userName = "  Stanisław Kowalski  ",
+            studentName = "  Jan Kowalski  ",
+        )
+        val expectedMailbox = getMailboxEntity("Jan Kowalski ")
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(
+            expectedMailbox,
+        )
+
+        val selectedMailbox = systemUnderTest.getMailbox(student)
+        assertEquals(expectedMailbox, selectedMailbox)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun `get mailbox for student with strange name`() = runTest {
+        val student = getStudentEntity(
+            userName = "Stanisław Kowalski",
+            studentName = "J**** K*****",
+        )
+        val expectedMailbox = getMailboxEntity("Jan Kowalski")
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(
+            expectedMailbox,
+        )
+
+        systemUnderTest.getMailbox(student)
+    }
+
+    private fun getMailboxEntity(
+        studentName: String,
+    ) = Mailbox(
+        globalKey = "",
+        fullName = "",
+        userName = "",
+        userLoginId = 123,
+        studentName = studentName,
+        schoolNameShort = "",
+        type = MailboxType.STUDENT,
+    )
+
+    private fun getStudentEntity(
+        studentName: String,
+        userName: String,
+    ) = Student(
+        scrapperBaseUrl = "http://fakelog.cf",
+        email = "jan@fakelog.cf",
+        certificateKey = "",
+        classId = 0,
+        className = "",
+        isCurrent = false,
+        isParent = false,
+        loginMode = Sdk.Mode.API.name,
+        loginType = Sdk.ScrapperLoginType.STANDARD.name,
+        mobileBaseUrl = "",
+        password = "",
+        privateKey = "",
+        registrationDate = Instant.now(),
+        schoolName = "",
+        schoolShortName = "test",
+        schoolSymbol = "",
+        studentId = 1,
+        studentName = studentName,
+        symbol = "",
+        userLoginId = 1,
+        userName = userName,
+    )
+}

From eed091aad29b76ac3340e84ae90f4ffc01868491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 30 Aug 2022 09:07:24 +0200
Subject: [PATCH 108/429] Update row in mailboxes table on primary key conflict
 (#1954)

---
 app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
index 048e9e3c..056a5cbd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
@@ -2,11 +2,12 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Delete
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Update
 
 interface BaseDao<T> {
 
-    @Insert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAll(items: List<T>): List<Long>
 
     @Update

From bf34cb0c1e483b0253e12359c97e332404385e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 30 Aug 2022 12:11:32 +0200
Subject: [PATCH 109/429] New Crowdin updates (#1953)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 62eb8e31..b70e77b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:09e5215894"
+    implementation "io.github.wulkanowy:sdk:a1bf69486b"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 

From d139bd5b14a3b068f217f4ec107b5484f5539856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 30 Aug 2022 13:34:10 +0200
Subject: [PATCH 110/429] Version 1.7.2

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b70e77b7..759199ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 110
-        versionName "1.7.1"
+        versionCode 111
+        versionName "1.7.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,7 +161,7 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.95d
+    userFraction = 0.05d
     updatePriority = 5
     enabled.set(false)
 }
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:a1bf69486b"
+    implementation "io.github.wulkanowy:sdk:1.7.2"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 4b6dcaf2..69699208 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,9 +1,5 @@
-Wersja 1.7.1
+Wersja 1.7.2
 
-- naprawiliśmy logowanie do aplikacji
-- dodaliśmy wsparcie nowego modułu Wiadomości Plus
-- dodaliśmy nową możliwość wsparcia naszego projektu przez opcjonalne reklamy
-- dodaliśmy sortowanie po średniej
-- naprawiliśmy też kilka usterek wpływających na komfort używania aplikacji
+- naprawiliśmy kilka błędów w obsłudze nowego modułu wiadomości
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 558db061f594b709e10a9766ae3cdfccbf8dbed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 31 Aug 2022 18:31:12 +0200
Subject: [PATCH 111/429] Fix marking message as read (#1960)

* Fix marking message as read

* Update sdk

* Update sdk

* Fix tests

* Use many recipients strings instead of first recipient
---
 app/build.gradle                                         | 2 +-
 .../wulkanowy/data/repositories/MessageRepository.kt     | 9 ++++++---
 .../wulkanowy/data/repositories/MessageRepositoryTest.kt | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 759199ca..ab8add50 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.7.2"
+    implementation "com.github.wulkanowy:sdk:006a238bda"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index 5a43da4e..e7428762 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -64,7 +64,10 @@ class MessageRepository @Inject constructor(
         },
         query = { messagesDb.loadAll(mailbox.globalKey, folder.id) },
         fetch = {
-            sdk.init(student).getMessages(Folder.valueOf(folder.name)).mapToEntities(mailbox)
+            sdk.init(student).getMessages(
+                folder = Folder.valueOf(folder.name),
+                mailboxKey = mailbox.globalKey,
+            ).mapToEntities(mailbox)
         },
         saveFetchResult = { old, new ->
             messagesDb.deleteAll(old uniqueSubtract new)
@@ -89,7 +92,7 @@ class MessageRepository @Inject constructor(
         },
         query = { messagesDb.loadMessageWithAttachment(message.messageGlobalKey) },
         fetch = {
-            sdk.init(student).getMessageDetails(it!!.message.messageGlobalKey)
+            sdk.init(student).getMessageDetails(it!!.message.messageGlobalKey, markAsRead)
         },
         saveFetchResult = { old, new ->
             checkNotNull(old) { "Fetched message no longer exist!" }
@@ -98,7 +101,7 @@ class MessageRepository @Inject constructor(
                     id = message.id
                     unread = !markAsRead
                     sender = new.sender
-                    recipients = new.recipients.firstOrNull() ?: "Wielu adresoatów"
+                    recipients = new.recipients.singleOrNull() ?: "Wielu adresatów"
                     content = content.ifBlank { new.content }
                 })
             )
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
index 24306bfe..4efc9c60 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
@@ -141,7 +141,7 @@ class MessageRepositoryTest {
             messageDb.loadMessageWithAttachment("v4")
         } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
         coEvery {
-            sdk.getMessageDetails("v4")
+            sdk.getMessageDetails("v4", any())
         } returns mockk {
             every { sender } returns ""
             every { recipients } returns listOf("")

From d566de0282eb5ac77688233aff677673c6ec15ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 31 Aug 2022 19:31:28 +0200
Subject: [PATCH 112/429] Version 1.7.3

---
 app/build.gradle                                  | 10 +++++-----
 app/src/main/play/release-notes/pl-PL/default.txt |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab8add50..d4a9b902 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 111
-        versionName "1.7.2"
+        versionCode 112
+        versionName "1.7.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -160,8 +160,8 @@ kapt {
 play {
     defaultToAppBundles = false
     track = 'production'
-    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.05d
+//    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
+//    userFraction = 0.05d
     updatePriority = 5
     enabled.set(false)
 }
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "com.github.wulkanowy:sdk:006a238bda"
+    implementation "io.github.wulkanowy:sdk:1.7.3"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 69699208..ac19bc99 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 1.7.2
+Wersja 1.7.3
 
 - naprawiliśmy kilka błędów w obsłudze nowego modułu wiadomości
 

From 6153c7b97d58f36383f05d4357194c9c3dcb7720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Sep 2022 14:55:00 +0200
Subject: [PATCH 113/429] Add support for match mailboxes with more different
 names (#1961)

---
 .../data/repositories/MailboxRepository.kt    | 34 +++++++++-
 .../repositories/MailboxRepositoryTest.kt     | 62 ++++++++++++++++++-
 2 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
index 8c1097bd..ad4f669e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
@@ -47,7 +47,37 @@ class MailboxRepository @Inject constructor(
         } else mailbox
     }
 
-    private fun List<Mailbox>.filterByStudent(student: Student): Mailbox? = find {
-        it.studentName.trim() == student.studentName.trim()
+    private fun List<Mailbox>.filterByStudent(student: Student): Mailbox? {
+        val normalizedStudentName = student.studentName.normalizeStudentName()
+
+        return find {
+            it.studentName.normalizeStudentName() == normalizedStudentName
+        } ?: singleOrNull {
+            it.studentName.getFirstAndLastPart() == normalizedStudentName.getFirstAndLastPart()
+        } ?: singleOrNull {
+            it.studentName.getUnauthorizedVersion() == normalizedStudentName
+        }
+    }
+
+    private fun String.normalizeStudentName(): String {
+        return trim().split(" ").joinToString(" ") { part ->
+            part.lowercase().replaceFirstChar { it.uppercase() }
+        }
+    }
+
+    private fun String.getFirstAndLastPart(): String {
+        val parts = normalizeStudentName().split(" ")
+
+        val endParts = parts.filterIndexed { i, _ ->
+            i == 0 || parts.size == i - 1
+        }
+        return endParts.joinToString(" ")
+    }
+
+    private fun String.getUnauthorizedVersion(): String {
+        return normalizeStudentName().split(" ")
+            .joinToString(" ") {
+                it.first() + "*".repeat(it.length - 1)
+            }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
index 56e31563..300662f0 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
@@ -77,20 +77,76 @@ class MailboxRepositoryTest {
         assertEquals(expectedMailbox, selectedMailbox)
     }
 
-    @Test(expected = IllegalArgumentException::class)
-    fun `get mailbox for student with strange name`() = runTest {
+    @Test
+    fun `get mailbox for unique non-authorized student`() = runTest {
         val student = getStudentEntity(
             userName = "Stanisław Kowalski",
-            studentName = "J**** K*****",
+            studentName = "J** K*******",
         )
         val expectedMailbox = getMailboxEntity("Jan Kowalski")
         coEvery { mailboxDao.loadAll(any()) } returns listOf(
             expectedMailbox,
         )
 
+        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun `get mailbox for not-unique non-authorized student`() = runTest {
+        val student = getStudentEntity(
+            userName = "Stanisław Kowalski",
+            studentName = "J** K*******",
+        )
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(
+            getMailboxEntity("Jan Kowalski"),
+            getMailboxEntity("Jan Kurowski"),
+        )
+
         systemUnderTest.getMailbox(student)
     }
 
+    @Test
+    fun `get mailbox for student with uppercase name`() = runTest {
+        val student = getStudentEntity(
+            userName = "Mochoń Julia",
+            studentName = "KLAUDIA MOCHOŃ",
+        )
+        val expectedMailbox = getMailboxEntity("Klaudia Mochoń")
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(
+            expectedMailbox,
+        )
+
+        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+    }
+
+    @Test
+    fun `get mailbox for student with second name`() = runTest {
+        val student = getStudentEntity(
+            userName = "Fistaszek Karolina",
+            studentName = "Julia Fistaszek",
+        )
+        val expectedMailbox = getMailboxEntity("Julia Maria Fistaszek")
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(
+            expectedMailbox,
+        )
+
+        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+    }
+
+    @Test
+    fun `get mailbox for student with second name and uppercase`() = runTest {
+        val student = getStudentEntity(
+            userName = "BEDNAREK KAMIL",
+            studentName = "ALEKSANDRA BEDNAREK",
+        )
+        val expectedMailbox = getMailboxEntity("Aleksandra Anna Bednarek")
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(
+            expectedMailbox,
+        )
+
+        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+    }
+
     private fun getMailboxEntity(
         studentName: String,
     ) = Mailbox(

From e05abb3539c1d0d46d48f0c9528df2009a714723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Sep 2022 17:48:03 +0200
Subject: [PATCH 114/429] Fix showing empty view in grade details when there is
 no grades (#1963)

---
 .../ui/modules/grade/details/GradeDetailsPresenter.kt     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 8cde5d6b..4261c507 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.ui.modules.grade.details
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.enums.GradeExpandMode
-import io.github.wulkanowy.data.enums.GradeSortingMode
 import io.github.wulkanowy.data.enums.GradeSortingMode.*
 import io.github.wulkanowy.data.repositories.GradeRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
@@ -132,16 +131,17 @@ class GradeDetailsPresenter @Inject constructor(
         }
             .logResourceStatus("load grade details")
             .onResourceData {
+                val gradeItems = createGradeItems(it)
                 view?.run {
                     enableSwipe(true)
                     showProgress(false)
                     showErrorView(false)
-                    showContent(it.isNotEmpty())
-                    showEmpty(it.isEmpty())
+                    showContent(gradeItems.isNotEmpty())
+                    showEmpty(gradeItems.isEmpty())
                     updateNewGradesAmount(it)
                     updateMarkAsDoneButton()
                     updateData(
-                        data = createGradeItems(it),
+                        data = gradeItems,
                         expandMode = preferencesRepository.gradeExpandMode,
                         preferencesRepository.gradeColorTheme
                     )

From bc22808b0ea2ece030ff3e9ef24d5af231e22b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Sep 2022 17:48:46 +0200
Subject: [PATCH 115/429] Add support for matching last kingergarten semester
 if there is no any current (#1962)

---
 .../wulkanowy/utils/SemesterExtension.kt      |  3 +
 .../utils/SemesterExtensionKtTest.kt          | 72 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt

diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
index 6e11a8b2..380d6bf6 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -15,5 +15,8 @@ fun List<Semester>.getCurrentOrLast(): Semester {
     // when there is more than one current semester - find one with higher id
     singleOrNull { semester -> semester.semesterId == maxByOrNull { it.semesterId }?.semesterId }?.let { return it }
 
+    // when there is no active kindergarten semester - get one from last year
+    singleOrNull { semester -> semester.schoolYear == maxByOrNull { it.schoolYear }?.schoolYear }?.let { return it }
+
     throw IllegalArgumentException("Duplicated last semester! Semesters: ${joinToString(separator = "\n")}")
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt b/app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt
new file mode 100644
index 00000000..b7d3ecc9
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt
@@ -0,0 +1,72 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getSemesterEntity
+import org.junit.Test
+import java.time.LocalDate
+import kotlin.test.assertEquals
+
+class SemesterExtensionKtTest {
+
+    @Test(expected = IllegalArgumentException::class)
+    fun `get current semester when current is doubled`() {
+        val semesters = listOf(
+            getSemesterEntity(1, 1, LocalDate.now(), LocalDate.now()),
+            getSemesterEntity(1, 1, LocalDate.now(), LocalDate.now())
+        )
+
+        semesters.getCurrentOrLast()
+    }
+
+    @Test(expected = RuntimeException::class)
+    fun `get current semester when there is empty list`() {
+        val semesters = listOf<Semester>()
+
+        semesters.getCurrentOrLast()
+    }
+
+    @Test
+    fun `get current kindergarten semester when there is no any current`() {
+        val semesters = listOf(
+            createSemesterEntity(
+                kindergartenDiaryId = 281,
+                schoolYear = 2020,
+                semesterId = 0,
+                start = LocalDate.of(2020, 9, 1),
+                end = LocalDate.of(2021, 8, 31),
+            ),
+            createSemesterEntity(
+                kindergartenDiaryId = 342,
+                schoolYear = 2021,
+                semesterId = 0,
+                start = LocalDate.of(2021, 9, 1),
+                end = LocalDate.of(2022, 8, 31),
+            ),
+        )
+
+        val res = semesters.getCurrentOrLast()
+
+        assertEquals(2021, res.schoolYear)
+    }
+
+    private fun createSemesterEntity(
+        diaryId: Int = 0,
+        kindergartenDiaryId: Int = 0,
+        semesterId: Int = 0,
+        schoolYear: Int = 0,
+        start: LocalDate = LocalDate.now(),
+        end: LocalDate = LocalDate.now().plusMonths(6),
+    ) = Semester(
+        studentId = 1,
+        diaryId = diaryId,
+        kindergartenDiaryId = kindergartenDiaryId,
+        semesterId = semesterId,
+        diaryName = "$semesterId",
+        schoolYear = schoolYear,
+        classId = 0,
+        semesterName = semesterId,
+        unitId = 1,
+        start = start,
+        end = end
+    )
+}

From e67066f3aea1f32c1470b7e43c90cb3da013027e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Sep 2022 17:57:20 +0200
Subject: [PATCH 116/429] Version 1.7.4

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d4a9b902..e8902fdd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 112
-        versionName "1.7.3"
+        versionCode 113
+        versionName "1.7.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.7.3"
+    implementation "io.github.wulkanowy:sdk:1.7.4"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index ac19bc99..7fe3b709 100644
--- 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 1.7.3
+Wersja 1.7.4
 
 - naprawiliśmy kilka błędów w obsłudze nowego modułu wiadomości
+- naprawiliśmy wyświetlanie napisu "Brak ocen", jesli uczeń nie zdobył w danym semestrze jeszcze żadnych ocen
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 157becb017f3502e54ff42ba4f0dbc1bbcd136c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 2 Sep 2022 20:19:19 +0200
Subject: [PATCH 117/429] Fix matching mailboxes when there is more than one
 space between words (#1964)

---
 app/build.gradle                                   |  2 +-
 .../data/repositories/MailboxRepository.kt         | 10 ++++++----
 .../data/repositories/MailboxRepositoryTest.kt     | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e8902fdd..c9425d58 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.7.4"
+    implementation "io.github.wulkanowy:sdk:dcd8bd8b19"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
index ad4f669e..c571937a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
@@ -60,16 +60,18 @@ class MailboxRepository @Inject constructor(
     }
 
     private fun String.normalizeStudentName(): String {
-        return trim().split(" ").joinToString(" ") { part ->
-            part.lowercase().replaceFirstChar { it.uppercase() }
-        }
+        return trim().split(" ")
+            .filter { it.isNotBlank() }
+            .joinToString(" ") { part ->
+                part.lowercase().replaceFirstChar { it.uppercase() }
+            }
     }
 
     private fun String.getFirstAndLastPart(): String {
         val parts = normalizeStudentName().split(" ")
 
         val endParts = parts.filterIndexed { i, _ ->
-            i == 0 || parts.size == i - 1
+            i == 0 || parts.size - 1 == i
         }
         return endParts.joinToString(" ")
     }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
index 300662f0..9198560f 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
@@ -91,6 +91,20 @@ class MailboxRepositoryTest {
         assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
     }
 
+    @Test
+    fun `get mailbox for unique non-authorized student but with spaces`() = runTest {
+        val student = getStudentEntity(
+            userName = "Stanisław Kowalski",
+            studentName = "J**  K*******",
+        )
+        val expectedMailbox = getMailboxEntity("Jan  Kowalski")
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(
+            expectedMailbox,
+        )
+
+        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+    }
+
     @Test(expected = IllegalArgumentException::class)
     fun `get mailbox for not-unique non-authorized student`() = runTest {
         val student = getStudentEntity(

From 86f8763e697b2976d3b73f9d9f78dc102789191d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 2 Sep 2022 21:30:30 +0200
Subject: [PATCH 118/429] Display lesson number in attendance notification if
 subject is blank (#1965)

---
 .../services/sync/notifications/NewAttendanceNotification.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewAttendanceNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewAttendanceNotification.kt
index 49842c9a..99473a8e 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewAttendanceNotification.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewAttendanceNotification.kt
@@ -8,7 +8,6 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.GroupNotificationData
 import io.github.wulkanowy.data.pojos.NotificationData
 import io.github.wulkanowy.ui.modules.Destination
-import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.utils.descriptionRes
 import io.github.wulkanowy.utils.getPlural
 import io.github.wulkanowy.utils.toFormattedString
@@ -22,8 +21,9 @@ class NewAttendanceNotification @Inject constructor(
     suspend fun notify(items: List<Attendance>, student: Student) {
         val lines = items.filterNot { it.presence || it.name == "UNKNOWN" }
             .map {
+                val lesson = it.subject.ifBlank { "Lekcja ${it.number}" }
                 val description = context.getString(it.descriptionRes)
-                "${it.date.toFormattedString("dd.MM")} - ${it.subject}: $description"
+                "${it.date.toFormattedString("dd.MM")} - $lesson: $description"
             }
             .ifEmpty { return }
 

From 59f6f5c2120cfc5ea02bc7e3f1a7d85e6197be51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 2 Sep 2022 21:31:27 +0200
Subject: [PATCH 119/429] Version 1.7.5

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c9425d58..6584b0d2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 113
-        versionName "1.7.4"
+        versionCode 114
+        versionName "1.7.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -162,7 +162,7 @@ play {
     track = 'production'
 //    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
 //    userFraction = 0.05d
-    updatePriority = 5
+    updatePriority = 4
     enabled.set(false)
 }
 
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:dcd8bd8b19"
+    implementation "io.github.wulkanowy:sdk:1.7.5"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 7fe3b709..064401ab 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,6 +1,7 @@
-Wersja 1.7.4
+Wersja 1.7.5
 
 - naprawiliśmy kilka błędów w obsłudze nowego modułu wiadomości
 - naprawiliśmy wyświetlanie napisu "Brak ocen", jesli uczeń nie zdobył w danym semestrze jeszcze żadnych ocen
+- naprawiliśmy logowanie do aplikacji rodzicom będącym jednocześnie nauczycielami
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 73a7255d3a003e15de313387bcbf40c73fa17ae5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Sep 2022 19:49:30 +0000
Subject: [PATCH 120/429] Bump firebase-bom from 30.3.2 to 30.4.0 (#1968)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6584b0d2..17a9fe42 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.3.2')
+    playImplementation platform('com.google.firebase:firebase-bom:30.4.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 46c29c438eb1a52824dff8d9b0d1d385c3366013 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:17:19 +0000
Subject: [PATCH 121/429] Bump appcompat from 1.5.0 to 1.5.1 (#1975)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 17a9fe42..41ead9f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,7 +196,7 @@ dependencies {
     implementation "androidx.core:core-ktx:1.8.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.5.1"
-    implementation "androidx.appcompat:appcompat:1.5.0"
+    implementation "androidx.appcompat:appcompat:1.5.1"
     implementation "androidx.fragment:fragment-ktx:1.5.2"
     implementation "androidx.annotation:annotation:1.4.0"
 

From d3f869c6c2400a5b7fa427a45d89df0add4f5420 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:18:09 +0000
Subject: [PATCH 122/429] Bump firebase-bom from 30.4.0 to 30.4.1 (#1971)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 41ead9f3..c2dba71f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.4.0')
+    playImplementation platform('com.google.firebase:firebase-bom:30.4.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From d5d45ed1baa7ec0c52abb0fba9e8bec67c6123e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:18:29 +0000
Subject: [PATCH 123/429] Bump play-services-ads from 21.1.0 to 21.2.0 (#1972)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c2dba71f..7bd4ed15 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,7 +247,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:21.1.0'
+    playImplementation 'com.google.android.gms:play-services-ads:21.2.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.7.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.1.300'

From a5c636853a9a15563caedf0f5bc90a3a9021d6fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:19:05 +0000
Subject: [PATCH 124/429] Bump coil from 2.2.0 to 2.2.1 (#1973)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7bd4ed15..7b7251f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -236,7 +236,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.2.0"
+    implementation "io.coil-kt:coil:2.2.1"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'

From afbfb9761fe61339f364f88ef8fde9d4703cb4e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:38:55 +0000
Subject: [PATCH 125/429] Bump mockk from 1.12.7 to 1.12.8 (#1986)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7b7251f8..67b4fd07 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.4.3"
     chucker = "3.5.2"
-    mockk = "1.12.7"
+    mockk = "1.12.8"
     coroutines = "1.6.4"
 }
 

From 3625c5c5187786f781ea446433f09f13b809861d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:39:08 +0000
Subject: [PATCH 126/429] Bump firebase-bom from 30.4.1 to 30.5.0 (#1991)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 67b4fd07..6f3f1e98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.4.1')
+    playImplementation platform('com.google.firebase:firebase-bom:30.5.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 4f0519552e3dbce9e5cdecd10685ed1e85aca540 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:39:29 +0000
Subject: [PATCH 127/429] Bump firebase-crashlytics-gradle from 2.9.1 to 2.9.2
 (#1988)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 98c9dfb8..d98f6f27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.huawei.agconnect:agcp:1.7.1.300'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513"

From f1db993feedb35e746f309dfa0a11c4d0092a0c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:40:36 +0000
Subject: [PATCH 128/429] Bump agconnect-crash from 1.7.1.300 to 1.7.2.300
 (#1990)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6f3f1e98..6fddc1a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -250,7 +250,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:21.2.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.7.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.1.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.2.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From a1dc00af42c73255eeec65704df526c3c877aac4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:49:36 +0000
Subject: [PATCH 129/429] Bump agcp from 1.7.1.300 to 1.7.2.300 (#1989)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d98f6f27..942cf4b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'com.huawei.agconnect:agcp:1.7.1.300'
+        classpath 'com.huawei.agconnect:agcp:1.7.2.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"

From 5148ff291b7b5c7b2c33061e7e769325c9728aee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Sep 2022 20:59:41 +0000
Subject: [PATCH 130/429] Bump google-services from 4.3.13 to 4.3.14 (#1992)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 942cf4b6..53fcfda5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.google.gms:google-services:4.3.13'
+        classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.huawei.agconnect:agcp:1.7.2.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"

From 1bbd249275b97b145011fdd30355664984c03bcb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 20:25:58 +0000
Subject: [PATCH 131/429] Bump fragment-ktx from 1.5.2 to 1.5.3 (#1997)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6fddc1a7..e67747d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,7 +197,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "androidx.appcompat:appcompat:1.5.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.2"
+    implementation "androidx.fragment:fragment-ktx:1.5.3"
     implementation "androidx.annotation:annotation:1.4.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From edbe45332ac522a6d3e78ad76a9d3af09edf5960 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 20:27:43 +0000
Subject: [PATCH 132/429] Bump mockk from 1.12.8 to 1.13.1 (#1996)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e67747d7..eaa81d23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.4.3"
     chucker = "3.5.2"
-    mockk = "1.12.8"
+    mockk = "1.13.1"
     coroutines = "1.6.4"
 }
 

From 8ca41b5ba348483bf9c10a2af927eb387526748e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 20:28:01 +0000
Subject: [PATCH 133/429] Bump hianalytics from 6.7.0.300 to 6.8.0.300 (#1995)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index eaa81d23..8d33323f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -249,7 +249,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:21.2.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.7.0.300'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.8.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.2.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From b271c12ebccd7bb6e8ddaf18f68ed09071f385d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 20:28:31 +0000
Subject: [PATCH 134/429] Bump hilt_version from 2.43.2 to 2.44 (#1994)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 53fcfda5..e308c579 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.7.10'
         about_libraries = '10.4.0'
-        hilt_version = "2.43.2"
+        hilt_version = "2.44"
     }
     repositories {
         mavenCentral()

From 354f51dd707807c7c423b275df7ea4e672689443 Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Wed, 28 Sep 2022 23:33:05 +0200
Subject: [PATCH 135/429] Fix student average calculation error in grade
 statistics (#1981)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 app/build.gradle                              |  2 +-
 .../grade/summary/GradeSummaryAdapter.kt      |  3 ++-
 .../github/wulkanowy/utils/GradeExtension.kt  | 24 ++++++++-----------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8d33323f..1b745f0b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.7.5"
+    implementation "io.github.wulkanowy:sdk:2840d9d6d0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
index 082c847e..8dcade56 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
@@ -10,6 +10,7 @@ import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
+import io.github.wulkanowy.sdk.scrapper.grades.isGradeValid
 import io.github.wulkanowy.utils.calcFinalAverage
 import java.util.Locale
 import javax.inject.Inject
@@ -61,7 +62,7 @@ class GradeSummaryAdapter @Inject constructor(
         if (items.isEmpty()) return
 
         val context = binding.root.context
-        val finalItemsCount = items.count { it.finalGrade.matches("[0-6][+-]?".toRegex()) }
+        val finalItemsCount = items.count { isGradeValid(it.finalGrade) }
         val calculatedItemsCount = items.count { value -> value.average != 0.0 }
         val allItemsCount = items.count { !it.subject.equals("zachowanie", true) }
         val finalAverage = items.calcFinalAverage(
diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
index ff65d637..61924d4e 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -4,6 +4,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.enums.GradeColorTheme
+import io.github.wulkanowy.sdk.scrapper.grades.getGradeValueWithModifier
 import io.github.wulkanowy.sdk.scrapper.grades.isGradeValid
 
 fun List<Grade>.calcAverage(isOptionalArithmeticAverage: Boolean): Double {
@@ -20,20 +21,15 @@ fun List<Grade>.calcAverage(isOptionalArithmeticAverage: Boolean): Double {
 }
 
 fun List<GradeSummary>.calcFinalAverage(plusModifier: Double, minusModifier: Double) = asSequence()
-    .mapNotNull {
-        if (it.finalGrade.matches("[0-6][+-]?".toRegex())) {
-            when {
-                it.finalGrade.endsWith('+') -> {
-                    it.finalGrade.removeSuffix("+").toDouble() + plusModifier
-                }
-                it.finalGrade.endsWith('-') -> {
-                    it.finalGrade.removeSuffix("-").toDouble() - minusModifier
-                }
-                else -> {
-                    it.finalGrade.toDouble()
-                }
-            }
-        } else null
+    .mapNotNull { summary ->
+        val (gradeValue, gradeModifier) = getGradeValueWithModifier(summary.finalGrade)
+        if (gradeValue == null || gradeModifier == null) return@mapNotNull null
+
+        when {
+            gradeModifier > 0 -> gradeValue + plusModifier
+            gradeModifier < 0 -> gradeValue - minusModifier
+            else -> gradeValue + 0.0
+        }
     }
     .average()
     .let { if (it.isNaN()) 0.0 else it }

From a523850216a5d9dc82dc3fda9a73e94507c172f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 23:34:06 +0200
Subject: [PATCH 136/429] Bump annotation from 1.4.0 to 1.5.0 (#1998)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1b745f0b..3127d55c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -198,7 +198,7 @@ dependencies {
     implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "androidx.appcompat:appcompat:1.5.1"
     implementation "androidx.fragment:fragment-ktx:1.5.3"
-    implementation "androidx.annotation:annotation:1.4.0"
+    implementation "androidx.annotation:annotation:1.5.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"
     implementation "androidx.recyclerview:recyclerview:1.2.1"

From 8114a2376ee3f798e950b4a2deab3ad21c946f19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Sep 2022 21:43:45 +0000
Subject: [PATCH 137/429] Bump gradle from 7.2.2 to 7.3.0 (#1985)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e308c579..739d5752 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.huawei.agconnect:agcp:1.7.2.300'

From 4dc80595ac9d47e8a07fe998e14dffcee83d5885 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 07:49:22 +0000
Subject: [PATCH 138/429] Bump robolectric from 4.8.2 to 4.9 (#2007)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3127d55c..ef5b9950 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -263,7 +263,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.8.2'
+    testImplementation 'org.robolectric:robolectric:4.9'
     testImplementation "androidx.test:runner:1.4.0"
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation "androidx.test:core:1.4.0"

From 95a90a7a79f2b2ef0510baaf305257246997f6f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 07:49:41 +0000
Subject: [PATCH 139/429] Bump mockk from 1.13.1 to 1.13.2 (#2006)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ef5b9950..458f963f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.4.3"
     chucker = "3.5.2"
-    mockk = "1.13.1"
+    mockk = "1.13.2"
     coroutines = "1.6.4"
 }
 

From c65303959072a7e4b009973ed593abfd7f6657c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 07:50:05 +0000
Subject: [PATCH 140/429] Bump coil from 2.2.1 to 2.2.2 (#2004)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 458f963f..cd4f6cc1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -236,7 +236,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.2.1"
+    implementation "io.coil-kt:coil:2.2.2"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'

From 37f7f21a033e03ccb976dc8c6c267ef68061cd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 4 Oct 2022 09:51:30 +0200
Subject: [PATCH 141/429] Reorder action buttons on the message preview screen
 to hide the forward button in overflow menu (#2000)

---
 .../res/menu/action_menu_message_preview.xml  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
index 5011e235..57cf05dd 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -8,20 +8,6 @@
         android:title="@string/message_reply"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/messagePreviewMenuForward"
-        android:icon="@drawable/ic_menu_message_forward"
-        android:orderInCategory="1"
-        android:title="@string/message_forward"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/messagePreviewMenuDelete"
-        android:icon="@drawable/ic_menu_message_delete"
-        android:orderInCategory="1"
-        android:title="@string/message_move_to_trash"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/messagePreviewMenuShare"
         android:icon="@drawable/ic_menu_message_share"
@@ -36,4 +22,18 @@
         android:title="@string/message_print"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuForward"
+        android:icon="@drawable/ic_menu_message_forward"
+        android:orderInCategory="1"
+        android:title="@string/message_forward"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuDelete"
+        android:icon="@drawable/ic_menu_message_delete"
+        android:orderInCategory="1"
+        android:title="@string/message_move_to_trash"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
 </menu>

From cd037f0ce0f2f2b0107af5114ed3c11f1d03388e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 07:58:58 +0000
Subject: [PATCH 142/429] Bump kotlin_version from 1.7.10 to 1.7.20 (#2003)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 739d5752..fb58a44d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.7.10'
+        kotlin_version = '1.7.20'
         about_libraries = '10.4.0'
         hilt_version = "2.44"
     }

From 3f431022a5b5316babaa89951d13a67d5680299e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 08:08:21 +0000
Subject: [PATCH 143/429] Bump about_libraries from 10.4.0 to 10.5.0 (#2005)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index fb58a44d..9f5b21f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.7.20'
-        about_libraries = '10.4.0'
+        about_libraries = '10.5.0'
         hilt_version = "2.44"
     }
     repositories {

From ad487e680cf6907eba664d7922c12f184974f830 Mon Sep 17 00:00:00 2001
From: Daniel Olczyk <44818681+MRmlik12@users.noreply.github.com>
Date: Wed, 5 Oct 2022 22:25:09 +0200
Subject: [PATCH 144/429] Fix grade weight text truncation in grade dialog with
 large font set (#2009)

---
 app/src/main/res/layout/dialog_grade.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index 9c52c1d0..94facb23 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -21,7 +21,7 @@
             <LinearLayout
                 android:id="@+id/gradeDialogValueLayout"
                 android:layout_width="101dp"
-                android:layout_height="121dp"
+                android:layout_height="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"

From 42f9a00e8c88f21f09b70bd0ebc3b6f17fc601ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 19:39:16 +0000
Subject: [PATCH 145/429] Bump play-services-ads from 21.2.0 to 21.3.0 (#2016)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index cd4f6cc1..a0285de8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,7 +247,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:21.2.0'
+    playImplementation 'com.google.android.gms:play-services-ads:21.3.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.8.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.2.300'

From 1f11eea9b58e66ce9c7aa6aba7e1dd3ad3ad6078 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 19:39:36 +0000
Subject: [PATCH 146/429] Bump gradle from 7.3.0 to 7.3.1 (#2015)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9f5b21f4..5b7b4abb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.huawei.agconnect:agcp:1.7.2.300'

From e20c232f8fd2797dd83fae0e6dbdeddde6b000d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 19:39:54 +0000
Subject: [PATCH 147/429] Bump kotlinx-serialization-json from 1.4.0 to 1.4.1
 (#2014)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a0285de8..4ea25d7e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -190,7 +190,7 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.8.0"

From 4c24363599f8dc486a1d7b9a1507977439ef9982 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 19:40:28 +0000
Subject: [PATCH 148/429] Bump about_libraries from 10.5.0 to 10.5.1 (#2012)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5b7b4abb..5131796b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.7.20'
-        about_libraries = '10.5.0'
+        about_libraries = '10.5.1'
         hilt_version = "2.44"
     }
     repositories {

From e91cd188044c94c1022f13f053d74cf243201d5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 19:41:15 +0000
Subject: [PATCH 149/429] Bump firebase-bom from 30.5.0 to 31.0.0 (#2013)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4ea25d7e..672a4bec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:30.5.0')
+    playImplementation platform('com.google.firebase:firebase-bom:31.0.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From a14c4b489bf1b413157500666c828fc4a178c7f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:22:16 +0000
Subject: [PATCH 150/429] Bump material from 1.6.1 to 1.7.0 (#2022)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 672a4bec..8848a413 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -206,7 +206,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.6.1"
+    implementation "com.google.android.material:material:1.7.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.2.0'

From 4a484dc2ce25472961f0842cb3e05575233b1c00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:22:34 +0000
Subject: [PATCH 151/429] Bump fragment-ktx from 1.5.3 to 1.5.4 (#2020)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8848a413..b15eb651 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,7 +197,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.5.1"
     implementation "androidx.appcompat:appcompat:1.5.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.3"
+    implementation "androidx.fragment:fragment-ktx:1.5.4"
     implementation "androidx.annotation:annotation:1.5.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From 49b383fbe51078cc375d972aea6b11458906a35f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:22:53 +0000
Subject: [PATCH 152/429] Bump firebase-bom from 31.0.0 to 31.0.1 (#2019)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b15eb651..6211db2d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:31.0.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 3925a6261b9d921f2ea4b0f051b7092af90d9930 Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Wed, 26 Oct 2022 22:27:37 +0200
Subject: [PATCH 153/429] Add missing CS and SK links in German README (#2018)

---
 README.de.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.de.md b/README.de.md
index b9e1d1ec..e03557a0 100644
--- a/README.de.md
+++ b/README.de.md
@@ -2,6 +2,10 @@
 
 [English version of README](README.en.md)
 
+[Česká verze README](README.cs.md)
+
+[Slovenská verzia README](README.sk.md)
+
 # Wulkanowy
 
 [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)

From 22a4f509dcc49086ea51939d0b820a479a01aa32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 27 Oct 2022 12:41:33 +0200
Subject: [PATCH 154/429] Add installation id to crashlytics and bug report
 emails (#2024)

---
 .../github/wulkanowy/utils/AnalyticsHelper.kt | 14 +++-------
 .../github/wulkanowy/utils/AnalyticsHelper.kt | 26 ++++++++++++++-----
 .../github/wulkanowy/utils/CrashLogUtils.kt   |  9 ++-----
 .../repositories/PreferencesRepository.kt     | 24 ++++++++---------
 .../github/wulkanowy/ui/base/ErrorDialog.kt   | 10 ++++---
 .../ui/modules/about/AboutFragment.kt         |  7 ++++-
 .../modules/login/form/LoginFormFragment.kt   |  7 ++++-
 .../LoginStudentSelectFragment.kt             | 10 +++++--
 .../login/symbol/LoginSymbolFragment.kt       |  7 ++++-
 app/src/main/res/values/strings.xml           |  4 +--
 .../github/wulkanowy/utils/AnalyticsHelper.kt | 26 ++++++++++++++-----
 .../wulkanowy/utils/CrashlyticsUtils.kt       |  3 ---
 12 files changed, 90 insertions(+), 57 deletions(-)

diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
index 3bf7e169..a3eed484 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
@@ -8,15 +8,7 @@ import javax.inject.Singleton
 @Suppress("UNUSED_PARAMETER")
 class AnalyticsHelper @Inject constructor() {
 
-    fun logEvent(name: String, vararg params: Pair<String, Any?>) {
-        // do nothing
-    }
-
-    fun setCurrentScreen(activity: Activity, name: String?) {
-        // do nothing
-    }
-
-    fun popCurrentScreen(name: String?) {
-        // do nothing
-    }
+    fun logEvent(name: String, vararg params: Pair<String, Any?>) = Unit
+    fun setCurrentScreen(activity: Activity, name: String?) = Unit
+    fun popCurrentScreen(name: String?) = Unit
 }
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
index 5d33825f..1f78931a 100644
--- a/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
@@ -3,26 +3,38 @@ package io.github.wulkanowy.utils
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
+import com.huawei.agconnect.crash.AGConnectCrash
 import com.huawei.hms.analytics.HiAnalytics
 import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    preferencesRepository: PreferencesRepository,
+    appInfo: AppInfo,
 ) {
 
     private val analytics by lazy { HiAnalytics.getInstance(context) }
 
+    private val connectCrash by lazy { AGConnectCrash.getInstance() }
+
+    init {
+        if (!appInfo.isDebug) {
+            connectCrash.setUserId(preferencesRepository.installationId)
+        }
+    }
+
     fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         Bundle().apply {
-            params.forEach {
-                if (it.second == null) return@forEach
-                when (it.second) {
-                    is String, is String? -> putString(it.first, it.second as String)
-                    is Int, is Int? -> putInt(it.first, it.second as Int)
-                    is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
+            params.forEach { (key, value) ->
+                if (value == null) return@forEach
+                when (value) {
+                    is String -> putString(key, value)
+                    is Int -> putInt(key, value)
+                    is Boolean -> putBoolean(key, value)
                 }
             }
             analytics.onEvent(name, this)
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
index b0c34f41..377e8366 100644
--- a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.utils
 import android.util.Log
 import com.huawei.agconnect.crash.AGConnectCrash
 import fr.bipi.tressence.base.FormatterPriorityTree
+import fr.bipi.tressence.common.StackTraceRecorder
 
 class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
 
@@ -22,16 +23,10 @@ class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR, ExceptionFilter)
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         if (skipLog(priority, tag, message, t)) return
 
-        // Disabled due to a bug in the Huawei library
-
-        /*connectCrash.setCustomKey("priority", priority)
-        connectCrash.setCustomKey("tag", tag.orEmpty())
-        connectCrash.setCustomKey("message", message)
-
         if (t != null) {
             connectCrash.recordException(t)
         } else {
             connectCrash.recordException(StackTraceRecorder(format(priority, tag, message)))
-        }*/
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 486538e0..afc26286 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -10,17 +10,16 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.enums.*
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.Instant
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @Singleton
 class PreferencesRepository @Inject constructor(
     @ApplicationContext val context: Context,
@@ -316,6 +315,16 @@ class PreferencesRepository @Inject constructor(
             putBoolean(context.getString(R.string.pref_key_ads_enabled), value)
         }
 
+    var installationId: String
+        get() = sharedPref.getString(PREF_KEY_INSTALLATION_ID, null).orEmpty()
+        private set(value) = sharedPref.edit { putString(PREF_KEY_INSTALLATION_ID, value) }
+
+    init {
+        if (installationId.isEmpty()) {
+            installationId = UUID.randomUUID().toString()
+        }
+    }
+
     private fun getLong(id: Int, default: Int) = getLong(context.getString(id), default)
 
     private fun getLong(id: String, default: Int) =
@@ -331,23 +340,14 @@ class PreferencesRepository @Inject constructor(
     private fun getBoolean(id: String, default: Int) =
         sharedPref.getBoolean(id, context.resources.getBoolean(default))
 
-    private fun getBoolean(id: Int, default: Boolean) =
-        sharedPref.getBoolean(context.getString(id), default)
-
     private companion object {
-
+        private const val PREF_KEY_INSTALLATION_ID = "installation_id"
         private const val PREF_KEY_DASHBOARD_ITEMS_POSITION = "dashboard_items_position"
-
         private const val PREF_KEY_IN_APP_REVIEW_COUNT = "in_app_review_count"
-
         private const val PREF_KEY_IN_APP_REVIEW_DATE = "in_app_review_date"
-
         private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done"
-
         private const val PREF_KEY_APP_SUPPORT_SHOWN = "app_support_shown"
-
         private const val PREF_KEY_PERSONALIZED_ADS_ENABLED = "personalized_ads_enabled"
-
         private const val PREF_KEY_ADMIN_DISMISSED_MESSAGE_IDS = "admin_message_dismissed_ids"
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index 48c003b7..e979fa8a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -4,7 +4,6 @@ import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
@@ -15,6 +14,7 @@ import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.DialogErrorBinding
 import io.github.wulkanowy.utils.*
 import javax.inject.Inject
@@ -25,6 +25,9 @@ class ErrorDialog : DialogFragment() {
     @Inject
     lateinit var appInfo: AppInfo
 
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
     companion object {
         private const val ARGUMENT_KEY = "error"
 
@@ -36,7 +39,7 @@ class ErrorDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val error = requireArguments().getSerializable(ARGUMENT_KEY) as Throwable
 
-        val binding = DialogErrorBinding.inflate(LayoutInflater.from(context))
+        val binding = DialogErrorBinding.inflate(layoutInflater)
         binding.bindErrorDetails(error)
 
         return getAlertDialog(binding, error).apply {
@@ -99,7 +102,8 @@ class ErrorDialog : DialogFragment() {
                 R.string.about_feedback_template,
                 "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                 appInfo.systemVersion.toString(),
-                "${appInfo.versionName}-${appInfo.buildFlavor}"
+                "${appInfo.versionName}-${appInfo.buildFlavor}",
+                preferencesRepository.installationId,
             ) + "\n" + content,
             onActivityNotFound = {
                 requireContext().openInternetBrowser(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index 701656b5..d7f39e30 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentAboutBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
@@ -30,6 +31,9 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
     @Inject
     lateinit var appInfo: AppInfo
 
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
     override val versionRes: Triple<String, String, Drawable?>?
         get() = context?.run {
             val buildTimestamp =
@@ -185,7 +189,8 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
                 R.string.about_feedback_template,
                 "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                 appInfo.systemVersion.toString(),
-                "${appInfo.versionName}-${appInfo.buildFlavor}"
+                "${appInfo.versionName}-${appInfo.buildFlavor}",
+                preferencesRepository.installationId,
             ),
             onActivityNotFound = {
                 requireContext().openInternetBrowser(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index d31f5cf0..463e192d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -10,6 +10,7 @@ import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -32,6 +33,9 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     @Inject
     lateinit var appInfo: AppInfo
 
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
     companion object {
         fun newInstance() = LoginFormFragment()
     }
@@ -260,8 +264,9 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
                 R.string.login_email_text,
                 "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                 appInfo.systemVersion.toString(),
-                appInfo.versionName,
+                "${appInfo.versionName}-${appInfo.buildFlavor}",
                 "$formHostValue/$formHostSymbol",
+                preferencesRepository.installationId,
                 lastError
             )
         )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index 6c910fe0..c42a4e9d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -32,6 +33,9 @@ class LoginStudentSelectFragment :
     @Inject
     lateinit var appInfo: AppInfo
 
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
     companion object {
         const val ARG_STUDENTS = "STUDENTS"
 
@@ -111,10 +115,12 @@ class LoginStudentSelectFragment :
             email = "wulkanowyinc@gmail.com",
             subject = requireContext().getString(R.string.login_email_subject),
             body = requireContext().getString(
-                R.string.login_email_text, appInfo.systemModel,
+                R.string.login_email_text,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                 appInfo.systemVersion.toString(),
-                appInfo.versionName,
+                "${appInfo.versionName}-${appInfo.buildFlavor}",
                 "Select users to log in",
+                preferencesRepository.installationId,
                 lastError
             )
         )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 58bdf6ce..36c40d15 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -13,6 +13,7 @@ import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
@@ -34,6 +35,9 @@ class LoginSymbolFragment :
     @Inject
     lateinit var appInfo: AppInfo
 
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
     companion object {
         private const val SAVED_LOGIN_DATA = "LOGIN_DATA"
 
@@ -159,8 +163,9 @@ class LoginSymbolFragment :
                 R.string.login_email_text,
                 "${appInfo.systemManufacturer} ${appInfo.systemModel}",
                 appInfo.systemVersion.toString(),
-                appInfo.versionName,
+                "${appInfo.versionName}-${appInfo.buildFlavor}",
                 "$host/${binding.loginSymbolName.text}",
+                preferencesRepository.installationId,
                 lastError
             )
         )
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4542547..48376d21 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,7 +71,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Send email</string>
     <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
-    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nOstatni błąd: %5$s\n\nNazwa szkoły i miejscowość: </string>
+    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nIdentyfikator instalacji: %5$s\nOstatni błąd: %6$s\n\nNazwa szkoły i miejscowość: </string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
     <string name="login_recover_button">I forgot my password</string>
     <string name="login_recover_title">Recover your account</string>
@@ -512,7 +512,7 @@
     <string name="about_homepage_summary">Visit the website and help develop the application</string>
     <string name="about_licenses">Licenses</string>
     <string name="about_licenses_summary">Licenses of libraries used in the application</string>
-    <string name="about_feedback_template" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\n\nTreść zgłoszenia:</string>
+    <string name="about_feedback_template" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nIdentyfikator instalacji: %4$s\nTreść zgłoszenia:</string>
 
 
     <!--Licenses-->
diff --git a/app/src/play/java/io/github/wulkanowy/utils/AnalyticsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
index b6532579..3215fa20 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/AnalyticsHelper.kt
@@ -4,25 +4,37 @@ import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AnalyticsHelper @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    preferencesRepository: PreferencesRepository,
+    appInfo: AppInfo,
 ) {
 
     private val analytics by lazy { FirebaseAnalytics.getInstance(context) }
 
+    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
+
+    init {
+        if (!appInfo.isDebug) {
+            crashlytics.setUserId(preferencesRepository.installationId)
+        }
+    }
+
     fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         Bundle().apply {
-            params.forEach {
-                if (it.second == null) return@forEach
-                when (it.second) {
-                    is String, is String? -> putString(it.first, it.second.toString())
-                    is Int, is Int? -> putInt(it.first, it.second as Int)
-                    is Boolean, is Boolean? -> putBoolean(it.first, it.second as Boolean)
+            params.forEach { (key, value) ->
+                if (value == null) return@forEach
+                when (value) {
+                    is String -> putString(key, value)
+                    is Int -> putInt(key, value)
+                    is Boolean -> putBoolean(key, value)
                 }
             }
             analytics.logEvent(name, this)
diff --git a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index 410fddf1..f980bc4b 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -23,9 +23,6 @@ class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR, ExceptionFilter)
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         if (skipLog(priority, tag, message, t)) return
 
-        crashlytics.setCustomKey("priority", priority)
-        crashlytics.setCustomKey("tag", tag.orEmpty())
-        crashlytics.setCustomKey("message", message)
         if (t != null) {
             crashlytics.recordException(t)
         } else {

From 7bee10d5ce0aa85becaa5a5b2a8ecd752ae0b1cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 28 Oct 2022 11:08:40 +0200
Subject: [PATCH 155/429] Hide room view in timetable item if there is no room
 in API (#2026)

---
 .../github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
index d6917672..2f0d697f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -191,7 +191,7 @@ class TimetableAdapter @Inject constructor() :
                 )
             } else {
                 timetableItemDescription.visibility = GONE
-                timetableItemRoom.visibility = VISIBLE
+                timetableItemRoom.isVisible = lesson.room.isNotBlank() || lesson.roomOld.isNotBlank()
                 timetableItemGroup.isVisible = item.showGroupsInPlan && lesson.group.isNotBlank()
                 timetableItemTeacher.visibility = VISIBLE
             }

From 515a3973b74048daba05783609b5530b59279938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 28 Oct 2022 11:09:38 +0200
Subject: [PATCH 156/429] Use text color, font face and red dot to
 differentiate unread messages  (#2027)

---
 .../modules/message/tab/MessageTabAdapter.kt  | 33 ++++++++++++++-----
 app/src/main/res/drawable/ic_circle.xml       | 10 ++++++
 app/src/main/res/layout/item_message.xml      | 22 +++++++++++--
 3 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_circle.xml

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
index 55f03ef8..234d17eb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -1,15 +1,18 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
+import android.content.res.ColorStateList
 import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.CompoundButton
 import androidx.core.view.isVisible
+import androidx.core.widget.ImageViewCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.ItemMessageBinding
 import io.github.wulkanowy.databinding.ItemMessageChipsBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
 
@@ -85,21 +88,35 @@ class MessageTabAdapter @Inject constructor() :
         val message = item.message
 
         with(holder.binding) {
-            val style = if (message.unread) Typeface.BOLD else Typeface.NORMAL
+            val normalFont = Typeface.create("sans-serif", Typeface.NORMAL)
+            val boldFont = Typeface.create("sans-serif-black", Typeface.NORMAL)
+
+            val primaryColor = root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
+            val secondaryColor = root.context.getThemeAttrColor(android.R.attr.textColorSecondary)
+
+            val currentFont = if (message.unread) boldFont else normalFont
+            val currentTextColor = if (message.unread) primaryColor else secondaryColor
 
             with(messageItemAuthor) {
                 text = message.correspondents
-                setTypeface(null, style)
+                setTextColor(currentTextColor)
+                typeface = currentFont
             }
-            messageItemSubject.run {
+            with(messageItemSubject) {
                 text = message.subject.ifBlank { context.getString(R.string.message_no_subject) }
-                setTypeface(null, style)
+                setTextColor(currentTextColor)
+                typeface = currentFont
             }
-            messageItemDate.run {
+            with(messageItemDate) {
                 text = message.date.toFormattedString()
-                setTypeface(null, style)
+                setTextColor(currentTextColor)
+                typeface = currentFont
             }
-            messageItemAttachmentIcon.isVisible = message.hasAttachments
+            with(messageItemAttachmentIcon) {
+                ImageViewCompat.setImageTintList(this, ColorStateList.valueOf(currentTextColor))
+                isVisible = message.hasAttachments
+            }
+            messageItemUnreadIndicator.isVisible = message.unread
 
             root.setOnClickListener {
                 holder.bindingAdapterPosition.let {
@@ -111,7 +128,7 @@ class MessageTabAdapter @Inject constructor() :
 
             root.setOnLongClickListener {
                 onLongItemClickListener(item)
-                return@setOnLongClickListener true
+                true
             }
 
             with(messageItemCheckbox) {
diff --git a/app/src/main/res/drawable/ic_circle.xml b/app/src/main/res/drawable/ic_circle.xml
new file mode 100644
index 00000000..d2932fe6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_circle.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/colorPrimary" />
+
+    <size
+        android:width="100dp"
+        android:height="100dp" />
+</shape>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index c25faacc..39fbaad0 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -30,6 +30,7 @@
         android:layout_marginEnd="10dp"
         android:ellipsize="end"
         android:singleLine="true"
+        android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
         app:layout_constraintEnd_toStartOf="@+id/messageItemDate"
         app:layout_constraintStart_toEndOf="@id/messageItemCheckbox"
@@ -40,10 +41,13 @@
         android:id="@+id/messageItemDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
         android:gravity="end"
+        android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/messageItemUnreadIndicator"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginEnd="0dp"
         tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
@@ -69,9 +73,21 @@
         android:layout_height="16dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/messageItemSubject"
-        app:layout_constraintEnd_toEndOf="@id/messageItemDate"
+        app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/ic_attachment"
-        app:tint="?colorOnBackground"
+        app:tint="?android:textColorSecondary"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/messageItemUnreadIndicator"
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:src="@drawable/ic_circle"
+        app:layout_constraintBottom_toBottomOf="@id/messageItemDate"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/messageItemDate"
+        app:tint="?colorPrimary"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>

From c5e2b18695c2a1f58afd407d399d927d03573dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 28 Oct 2022 11:10:05 +0200
Subject: [PATCH 157/429] Fix SSL certificate out-of-date detection (#2028)

---
 .../java/io/github/wulkanowy/utils/ExceptionExtension.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt
index 43cecd40..a4c2537a 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ExceptionExtension.kt
@@ -15,16 +15,17 @@ import java.net.ConnectException
 import java.net.SocketException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
+import java.security.cert.CertPathValidatorException
 import java.security.cert.CertificateExpiredException
 import java.security.cert.CertificateNotYetValidException
 import javax.net.ssl.SSLHandshakeException
 
 fun Resources.getErrorString(error: Throwable): String = when (error) {
     is UnknownHostException -> R.string.error_no_internet
+    is ConnectException,
     is SocketException,
     is SocketTimeoutException,
     is InterruptedIOException,
-    is ConnectException,
     is StreamResetException -> R.string.error_timeout
     is NotLoggedInException -> R.string.error_login_failed
     is PasswordChangeRequiredException -> R.string.error_password_change_required
@@ -42,10 +43,10 @@ fun Resources.getErrorString(error: Throwable): String = when (error) {
 
 fun Throwable.isShouldBeReported(): Boolean = when (this) {
     is UnknownHostException,
+    is ConnectException,
     is SocketException,
     is SocketTimeoutException,
     is InterruptedIOException,
-    is ConnectException,
     is StreamResetException,
     is ServiceUnavailableException,
     is FeatureDisabledException,
@@ -70,5 +71,6 @@ private fun Throwable?.isCausedByCertificateNotValidNow(): Boolean {
 private fun Throwable?.isCertificateNotValidNow(): Boolean {
     val isNotYetValid = this is CertificateNotYetValidException
     val isExpired = this is CertificateExpiredException
-    return isNotYetValid || isExpired
+    val isInvalidPath = this is CertPathValidatorException
+    return isNotYetValid || isExpired || isInvalidPath
 }

From ffd5addadb3f1250f438ad3cea2e2889649e31b8 Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:10:35 +0200
Subject: [PATCH 158/429] Add Crowdin badges to README (#2025)

---
 README.cs.md | 1 +
 README.de.md | 1 +
 README.en.md | 1 +
 README.md    | 1 +
 README.sk.md | 1 +
 5 files changed, 5 insertions(+)

diff --git a/README.cs.md b/README.cs.md
index 5c1e5ea7..0d6da9c3 100644
--- a/README.cs.md
+++ b/README.cs.md
@@ -13,6 +13,7 @@
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
 
diff --git a/README.de.md b/README.de.md
index e03557a0..9c25bad6 100644
--- a/README.de.md
+++ b/README.de.md
@@ -13,6 +13,7 @@
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre Eltern
 
diff --git a/README.en.md b/README.en.md
index 1ac2a672..708d30bd 100644
--- a/README.en.md
+++ b/README.en.md
@@ -13,6 +13,7 @@
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Unofficial android VULCAN UONET+ register client for both students and their parents
 
diff --git a/README.md b/README.md
index e7c7d4c5..86b83552 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
diff --git a/README.sk.md b/README.sk.md
index 2f3ba41d..d318936a 100644
--- a/README.sk.md
+++ b/README.sk.md
@@ -13,6 +13,7 @@
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
+[![Crowdin](https://badges.crowdin.net/wulkanowy2/localized.svg)](https://translate.wulkanowy.net.pl)
 
 Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
 

From b269360ecb852bfaf9eb3b97c762e7e7c689c9e1 Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Sun, 30 Oct 2022 03:00:39 +0100
Subject: [PATCH 159/429] Langs placement in README adjustments (#2029)

---
 README.cs.md | 10 ++--------
 README.de.md |  8 +-------
 README.en.md |  8 +-------
 README.md    |  8 +-------
 README.sk.md | 10 ++--------
 5 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/README.cs.md b/README.cs.md
index 0d6da9c3..2b0dc12e 100644
--- a/README.cs.md
+++ b/README.cs.md
@@ -1,10 +1,4 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Polska wersja README](README.md)
-
-[Slovenská verzia README](README.sk.md)
+Česká verze / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
@@ -58,7 +52,7 @@ Aktuální verzi si můžete stáhnout z Google Play, F-Droid nebo Huawei AppGal
 
 Můžete si také stáhnout [vývojovou verzi](https://wulkanowy.github.io/#download), která zahrnuje nové funkce připravované pro příští vydání
 
-## Postaveno s
+## Postaveno s pomocí
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
diff --git a/README.de.md b/README.de.md
index 9c25bad6..6df10ecd 100644
--- a/README.de.md
+++ b/README.de.md
@@ -1,10 +1,4 @@
-[Polska wersja README](README.md)
-
-[English version of README](README.en.md)
-
-[Česká verze README](README.cs.md)
-
-[Slovenská verzia README](README.sk.md)
+[Česká verze](README.cs.md) / Deutsche Version / [English version](README.en.md) / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
diff --git a/README.en.md b/README.en.md
index 708d30bd..417b74de 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,10 +1,4 @@
-[Polska wersja README](README.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Česká verze README](README.cs.md)
-
-[Slovenská verzia README](README.sk.md)
+[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / English version / [Polska wersja](README.md) / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
diff --git a/README.md b/README.md
index 86b83552..75b6cfca 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,4 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Česká verze README](README.cs.md)
-
-[Slovenská verzia README](README.sk.md)
+[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / Polska wersja / [Slovenská verzia](README.sk.md)
 
 # Wulkanowy
 
diff --git a/README.sk.md b/README.sk.md
index d318936a..240f8835 100644
--- a/README.sk.md
+++ b/README.sk.md
@@ -1,10 +1,4 @@
-[English version of README](README.en.md)
-
-[Deutsche Version von README](README.de.md)
-
-[Polska wersja README](README.md)
-
-[Česká verze README](README.cs.md)
+[Česká verze](README.cs.md) / [Deutsche Version](README.de.md) / [English version](README.en.md) / [Polska wersja](README.md) / Slovenská verzia
 
 # Wulkanowy
 
@@ -58,7 +52,7 @@ Aktuálnu verziu si môžete stiahnuť z Google Play, F-Droid alebo Huawei AppGa
 
 Môžete si tiež stiahnuť [vývojovú verziu](https://wulkanowy.github.io/#download), ktorá zahrňuje nové funkcie pripravované pre budúce vydanie
 
-## Postavené s
+## Postavené s pomocou
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)

From d924902dacac95123477dd6410c62430785aaa3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 19:49:56 +0000
Subject: [PATCH 160/429] Bump CircularImageView from 4.2.0 to 4.3.0 (#2036)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6211db2d..d7fcfa8f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -209,7 +209,7 @@ dependencies {
     implementation "com.google.android.material:material:1.7.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.github.lopspower:CircularImageView:4.2.0'
+    implementation 'com.github.lopspower:CircularImageView:4.3.0'
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"

From 4113bd9b538428cb6465cc3380b4b4d2f25ba9b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 19:50:17 +0000
Subject: [PATCH 161/429] Bump agconnect-crash from 1.7.2.300 to 1.7.3.300
 (#2035)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d7fcfa8f..c250e7ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -250,7 +250,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:21.3.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.8.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.2.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From 86fe2b61cb9c158e53682974c11484343141e003 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 19:50:37 +0000
Subject: [PATCH 162/429] Bump agcp from 1.7.2.300 to 1.7.3.300 (#2034)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5131796b..fa66d930 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'com.huawei.agconnect:agcp:1.7.2.300'
+        classpath 'com.huawei.agconnect:agcp:1.7.3.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"

From 02cd4e4e06850b95a845b45db8c2b7f0194061ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 19:50:59 +0000
Subject: [PATCH 163/429] Bump sonarqube-gradle-plugin from 3.4.0.2513 to
 3.5.0.2730 (#2033)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index fa66d930..3773dbc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From 21fe20924643fa4c6db0aa05b2bbee30d48ba071 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 19:51:28 +0000
Subject: [PATCH 164/429] Bump firebase-bom from 31.0.1 to 31.0.2 (#2032)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c250e7ea..a8f68884 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.0.1')
+    playImplementation platform('com.google.firebase:firebase-bom:31.0.2')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 62b7d42a73d0f422b02995f049449966020f0df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 1 Nov 2022 20:57:05 +0100
Subject: [PATCH 165/429] New Crowdin updates (#1966)

---
 app/src/main/res/values-de/strings.xml        |  14 +-
 .../res/values-es-rES/preferences_values.xml  |  65 ++
 app/src/main/res/values-es-rES/strings.xml    | 715 ++++++++++++++++++
 app/src/main/res/values-uk/strings.xml        |  38 +-
 4 files changed, 806 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/values-es-rES/preferences_values.xml
 create mode 100644 app/src/main/res/values-es-rES/strings.xml

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4dfeee4f..7b544258 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -632,10 +632,10 @@
     <string name="pref_other_fill_message_content">Antwort mit Nachrichtenhistorie</string>
     <string name="pref_other_optional_arithmetic_average">Arithmetisches Mittel anzeigen, wenn keine Gewichte angegeben sind</string>
     <string name="pref_ads_support_category_name">Unterstützung</string>
-    <string name="pref_ads_privacy_policy">Privacy Policy</string>
-    <string name="pref_ads_agreements">Agreements</string>
-    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
-    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_privacy_policy">Datenschutz-Bestimmungen</string>
+    <string name="pref_ads_agreements">Vereinbarungen</string>
+    <string name="pref_ads_consent">Zustimmung zur Verarbeitung von Daten im Zusammenhang mit Anzeigen</string>
+    <string name="pref_ads_show_in_app">Anzeigen in der App anzeigen</string>
     <string name="pref_ads_support">Einzelanzeige ansehen, um Projekt zu unterstützen</string>
     <string name="pref_ads_privacy_title">Einwilligung in die Datenverarbeitung</string>
     <string name="pref_ads_privacy_description">Um eine Anzeige zu sehen, müssen Sie mit den Datenverarbeitungsbedingungen unserer Datenschutzerklärung einverstanden sein</string>
@@ -647,9 +647,9 @@
     <string name="pref_ads_consent_description">Sie können Ihre Wahl jederzeit in den App-Einstellungen ändern. Wir verwenden Ihre Daten, um auf Sie zugeschnittene Anzeigen anzuzeigen oder unter Verwendung weniger Ihrer Daten nicht personalisierte Werbung anzuzeigen. Bitte lesen Sie unsere Datenschutzerklärung für Details</string>
     <string name="pref_ads_summary_personalized">Personalisierte Werbung</string>
     <string name="pref_ads_summary_non_personalized">keine personalisierte Werbung</string>
-    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
-    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
-    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">Ich bin über 18 Jahre alt</string>
+    <string name="pref_ads_option_personalized">Ja, personalisierte Werbung</string>
+    <string name="pref_ads_option_non_personalized">Ja, nicht personalisierte Werbung</string>
     <string name="pref_settings_advanced_title">Erweitert</string>
     <string name="pref_settings_appearance_title">Aussehen &amp; Verhalten</string>
     <string name="pref_settings_notifications_title">Benachrichtigungen</string>
diff --git a/app/src/main/res/values-es-rES/preferences_values.xml b/app/src/main/res/values-es-rES/preferences_values.xml
new file mode 100644
index 00000000..ac2b6e9e
--- /dev/null
+++ b/app/src/main/res/values-es-rES/preferences_values.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Black (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>System language</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+        <item>Slovenčina</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 minutes</item>
+        <item>30 minutes</item>
+        <item>1 hour</item>
+        <item>2 hours</item>
+        <item>6 hours</item>
+        <item>12 hours</item>
+        <item>24 hours</item>
+    </string-array>
+    <string-array name="grade_modifier_entries">
+        <item>0,00</item>
+        <item>0,25</item>
+        <item>0,33</item>
+        <item>0,5</item>
+        <item>0,75</item>
+    </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetically</item>
+        <item>By date</item>
+        <item>By average</item>
+    </string-array>
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Grade colors in register</item>
+    </string-array>
+    <string-array name="default_expand_grade_entries">
+        <item>Up to 1 at once</item>
+        <item>Always expanded</item>
+        <item>Unlimited expansions</item>
+    </string-array>
+    <string-array name="grade_average_mode_entries">
+        <item>Average of grades only from selected semester</item>
+        <item>Average of averages from both semesters</item>
+        <item>Average of grades from the whole year</item>
+    </string-array>
+    <string-array name="dashboard_tile_entries">
+        <item>Lucky number</item>
+        <item>Unread messages</item>
+        <item>Attendance</item>
+        <item>Lessons</item>
+        <item>Grades</item>
+        <item>Homework</item>
+        <item>School announcements</item>
+        <item>Exams</item>
+        <item>Conferences</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 00000000..aecc720b
--- /dev/null
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,715 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Login</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Grades</string>
+    <string name="attendance_title">Attendance</string>
+    <string name="exam_title">Exams</string>
+    <string name="timetable_title">Timetable</string>
+    <string name="settings_title">Settings</string>
+    <string name="more_title">More</string>
+    <string name="about_title">About</string>
+    <string name="logviewer_title">Log viewer</string>
+    <string name="debug_title">Debug</string>
+    <string name="notification_debug_title">Notification debug</string>
+    <string name="contributors_title">Contributors</string>
+    <string name="license_title">Licenses</string>
+    <string name="message_title">Messages</string>
+    <string name="send_message_title">New message</string>
+    <string name="add_homework_title">New homework</string>
+    <string name="note_title">Notes and achievements</string>
+    <string name="homework_title">Homework</string>
+    <string name="account_title">Accounts manager</string>
+    <string name="account_quick_title">Select account</string>
+    <string name="account_details_title">Account details</string>
+    <string name="student_info_title">Student info</string>
+    <string name="dashboard_title">Dashboard</string>
+    <string name="notifications_center_title">Notifications center</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+    <!--Login-->
+    <string name="login_header_default">Sign in with the student or parent account</string>
+    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="login_nickname_hint">Username</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
+    <string name="login_password_hint">Password</string>
+    <string name="login_host_hint">UONET+ register variant</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_sign_in">Sign in</string>
+    <string name="login_invalid_password">Password too short</string>
+    <string name="login_incorrect_password_default">Login details are incorrect</string>
+    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</string>
+    <string name="login_invalid_pin">Invalid PIN</string>
+    <string name="login_invalid_token">Invalid token</string>
+    <string name="login_expired_token">Token expired</string>
+    <string name="login_invalid_email">Invalid email</string>
+    <string name="login_invalid_login">Use the assigned login instead of email</string>
+    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
+    <string name="login_invalid_symbol">Invalid symbol</string>
+    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
+    <string name="login_duplicate_student">Selected student is already logged in</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the previous screen</string>
+    <string name="login_select_student">Select students to log in to the application</string>
+    <string name="login_advanced">Other options</string>
+    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
+    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
+    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
+    <string name="login_privacy_policy">Privacy policy</string>
+    <string name="login_contact_header">Trouble signing in? Contact us!</string>
+    <string name="login_contact_email">Email</string>
+    <string name="login_contact_discord">Discord</string>
+    <string name="login_email_intent_title">Send email</string>
+    <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
+    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_title">Recover your account</string>
+    <string name="login_recover">Recover</string>
+    <string name="login_signed_in">Student is already signed in</string>
+    <string name="login_host_standard">Standard</string>
+    <!--Main-->
+    <string name="main_account_picker">Account manager</string>
+    <string name="main_log_in">Log in</string>
+    <string name="main_session_expired">Session expired</string>
+    <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
+    <!--Grade-->
+    <string name="grade_header">Grade</string>
+    <string name="grade_semester">Semester %d</string>
+    <string name="grade_switch_semester">Change semester</string>
+    <string name="grade_no_items">No grades</string>
+    <string name="grade_weight">Weight</string>
+    <string name="grade_weight_value">Weight: %s</string>
+    <string name="grade_comment">Comment</string>
+    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
+    <string name="grade_average">Average: %1$.2f</string>
+    <string name="grade_points_sum">Points: %s</string>
+    <string name="grade_no_average">No average</string>
+    <string name="grade_summary_points">Total points</string>
+    <string name="grade_summary_final_grade">Final grade</string>
+    <string name="grade_summary_predicted_grade">Predicted grade</string>
+    <string name="grade_summary_calculated_average">Calculated average</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
+    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
+    <string name="grade_summary_final_average">Final average</string>
+    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
+    <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
+    <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Points</string>
+    <string name="grade_statistics_legend">Legend</string>
+    <string name="grade_statistics_class_average">Class average: %1$s</string>
+    <string name="grade_statistics_student_average">Your average: %1$s</string>
+    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
+    <string name="grade_statistics_average_class">Class</string>
+    <string name="grade_statistics_average_student">Student</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d grade</item>
+        <item quantity="other">%d grades</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">New grade</item>
+        <item quantity="other">New grades</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">You received %1$d grade</item>
+        <item quantity="other">You received %1$d grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lesson</string>
+    <string name="timetable_room">Room</string>
+    <string name="timetable_group">Group</string>
+    <string name="timetable_time">Hours</string>
+    <string name="timetable_changes">Changes</string>
+    <string name="timetable_no_items">No lessons this day</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
+    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
+    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
+    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
+    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_notify_new_items_title">
+        <item quantity="one">Timetable change</item>
+        <item quantity="other">Timetable changes</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items">
+        <item quantity="one">%1$s - %2$d change in timetable</item>
+        <item quantity="other">%1$s - %2$d  changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_group">
+        <item quantity="one">%1$d change in timetable</item>
+        <item quantity="other">%1$d changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_number_item">
+        <item quantity="one">%d change</item>
+        <item quantity="other">%d changes</item>
+    </plurals>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
+    <!--Additional lessons-->
+    <string name="additional_lessons_title">Additional lessons</string>
+    <string name="additional_lessons_button">Show additional lessons</string>
+    <string name="additional_lessons_no_items">No info about additional lessons</string>
+    <string name="additional_lessons_add">New lesson</string>
+    <string name="additional_lessons_add_title">New additional lesson</string>
+    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
+    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
+    <string name="additional_lessons_repeat">Repeat weekly</string>
+    <string name="additional_lessons_delete_title">Delete additional lesson</string>
+    <string name="additional_lessons_delete_one">Just this lesson</string>
+    <string name="additional_lessons_delete_series">All in the series</string>
+    <string name="additional_lessons_start">Start time</string>
+    <string name="additional_lessons_end">End time</string>
+    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
+    <string name="attendance_absence_school">Absent for school reasons</string>
+    <string name="attendance_absence_excused">Excused absence</string>
+    <string name="attendance_absence_unexcused">Unexcused absence</string>
+    <string name="attendance_exemption">Exemption</string>
+    <string name="attendance_excused_lateness">Excused lateness</string>
+    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
+    <string name="attendance_present">Present</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Number of lesson</string>
+    <string name="attendance_no_items">No entries</string>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
+    <plurals name="attendance_notify_new_items_title">
+        <item quantity="one">New attendance</item>
+        <item quantity="other">New attendance</item>
+    </plurals>
+    <plurals name="attendance_notify_new_items">
+        <item quantity="one">%1$d new attendance</item>
+        <item quantity="other">%1$d attendance</item>
+    </plurals>
+    <plurals name="attendance_number_item">
+        <item quantity="one">%d attendance</item>
+        <item quantity="other">%d attendance</item>
+    </plurals>
+    <!--Attendance summary-->
+    <string name="attendance_summary_total">Total</string>
+    <!--Exam-->
+    <string name="exam_no_items">No exams this week</string>
+    <string name="exam_type">Type</string>
+    <string name="exam_entry_date">Entry date</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">New exam</item>
+        <item quantity="other">New exams</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">%d new exam</item>
+        <item quantity="other">%d new exams</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d exam</item>
+        <item quantity="other">%d exams</item>
+    </plurals>
+    <!--Message-->
+    <string name="message_inbox">Inbox</string>
+    <string name="message_sent">Sent</string>
+    <string name="message_trash">Trash</string>
+    <string name="message_no_subject">(no subject)</string>
+    <string name="message_no_items">No messages</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
+    <string name="message_date">Date: %1$s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_forward">Forward</string>
+    <string name="message_select_all">Select all</string>
+    <string name="message_unselect_all">Unselect all</string>
+    <string name="message_move_to_trash">Move to trash</string>
+    <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_not_exists">Message does not exist</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_only_unread">Only unread</string>
+    <string name="message_chip_only_with_attachments">Only with attachments</string>
+    <string name="message_read">Read: %s</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%1$d message</item>
+        <item quantity="other">%1$d messages</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">New message</item>
+        <item quantity="other">New messages</item>
+    </plurals>
+    <string name="message_restore_dialog">Do you want to restore draft message?</string>
+    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">You received %1$d message</item>
+        <item quantity="other">You received %1$d messages</item>
+    </plurals>
+    <plurals name="message_selected_messages_count">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <string name="message_messages_deleted">Messages deleted</string>
+    <!--Note-->
+    <string name="note_no_items">No info about notes</string>
+    <string name="note_points">Points</string>
+    <plurals name="note_number_item">
+        <item quantity="one">%d note</item>
+        <item quantity="other">%d notes</item>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">New note</item>
+        <item quantity="other">New notes</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--Homework-->
+    <string name="homework_no_items">No info about homework</string>
+    <string name="homework_mark_as_done">Mark as done</string>
+    <string name="homework_mark_as_undone">Mark as undone</string>
+    <string name="homework_add">Add homework</string>
+    <string name="homework_add_success">Homework added successfully</string>
+    <string name="homework_delete_success">Homework deleted successfully</string>
+    <string name="homework_attachments">Attachments</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">New homework</item>
+        <item quantity="other">New homework</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">You received %d new homework</item>
+        <item quantity="other">You received %d new homework</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d homework</item>
+        <item quantity="other">%d homework</item>
+    </plurals>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
+    <string name="lucky_number_history_button">Show history</string>
+    <!--Lucky number history-->
+    <string name="lucky_number_history_title">Lucky number history</string>
+    <string name="lucky_number_history_empty">No info about lucky numbers</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile devices</string>
+    <string name="mobile_devices_no_items">No devices</string>
+    <string name="mobile_devices_unregister">Deregister</string>
+    <string name="mobile_device_removed">Device removed</string>
+    <string name="mobile_device_qr">QR code</string>
+    <string name="mobile_device_token">Token</string>
+    <string name="mobile_device_symbol">Symbol</string>
+    <string name="mobile_device_pin">PIN</string>
+    <!--School and teachers-->
+    <string name="schoolandteachers_title">School and teachers</string>
+    <!--School-->
+    <string name="school_title">School</string>
+    <string name="school_no_info">No info about school</string>
+    <string name="school_name">School name</string>
+    <string name="school_address">School address</string>
+    <string name="school_telephone">Telephone</string>
+    <string name="school_headmaster">Name of headmaster</string>
+    <string name="school_pedagogue">Name of pedagogue</string>
+    <string name="school_address_button">Show on map</string>
+    <string name="school_telephone_button">Call</string>
+    <!--Teacher-->
+    <string name="teachers_title">Teachers</string>
+    <string name="teacher_no_items">No info about teachers</string>
+    <string name="teacher_no_subject">No subject</string>
+    <!--Conference-->
+    <string name="conferences_title">Conferences</string>
+    <string name="conference_no_items">No info about conferences</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d conference</item>
+        <item quantity="other">%d conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">New conference</item>
+        <item quantity="other">New conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">You have %1$d new conference</item>
+        <item quantity="other">You have %1$d new conferences</item>
+    </plurals>
+    <string name="conferences_present">Present at conference</string>
+    <string name="conference_agenda">Agenda</string>
+    <!--Director information-->
+    <string name="school_announcement_title">School announcements</string>
+    <string name="school_announcement_no_items">No school announcements</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d school announcement</item>
+        <item quantity="other">%d school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">New school announcement</item>
+        <item quantity="other">New school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">You have %1$d new school announcement</item>
+        <item quantity="other">You have %1$d new school announcements</item>
+    </plurals>
+    <!--Account-->
+    <string name="account_add_new">Add account</string>
+    <string name="account_logout">Logout</string>
+    <string name="account_confirm">Do you want to log out this student?</string>
+    <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_details_edit">Edit data</string>
+    <string name="account_quick_manager">Accounts manager</string>
+    <string name="account_select_student">Select student</string>
+    <string name="account_family">Family</string>
+    <string name="account_contact">Contact</string>
+    <string name="account_address">Residence details</string>
+    <string name="account_personal_data">Personal information</string>
+    <!--About-->
+    <string name="about_version">App version</string>
+    <string name="about_contributor">Contributors</string>
+    <string name="about_contributor_summary">List of Wulkanowy developers</string>
+    <string name="about_feedback">Report a bug</string>
+    <string name="about_feedback_summary">Send a bug report via e-mail</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_summary">Read Frequently Asked Questions</string>
+    <string name="about_discord">Discord server</string>
+    <string name="about_discord_summary">Join the Wulkanowy community</string>
+    <string name="about_facebook">Facebook fanpage</string>
+    <string name="about_twitter">Twitter page</string>
+    <string name="about_twitter_summary">Follow us on twitter</string>
+    <string name="about_facebook_summary">Like our facebook fanpage</string>
+    <string name="about_privacy">Privacy policy</string>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
+    <string name="about_system">System settings</string>
+    <string name="about_system_summary">Open system settings</string>
+    <string name="about_homepage">Homepage</string>
+    <string name="about_homepage_summary">Visit the website and help develop the application</string>
+    <string name="about_licenses">Licenses</string>
+    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">License</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Avatar</string>
+    <string name="contributor_see_more">See more on GitHub</string>
+    <!--Student info-->
+    <string name="student_info_empty">No info about student or student family</string>
+    <string name="student_info_first_name">Name</string>
+    <string name="student_info_second_name">Second name</string>
+    <string name="student_info_gender">Gender</string>
+    <string name="student_info_polish_citizenship">Polish citizenship</string>
+    <string name="student_info_family_name">Family name</string>
+    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
+    <string name="student_info_phone">Phone</string>
+    <string name="student_info_cellphone">Cellphone</string>
+    <string name="student_info_email">E-mail</string>
+    <string name="student_info_address">Address of residence</string>
+    <string name="student_info_registered_address">Address of registration</string>
+    <string name="student_info_correspondence_address">Correspondence address</string>
+    <string name="student_info_full_name">Surname and first name</string>
+    <string name="student_info_kinship">Degree of kinship</string>
+    <string name="student_info_guardian_address">Address</string>
+    <string name="student_info_phones">Phones</string>
+    <string name="student_info_male">Male</string>
+    <string name="student_info_female">Female</string>
+    <string name="student_info_last_name">Last name</string>
+    <string name="student_info_guardian">Guardian</string>
+    <!--Account edit-->
+    <string name="account_edit_nick_hint">Nick</string>
+    <string name="account_edit_header">Add nick</string>
+    <string name="account_edit_avatar_title">Choose avatar color</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lessons</string>
+    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
+    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
+    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
+    <string name="dashboard_timetable_second_lessons_title">Next:</string>
+    <string name="dashboard_timetable_third_title">Later:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">%1$d more lesson</item>
+        <item quantity="other">%1$d more lessons</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">until %1$s</string>
+    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
+    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
+    <string name="dashboard_homework_title">Homework</string>
+    <string name="dashboard_homework_no_homework">No homework to do</string>
+    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">%1$d more homework</item>
+        <item quantity="other">%1$d more homework</item>
+    </plurals>
+    <string name="dashboard_homework_time">due %1$s</string>
+    <string name="dashboard_grade_title">Last grades</string>
+    <string name="dashboard_grade_no_grade">No new grades</string>
+    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
+    <string name="dashboard_announcements_title">School announcements</string>
+    <string name="dashboard_announcements_no_announcements">No current announcements</string>
+    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">%1$d more announcement</item>
+        <item quantity="other">%1$d more announcements</item>
+    </plurals>
+    <string name="dashboard_exams_title">Exams</string>
+    <string name="dashboard_exams_no_exams">No upcoming exams</string>
+    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">%1$d more exam</item>
+        <item quantity="other">%1$d more exams</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Conferences</string>
+    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
+    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">%1$d more conference</item>
+        <item quantity="other">%1$d more conferences</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
+    <string name="dashboard_horizontal_group_no_data">None</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
+    <!--Generic-->
+    <string name="all_content">Content</string>
+    <string name="all_retry">Retry</string>
+    <string name="all_description">Description</string>
+    <string name="all_no_description">No description</string>
+    <string name="all_teacher">Teacher</string>
+    <string name="all_date">Date</string>
+    <string name="all_entry_date">Entry date</string>
+    <string name="all_color">Color</string>
+    <string name="all_details">Details</string>
+    <string name="all_category">Category</string>
+    <string name="all_close">Close</string>
+    <string name="all_no_data">No data</string>
+    <string name="all_subject">Subject</string>
+    <string name="all_prev">Prev</string>
+    <string name="all_next">Next</string>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search…</string>
+    <string name="all_yes">Yes</string>
+    <string name="all_no">No</string>
+    <string name="all_save">Save</string>
+    <string name="all_title">Title</string>
+    <string name="all_add">Add</string>
+    <string name="all_copied">Copied</string>
+    <string name="all_undo">Undo</string>
+    <string name="all_change">Change</string>
+    <string name="all_add_to_calendar">Add to calendar</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_theme_title">Choose theme</string>
+    <string name="widget_timetable_theme_light">Light</string>
+    <string name="widget_timetable_theme_dark">Dark</string>
+    <string name="widget_timetable_theme_system">System Theme</string>
+    <!--Preferences-->
+    <string name="pref_view_header">App</string>
+    <string name="pref_view_list">Default view</string>
+    <string name="pref_view_grade_average_mode">Calculated average options</string>
+    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
+    <string name="pref_view_present">Show presence</string>
+    <string name="pref_view_app_theme">Theme</string>
+    <string name="pref_view_expand_grade">Grades expanding</string>
+    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
+    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
+    <string name="pref_view_app_language">Language</string>
+    <string name="pref_notify_header">Notifications</string>
+    <string name="pref_notify_header_other">Other</string>
+    <string name="pref_notify_switch">Show notifications</string>
+    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
+    <string name="pref_notify_open_system_settings">Open system notification settings</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_debug_switch">Show debug notifications</string>
+    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
+    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
+    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
+    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
+    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
+    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
+    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
+    <string name="pref_notification_go_to_settings">Go to settings</string>
+    <string name="pref_services_header">Synchronization</string>
+    <string name="pref_services_switch">Automatic update</string>
+    <string name="pref_services_suspended">Suspended on holidays</string>
+    <string name="pref_services_interval">Updates interval</string>
+    <string name="pref_services_wifi">Wi-Fi only</string>
+    <string name="pref_services_force_sync">Sync now</string>
+    <string name="pref_services_message_sync_success">Synced!</string>
+    <string name="pref_services_message_sync_failed">Sync failed</string>
+    <string name="pref_services_sync_in_progress">Sync in progress</string>
+    <string name="pref_services_last_full_sync_date">Last full sync: %s</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_support">Watch single ad to support project</string>
+    <string name="pref_ads_privacy_title">Consent to data processing</string>
+    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
+    <string name="pref_ads_privacy_agree">Agree</string>
+    <string name="pref_ads_privacy_link">Privacy policy</string>
+    <string name="pref_ads_loading">Ad is loading</string>
+    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
+    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
+    <string name="pref_ads_summary_personalized">Personalized ads</string>
+    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
+    <string name="pref_settings_advanced_title">Advanced</string>
+    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
+    <string name="pref_settings_notifications_title">Notifications</string>
+    <string name="pref_settings_sync_title">Synchronization</string>
+    <string name="pref_settings_ads_title">Advertisements</string>
+    <string name="pref_grades_appearance_header">Grades</string>
+    <string name="pref_dashboard_appearance_header">Dashboard</string>
+    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
+    <string name="pref_attendance_appearance_view">Attendance</string>
+    <string name="pref_timetable_appearance_view">Timetable</string>
+    <string name="pref_grades_advanced_header">Grades</string>
+    <string name="pref_counted_average_advanced_header">Calculated average</string>
+    <string name="pref_messages_advanced_header">Messages</string>
+    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
+    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
+    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
+    <string name="pref_notifications_category">Notifications</string>
+    <string name="pref_sync_category">Synchronization</string>
+    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
+    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
+    <string name="pref_advanced_category">Advanced</string>
+    <string name="pref_about_category_summary">App version, contributors, social portals</string>
+    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+    <!--Notification Channels-->
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_new_homework">New homework</string>
+    <string name="channel_new_conference">New conferences</string>
+    <string name="channel_new_exam">New exams</string>
+    <string name="channel_lucky_number">Lucky number</string>
+    <string name="channel_new_message">New messages</string>
+    <string name="channel_new_notes">New notes</string>
+    <string name="channel_new_school_announcement">New school announcements</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
+    <string name="channel_debug">Debug</string>
+    <string name="channel_change_timetable">Timetable change</string>
+    <string name="channel_new_attendance">New attendance</string>
+    <!--Colors-->
+    <string name="all_black">Black</string>
+    <string name="all_red">Red</string>
+    <string name="all_blue">Blue</string>
+    <string name="all_green">Green</string>
+    <string name="all_purple">Purple</string>
+    <string name="all_empty_color">No color</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>
+    <string name="update_download_success_button">Restart</string>
+    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Errors-->
+    <string name="error_no_internet">No internet connection</string>
+    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
+    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
+    <string name="error_login_failed">Loading data failed. Please try again later</string>
+    <string name="error_password_change_required">Register password change required</string>
+    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
+    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
+    <string name="error_unknown_app">Unknown application error. Please try again later</string>
+    <string name="error_unknown">An unexpected error occurred</string>
+    <string name="error_feature_disabled">Feature disabled by your school</string>
+    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
+    <string name="error_field_required">This field is required</string>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f90e78e7..2c104ecb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -77,9 +77,9 @@
     <string name="main_log_in">Увійти</string>
     <string name="main_session_expired">Минув термін дії сесії</string>
     <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
-    <string name="main_support_title">Application support</string>
-    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
-    <string name="main_support_positive">Enable ads</string>
+    <string name="main_support_title">Підтримка додатків</string>
+    <string name="main_support_description">Вам подобається цей додаток? Підтримуйте його розвиток, увімкнувши неінвазивну рекламу, яку ви можете будь-коли вимкнути</string>
+    <string name="main_support_positive">Увімкнути рекламу</string>
     <!--Grade-->
     <string name="grade_header">Оцінка</string>
     <string name="grade_semester">%d семестр</string>
@@ -97,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Передбачувана оцінка</string>
     <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Як працює \"Розрахована середня оцінка\"?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Розрахована середня оцінка - це середнє арифметичне, обчислене з середніх оцінок з предметів.Це дозволяє дізнатися приблизну кінцеву середню оцінку.Вона розраховується способом, обраним користувачем у налаштуваннях програми.Рекомендується вибрати відповідний варіант, тому що кожна школа по різному розраховує середню оцінку.Крім того, якщо у вашій школі повідомляється середня оцінка з предметів на сторінці Vulcan, програма тільки завантажує ці оцінки.Це можна змінити шляхом примусового розрахунку середньоЇ оцінки в налаштуваннях програми.\n\n<b>Середні оцінки тільки за обраний семестр</b>:\n1. Розрахунок середньозваженого числа для кожного предмета в даному семестрі\n2. Сумування розрахованих числ\n3. Розрахунок середнього арифметичного з сумованих чисел\n\n<b>Середнє значення з обох семестрів</b>:\n1. Обчислення середньозваженого числа для кожного предмета у 1 та 2 семестрі\n2. Обчислення середнього арифметичного з розрахованих середньозважених числ за 1 та 2 семестри для кожного предмета.\n3. Додавання розрахованих середніх\n4. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення оцінок за весь рік: </b>\n1. Розрахунок середньозваженого числа за рік для кожного предмета. Підсумковий середній показник у 1-му семестрі не має значення.\n2. Сумування розрахованих середніх\n3. Обчислення середнього арифметичного з суммованих середніх</string>
     <string name="grade_summary_final_average_help_dialog_title">Як працює \"Підсумкова середня оцінка\"?</string>
     <string name="grade_summary_final_average_help_dialog_message">Підсумкове середнє значення - це середнє арифметичне, обчислене з усіх наявних наразі підсумкових оцінок у даному семестрі. \n\nСхема обчислення складається з таких кроків:\n1. Сумування підсумкових оцінок, виставленних викладачами\n2. Ділення на кількість предметів, з яких виставлені ці оцінки</string>
     <string name="grade_summary_final_average">Підсумкова середня оцінка</string>
@@ -297,10 +297,10 @@
     <string name="message_move_to_trash">Перемістити до кошика</string>
     <string name="message_delete_forever">Видалити назавжди</string>
     <string name="message_delete_success">Лист було успішно видалено</string>
-    <string name="message_mailbox_type_student">student</string>
-    <string name="message_mailbox_type_parent">parent</string>
-    <string name="message_mailbox_type_guardian">guardian</string>
-    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_mailbox_type_student">студент</string>
+    <string name="message_mailbox_type_parent">батькові</string>
+    <string name="message_mailbox_type_guardian">опікун</string>
+    <string name="message_mailbox_type_employee">працівник</string>
     <string name="message_share">Поділитись</string>
     <string name="message_print">Друк</string>
     <string name="message_subject">Тема</string>
@@ -720,10 +720,10 @@
     <string name="pref_other_fill_message_content">Відповісти з історією повідомлень</string>
     <string name="pref_other_optional_arithmetic_average">Вилічити середню аритметичну, якщо оцінка немає вартості</string>
     <string name="pref_ads_support_category_name">Підтримка</string>
-    <string name="pref_ads_privacy_policy">Privacy Policy</string>
-    <string name="pref_ads_agreements">Agreements</string>
-    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
-    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_privacy_policy">Політика конфіденційності</string>
+    <string name="pref_ads_agreements">Угоди</string>
+    <string name="pref_ads_consent">Згода на обробку даних, пов’язаних з оголошеннями</string>
+    <string name="pref_ads_show_in_app">Показувати рекламу в додатку</string>
     <string name="pref_ads_support">Подивіться одну рекламу для підтримки проєкту</string>
     <string name="pref_ads_privacy_title">Згода в обробці даних</string>
     <string name="pref_ads_privacy_description">Щоб переглянути рекламу, ви повинні погодитися з умовами обробки даних нашої Політики конфіденційності</string>
@@ -731,13 +731,13 @@
     <string name="pref_ads_privacy_link">Політика конфіденційності</string>
     <string name="pref_ads_loading">Реклама завантажується</string>
     <string name="pref_ads_once_per_visit">Дякуємо за вашу підтримку, повертайтеся пізніше для більшої кількості реклам</string>
-    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
-    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
-    <string name="pref_ads_summary_personalized">Personalized ads</string>
-    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
-    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
-    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
-    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
+    <string name="pref_ads_consent_title">Чи можемо ми використовувати ваші дані для відбивання реклами?</string>
+    <string name="pref_ads_consent_description">Ви можете змінити свій вибір в будь-який час в налаштуваннях додатку. Ми можемо використовувати ваші дані для відбивання оголошень, адаптованої до вас або, використовуючи менше ваших даних, відбивати неперсоналізовані оголошення. Перегляньте нашу Політику конфіденційності для деталей</string>
+    <string name="pref_ads_summary_personalized">Персоналізовані оголошення</string>
+    <string name="pref_ads_summary_non_personalized">Неперсоналізована реклама</string>
+    <string name="pref_ads_over_18_years_old">Мені більше 18 років</string>
+    <string name="pref_ads_option_personalized">Так, персоналізована реклама</string>
+    <string name="pref_ads_option_non_personalized">Так, неперсоналізована реклама</string>
     <string name="pref_settings_advanced_title">Додатково</string>
     <string name="pref_settings_appearance_title">Вигляд та поведінка</string>
     <string name="pref_settings_notifications_title">Сповіщення</string>

From 50b6d380b6e7c9c5537ddcce698e9b8c00c9db0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 2 Nov 2022 16:44:05 +0100
Subject: [PATCH 166/429] Fix unexpected error in support ad when no internet
 (#2030)

---
 .../ui/modules/settings/ads/AdsPresenter.kt   | 21 ++++++++++++-----
 .../io/github/wulkanowy/utils/AdsHelper.kt    | 23 +++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
index 772d616d..28c98e3c 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsPresenter.kt
@@ -31,13 +31,22 @@ class AdsPresenter @Inject constructor(
         view?.showLoadingSupportAd(true)
         presenterScope.launch {
             runCatching { adsHelper.getSupportAd() }
-                .onFailure(errorHandler::dispatch)
-                .onSuccess { it?.let { view?.showAd(it) } }
+                .onFailure {
+                    errorHandler.dispatch(it)
 
-            view?.run {
-                showLoadingSupportAd(false)
-                showWatchAdOncePerVisit(true)
-            }
+                    view?.run {
+                        showLoadingSupportAd(false)
+                        showWatchAdOncePerVisit(false)
+                    }
+                }
+                .onSuccess {
+                    it?.let { view?.showAd(it) }
+
+                    view?.run {
+                        showLoadingSupportAd(false)
+                        showWatchAdOncePerVisit(true)
+                    }
+                }
         }
     }
 
diff --git a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
index c536e221..d5f65b46 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/AdsHelper.kt
@@ -1,8 +1,12 @@
 package io.github.wulkanowy.utils
 
 import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.os.Build
 import android.os.Bundle
 import android.view.View
+import androidx.core.content.getSystemService
 import com.google.ads.mediation.admob.AdMobAdapter
 import com.google.android.gms.ads.*
 import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAd
@@ -10,6 +14,7 @@ import com.google.android.gms.ads.rewardedinterstitial.RewardedInterstitialAdLoa
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.BuildConfig
 import io.github.wulkanowy.data.repositories.PreferencesRepository
+import java.net.UnknownHostException
 import javax.inject.Inject
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
@@ -28,6 +33,10 @@ class AdsHelper @Inject constructor(
     }
 
     suspend fun getSupportAd(): RewardedInterstitialAd? {
+        if (!context.isInternetConnected()) {
+            throw UnknownHostException()
+        }
+
         val extra = Bundle().apply { putString("npa", "1") }
         val adRequest = AdRequest.Builder()
             .apply {
@@ -84,4 +93,18 @@ class AdsHelper @Inject constructor(
     }
 }
 
+@Suppress("DEPRECATION")
+private fun Context.isInternetConnected(): Boolean {
+    val connectivityManager = getSystemService<ConnectivityManager>() ?: return false
+
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        val currentNetwork = connectivityManager.activeNetwork
+        val networkCapabilities = connectivityManager.getNetworkCapabilities(currentNetwork)
+
+        networkCapabilities?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) == true
+    } else {
+        connectivityManager.activeNetworkInfo?.isConnected == true
+    }
+}
+
 data class AdBanner(val view: View)

From 1257dc63d3c081ec75dffebfebf2fdc14dacd18f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:21:17 +0000
Subject: [PATCH 167/429] Bump runner from 1.4.0 to 1.5.1 (#2047)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a8f68884..7142d92f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -264,7 +264,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
     testImplementation 'org.robolectric:robolectric:4.9'
-    testImplementation "androidx.test:runner:1.4.0"
+    testImplementation "androidx.test:runner:1.5.1"
     testImplementation "androidx.test.ext:junit:1.1.3"
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.room:room-testing:$room"

From 66ff14f719bf021b83b43e09e5bca726a843d088 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:21:35 +0000
Subject: [PATCH 168/429] Bump agcp from 1.7.3.300 to 1.7.3.301 (#2046)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3773dbc3..ccce1c43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'com.huawei.agconnect:agcp:1.7.3.300'
+        classpath 'com.huawei.agconnect:agcp:1.7.3.301'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"

From fded5007c14ecbec95680e5b9c5960cab3e77927 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:22:25 +0000
Subject: [PATCH 169/429] Bump firebase-bom from 31.0.2 to 31.0.3 (#2041)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7142d92f..40f57171 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.0.2')
+    playImplementation platform('com.google.firebase:firebase-bom:31.0.3')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 885319a8854f22cfa91dd097db8492599d09fd25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:36:20 +0000
Subject: [PATCH 170/429] Bump hilt_version from 2.44 to 2.44.1 (#2044)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ccce1c43..6f3ac4d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.7.20'
         about_libraries = '10.5.1'
-        hilt_version = "2.44"
+        hilt_version = "2.44.1"
     }
     repositories {
         mavenCentral()

From d6385e8cdd06b3636568b32aab5c0064e8bbd8cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 20:31:02 +0000
Subject: [PATCH 171/429] Bump core from 1.4.0 to 1.5.0 (#2045)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 40f57171..1edcc753 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -266,7 +266,7 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.9'
     testImplementation "androidx.test:runner:1.5.1"
     testImplementation "androidx.test.ext:junit:1.1.3"
-    testImplementation "androidx.test:core:1.4.0"
+    testImplementation "androidx.test:core:1.5.0"
     testImplementation "androidx.room:room-testing:$room"
     testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
     kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"

From b8296ac02f94e17e972c74980bcf480352abaef6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 20:31:26 +0000
Subject: [PATCH 172/429] Bump kotlin_version from 1.7.20 to 1.7.21 (#2042)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6f3ac4d6..e8e1052b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.7.20'
+        kotlin_version = '1.7.21'
         about_libraries = '10.5.1'
         hilt_version = "2.44.1"
     }

From 4d49e956b881125354b86228a12c50e49ea6fd8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 20:48:12 +0000
Subject: [PATCH 173/429] Bump junit from 1.1.3 to 1.1.4 (#2043)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1edcc753..11f055ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -265,7 +265,7 @@ dependencies {
 
     testImplementation 'org.robolectric:robolectric:4.9'
     testImplementation "androidx.test:runner:1.5.1"
-    testImplementation "androidx.test.ext:junit:1.1.3"
+    testImplementation "androidx.test.ext:junit:1.1.4"
     testImplementation "androidx.test:core:1.5.0"
     testImplementation "androidx.room:room-testing:$room"
     testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"

From db4f172fb83bd4ca4a3f7219ae5e6f40f87d5727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 16 Nov 2022 12:54:55 +0100
Subject: [PATCH 174/429] Fix unread status in sent messages (#2048)

---
 app/build.gradle                              |    2 +-
 .../52.json                                   | 2421 +++++++++++++++++
 .../github/wulkanowy/data/db/AppDatabase.kt   |    3 +-
 .../wulkanowy/data/db/entities/Message.kt     |    6 +
 .../wulkanowy/data/mappers/MessageMapper.kt   |    4 +-
 .../debug/notification/mock/message.kt        |    2 +
 .../message/preview/MessagePreviewAdapter.kt  |   16 +-
 app/src/main/res/values/strings.xml           |    1 +
 .../repositories/MessageRepositoryTest.kt     |    6 +-
 9 files changed, 2451 insertions(+), 10 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/52.json

diff --git a/app/build.gradle b/app/build.gradle
index 11f055ea..99672f1f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:2840d9d6d0"
+    implementation "io.github.wulkanowy:sdk:701016eda2"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/52.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/52.json
new file mode 100644
index 00000000..129d1917
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/52.json
@@ -0,0 +1,2421 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 52,
+    "identityHash": "8742176f26afcc81279d4a073dca2949",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `userLoginId` INTEGER NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "userLoginId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalKey"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8742176f26afcc81279d4a073dca2949')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 15b38805..e61ffe84 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -47,6 +47,7 @@ import javax.inject.Singleton
         AutoMigration(from = 44, to = 45),
         AutoMigration(from = 46, to = 47),
         AutoMigration(from = 47, to = 48),
+        AutoMigration(from = 51, to = 52),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -55,7 +56,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 51
+        const val VERSION_SCHEMA = 52
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 77874e03..323b00be 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -29,6 +29,12 @@ data class Message(
 
     var unread: Boolean,
 
+    @ColumnInfo(name = "read_by")
+    val readBy: Int?,
+
+    @ColumnInfo(name = "unread_by")
+    val unreadBy: Int?,
+
     @ColumnInfo(name = "has_attachments")
     val hasAttachments: Boolean
 ) : Serializable {
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 2e7967f0..c329607f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -16,7 +16,9 @@ fun List<SdkMessage>.mapToEntities(mailbox: Mailbox) = map {
         date = it.dateZoned.toInstant(),
         folderId = it.folderId,
         unread = it.unread,
-        hasAttachments = it.hasAttachments
+        unreadBy = it.unreadBy,
+        readBy = it.readBy,
+        hasAttachments = it.hasAttachments,
     ).apply {
         content = it.content.orEmpty()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
index 6ff26162..e31bd84a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
@@ -22,6 +22,8 @@ private fun generateMessage(sender: String, subject: String) = Message(
     date = Instant.now(),
     folderId = 0,
     unread = true,
+    readBy = 2,
+    unreadBy = 2,
     hasAttachments = false,
     messageGlobalKey = "",
     correspondents = sender,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
index 3c1c53d3..d3c6b95c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -74,15 +73,20 @@ class MessagePreviewAdapter @Inject constructor() :
         }
     }
 
-    @SuppressLint("SetTextI18n")
     private fun bindMessage(holder: MessageViewHolder, message: Message) {
         val context = holder.binding.root.context
+        val recipientCount = (message.unreadBy ?: 0) + (message.readBy ?: 0)
+        val isReceived = message.unreadBy == null
 
-        val readTextValue = when {
-            !message.unread -> R.string.all_yes
-            else -> R.string.all_no
+        val readText = when {
+            recipientCount > 1 -> {
+                context.getString(R.string.message_read_by, message.readBy, recipientCount)
+            }
+            message.readBy == 1 || (isReceived && !message.unread) -> {
+                context.getString(R.string.message_read, context.getString(R.string.all_yes))
+            }
+            else -> context.getString(R.string.message_read, context.getString(R.string.all_no))
         }
-        val readText = context.getString(R.string.message_read, context.getString(readTextValue))
 
         with(holder.binding) {
             messagePreviewSubject.text = message.subject.ifBlank {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 48376d21..e65a27fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -304,6 +304,7 @@
     <string name="message_chip_only_unread">Only unread</string>
     <string name="message_chip_only_with_attachments">Only with attachments</string>
     <string name="message_read">Read: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d message</item>
         <item quantity="other">%1$d messages</item>
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
index 4efc9c60..9fc83a23 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
@@ -193,7 +193,9 @@ class MessageRepositoryTest {
         date = Instant.EPOCH,
         folderId = 1,
         unread = unread,
-        hasAttachments = false
+        readBy = 1,
+        unreadBy = 1,
+        hasAttachments = false,
     ).apply {
         this.content = content
     }
@@ -209,6 +211,8 @@ class MessageRepositoryTest {
         dateZoned = Instant.EPOCH.atZone(ZoneOffset.UTC),
         folderId = 1,
         unread = true,
+        readBy = 1,
+        unreadBy = 1,
         hasAttachments = false,
     )
 }

From 51a1097bb4af2373bcd14ac8189e66f1cb606229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 16 Nov 2022 13:46:47 +0100
Subject: [PATCH 175/429] Add mailbox chooser to messages (#2002)

---
 .../53.json                                   | 2439 +++++++++++++++++
 .../github/wulkanowy/data/db/AppDatabase.kt   |    3 +-
 .../wulkanowy/data/db/dao/MailboxDao.kt       |    8 +-
 .../wulkanowy/data/db/dao/MessagesDao.kt      |    3 +
 .../wulkanowy/data/db/entities/Mailbox.kt     |   11 +-
 .../wulkanowy/data/db/entities/Message.kt     |    3 +
 .../data/db/migrations/Migration53.kt         |   57 +
 .../wulkanowy/data/mappers/MailboxMapper.kt   |    4 +-
 .../wulkanowy/data/mappers/MessageMapper.kt   |    7 +-
 .../data/repositories/MailboxRepository.kt    |   85 -
 .../data/repositories/MessageRepository.kt    |   67 +-
 .../data/repositories/RecipientRepository.kt  |   24 +-
 .../messages/GetMailboxByStudentUseCase.kt    |   52 +
 .../notifications/NewMessageNotification.kt   |    1 -
 .../services/sync/works/MessageWork.kt        |    6 +-
 .../services/sync/works/RecipientWork.kt      |   15 +-
 .../modules/dashboard/DashboardPresenter.kt   |    3 +-
 .../debug/notification/mock/message.kt        |    1 +
 .../mailboxchooser/MailboxChooserAdapter.kt   |   81 +
 .../mailboxchooser/MailboxChooserDialog.kt    |   75 +
 .../mailboxchooser/MailboxChooserItem.kt      |    9 +
 .../mailboxchooser/MailboxChooserPresenter.kt |   38 +
 .../mailboxchooser/MailboxChooserView.kt      |   13 +
 .../preview/MessagePreviewPresenter.kt        |    6 +-
 .../message/send/SendMessageActivity.kt       |   16 +
 .../message/send/SendMessagePresenter.kt      |  107 +-
 .../modules/message/send/SendMessageView.kt   |    1 +
 .../modules/message/tab/MessageTabAdapter.kt  |   32 +-
 .../modules/message/tab/MessageTabDataItem.kt |    1 +
 .../modules/message/tab/MessageTabFragment.kt |   20 +
 .../message/tab/MessageTabPresenter.kt        |   39 +-
 .../ui/modules/message/tab/MessageTabView.kt  |    3 +
 .../io/github/wulkanowy/utils/RefreshUtils.kt |    5 +-
 .../main/res/layout/activity_send_message.xml |   20 +-
 .../res/layout/dialog_mailbox_chooser.xml     |   40 +
 .../main/res/layout/item_mailbox_chooser.xml  |   43 +
 .../main/res/layout/item_message_chips.xml    |   23 +-
 app/src/main/res/values/strings.xml           |    2 +
 .../io/github/wulkanowy/TestEnityCreator.kt   |    4 +-
 .../repositories/MessageRepositoryTest.kt     |   24 +-
 .../GetMailboxByStudentUseCaseTest.kt}        |   53 +-
 41 files changed, 3209 insertions(+), 235 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/53.json
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration53.kt
 delete mode 100644 app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserAdapter.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserItem.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserPresenter.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserView.kt
 create mode 100644 app/src/main/res/layout/dialog_mailbox_chooser.xml
 create mode 100644 app/src/main/res/layout/item_mailbox_chooser.xml
 rename app/src/test/java/io/github/wulkanowy/{data/repositories/MailboxRepositoryTest.kt => domain/GetMailboxByStudentUseCaseTest.kt} (77%)

diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/53.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/53.json
new file mode 100644
index 00000000..98561787
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/53.json
@@ -0,0 +1,2439 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 53,
+    "identityHash": "1dc96a366125ec9f8567da87cdc9c863",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalKey"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1dc96a366125ec9f8567da87cdc9c863')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index e61ffe84..792611a8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -56,7 +56,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 52
+        const val VERSION_SCHEMA = 53
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -106,6 +106,7 @@ abstract class AppDatabase : RoomDatabase() {
             Migration49(),
             Migration50(),
             Migration51(),
+            Migration53(),
         )
 
         fun newInstance(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
index c44ecd0c..084192a0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MailboxDao.kt
@@ -3,12 +3,16 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Mailbox
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
 @Dao
 interface MailboxDao : BaseDao<Mailbox> {
 
-    @Query("SELECT * FROM Mailboxes WHERE userLoginId = :userLoginId ")
-    suspend fun loadAll(userLoginId: Int): List<Mailbox>
+    @Query("SELECT * FROM Mailboxes WHERE email = :email")
+    suspend fun loadAll(email: String): List<Mailbox>
+
+    @Query("SELECT * FROM Mailboxes WHERE email = :email AND symbol = :symbol AND schoolId = :schoolId")
+    fun loadAll(email: String, symbol: String, schoolId: String): Flow<List<Mailbox>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 8c730c9b..1709f763 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -16,4 +16,7 @@ interface MessagesDao : BaseDao<Message> {
 
     @Query("SELECT * FROM Messages WHERE mailbox_key = :mailboxKey AND folder_id = :folder ORDER BY date DESC")
     fun loadAll(mailboxKey: String, folder: Int): Flow<List<Message>>
+
+    @Query("SELECT * FROM Messages WHERE email = :email AND folder_id = :folder ORDER BY date DESC")
+    fun loadAll(folder: Int, email: String): Flow<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt
index 7c08e481..e65e213d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Mailbox.kt
@@ -1,20 +1,27 @@
 package io.github.wulkanowy.data.db.entities
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
 
+@Parcelize
 @Entity(tableName = "Mailboxes")
 data class Mailbox(
 
     @PrimaryKey
     val globalKey: String,
+
+    val email: String,
+    val symbol: String,
+    val schoolId: String,
+
     val fullName: String,
     val userName: String,
-    val userLoginId: Int,
     val studentName: String,
     val schoolNameShort: String,
     val type: MailboxType,
-)
+) : java.io.Serializable, Parcelable
 
 enum class MailboxType {
     STUDENT,
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 323b00be..d1356b33 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -9,6 +9,9 @@ import java.time.Instant
 @Entity(tableName = "Messages")
 data class Message(
 
+    @ColumnInfo(name = "email")
+    val email: String,
+
     @ColumnInfo(name = "message_global_key")
     val messageGlobalKey: String,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration53.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration53.kt
new file mode 100644
index 00000000..12624a51
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration53.kt
@@ -0,0 +1,57 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration53 : Migration(52, 53) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        createMailboxTable(database)
+        recreateMessagesTable(database)
+    }
+
+    private fun createMailboxTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Mailboxes")
+        database.execSQL(
+            """
+                CREATE TABLE IF NOT EXISTS `Mailboxes` (
+                    `globalKey` TEXT NOT NULL,
+                    `email` TEXT NOT NULL,
+                    `symbol` TEXT NOT NULL,
+                    `schoolId` TEXT NOT NULL,
+                    `fullName` TEXT NOT NULL,
+                    `userName` TEXT NOT NULL,
+                    `studentName` TEXT NOT NULL,
+                    `schoolNameShort` TEXT NOT NULL,
+                    `type` TEXT NOT NULL,
+                    PRIMARY KEY(`globalKey`)
+                )""".trimIndent()
+        )
+    }
+
+    private fun recreateMessagesTable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS Messages")
+        database.execSQL(
+            """
+                CREATE TABLE IF NOT EXISTS `Messages` (
+                    `email` TEXT NOT NULL,
+                    `message_global_key` TEXT NOT NULL,
+                    `mailbox_key` TEXT NOT NULL,
+                    `message_id` INTEGER NOT NULL,
+                    `correspondents` TEXT NOT NULL,
+                    `subject` TEXT NOT NULL,
+                    `date` INTEGER NOT NULL,
+                    `folder_id` INTEGER NOT NULL,
+                    `unread` INTEGER NOT NULL,
+                    `read_by` INTEGER,
+                    `unread_by` INTEGER,
+                    `has_attachments` INTEGER NOT NULL,
+                    `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
+                    `is_notified` INTEGER NOT NULL, 
+                    `content` TEXT NOT NULL,
+                    `sender` TEXT,
+                    `recipients` TEXT
+                )""".trimIndent()
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt
index 2ccca1b9..0cf54777 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MailboxMapper.kt
@@ -10,9 +10,11 @@ fun List<SdkMailbox>.mapToEntities(student: Student) = map {
         globalKey = it.globalKey,
         fullName = it.fullName,
         userName = it.userName,
-        userLoginId = student.userLoginId,
         studentName = it.studentName,
         schoolNameShort = it.schoolNameShort,
         type = MailboxType.valueOf(it.type.name),
+        email = student.email,
+        symbol = student.symbol,
+        schoolId = student.schoolSymbol,
     )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index c329607f..8825c574 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -6,10 +6,13 @@ import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
-fun List<SdkMessage>.mapToEntities(mailbox: Mailbox) = map {
+fun List<SdkMessage>.mapToEntities(student: Student, mailbox: Mailbox?, allMailboxes: List<Mailbox>) = map {
     Message(
         messageGlobalKey = it.globalKey,
-        mailboxKey = mailbox.globalKey,
+        mailboxKey = mailbox?.globalKey ?: allMailboxes.find { box ->
+            box.fullName == it.mailbox
+        }?.globalKey!!,
+        email = student.email,
         messageId = it.id,
         correspondents = it.correspondents,
         subject = it.subject.trim(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
deleted file mode 100644
index c571937a..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MailboxRepository.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.data.db.dao.MailboxDao
-import io.github.wulkanowy.data.db.entities.Mailbox
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.github.wulkanowy.utils.getRefreshKey
-import io.github.wulkanowy.utils.init
-import io.github.wulkanowy.utils.uniqueSubtract
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class MailboxRepository @Inject constructor(
-    private val mailboxDao: MailboxDao,
-    private val sdk: Sdk,
-    private val refreshHelper: AutoRefreshHelper,
-) {
-    private val cacheKey = "mailboxes"
-
-    suspend fun refreshMailboxes(student: Student) {
-        val new = sdk.init(student).getMailboxes().mapToEntities(student)
-        val old = mailboxDao.loadAll(student.userLoginId)
-
-        mailboxDao.deleteAll(old uniqueSubtract new)
-        mailboxDao.insertAll(new uniqueSubtract old)
-
-        refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
-    }
-
-    suspend fun getMailbox(student: Student): Mailbox {
-        val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
-        val mailboxes = mailboxDao.loadAll(student.userLoginId)
-        val mailbox = mailboxes.filterByStudent(student)
-
-        return if (isExpired || mailbox == null) {
-            refreshMailboxes(student)
-            val newMailbox = mailboxDao.loadAll(student.userLoginId).filterByStudent(student)
-
-            requireNotNull(newMailbox) {
-                "Mailbox for ${student.userName} - ${student.studentName} not found! Saved mailboxes: $mailboxes"
-            }
-
-            newMailbox
-        } else mailbox
-    }
-
-    private fun List<Mailbox>.filterByStudent(student: Student): Mailbox? {
-        val normalizedStudentName = student.studentName.normalizeStudentName()
-
-        return find {
-            it.studentName.normalizeStudentName() == normalizedStudentName
-        } ?: singleOrNull {
-            it.studentName.getFirstAndLastPart() == normalizedStudentName.getFirstAndLastPart()
-        } ?: singleOrNull {
-            it.studentName.getUnauthorizedVersion() == normalizedStudentName
-        }
-    }
-
-    private fun String.normalizeStudentName(): String {
-        return trim().split(" ")
-            .filter { it.isNotBlank() }
-            .joinToString(" ") { part ->
-                part.lowercase().replaceFirstChar { it.uppercase() }
-            }
-    }
-
-    private fun String.getFirstAndLastPart(): String {
-        val parts = normalizeStudentName().split(" ")
-
-        val endParts = parts.filterIndexed { i, _ ->
-            i == 0 || parts.size - 1 == i
-        }
-        return endParts.joinToString(" ")
-    }
-
-    private fun String.getUnauthorizedVersion(): String {
-        return normalizeStudentName().split(" ")
-            .joinToString(" ") {
-                it.first() + "*".repeat(it.length - 1)
-            }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index e7428762..f8be4296 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -5,6 +5,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.*
@@ -15,6 +16,8 @@ import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MessageDraft
+import io.github.wulkanowy.data.toFirstResult
+import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.utils.AutoRefreshHelper
@@ -40,16 +43,18 @@ class MessageRepository @Inject constructor(
     private val refreshHelper: AutoRefreshHelper,
     private val sharedPrefProvider: SharedPrefProvider,
     private val json: Json,
+    private val mailboxDao: MailboxDao,
+    private val getMailboxByStudentUseCase: GetMailboxByStudentUseCase,
 ) {
 
     private val saveFetchResultMutex = Mutex()
 
-    private val cacheKey = "message"
+    private val messagesCacheKey = "message"
+    private val mailboxCacheKey = "mailboxes"
 
-    @Suppress("UNUSED_PARAMETER")
     fun getMessages(
         student: Student,
-        mailbox: Mailbox,
+        mailbox: Mailbox?,
         folder: MessageFolder,
         forceRefresh: Boolean,
         notify: Boolean = false,
@@ -58,16 +63,20 @@ class MessageRepository @Inject constructor(
         isResultEmpty = { it.isEmpty() },
         shouldFetch = {
             val isExpired = refreshHelper.shouldBeRefreshed(
-                key = getRefreshKey(cacheKey, student, folder)
+                key = getRefreshKey(messagesCacheKey, mailbox, folder)
             )
             it.isEmpty() || forceRefresh || isExpired
         },
-        query = { messagesDb.loadAll(mailbox.globalKey, folder.id) },
+        query = {
+            if (mailbox == null) {
+                messagesDb.loadAll(folder.id, student.email)
+            } else messagesDb.loadAll(mailbox.globalKey, folder.id)
+        },
         fetch = {
             sdk.init(student).getMessages(
                 folder = Folder.valueOf(folder.name),
-                mailboxKey = mailbox.globalKey,
-            ).mapToEntities(mailbox)
+                mailboxKey = mailbox?.globalKey,
+            ).mapToEntities(student, mailbox, mailboxDao.loadAll(student.email))
         },
         saveFetchResult = { old, new ->
             messagesDb.deleteAll(old uniqueSubtract new)
@@ -75,7 +84,9 @@ class MessageRepository @Inject constructor(
                 it.isNotified = !notify
             })
 
-            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder))
+            refreshHelper.updateLastRefreshTimestamp(
+                getRefreshKey(messagesCacheKey, mailbox, folder)
+            )
         }
     )
 
@@ -90,7 +101,9 @@ class MessageRepository @Inject constructor(
             Timber.d("Message content in db empty: ${it.message.content.isBlank()}")
             it.message.unread || it.message.content.isBlank()
         },
-        query = { messagesDb.loadMessageWithAttachment(message.messageGlobalKey) },
+        query = {
+            messagesDb.loadMessageWithAttachment(message.messageGlobalKey)
+        },
         fetch = {
             sdk.init(student).getMessageDetails(it!!.message.messageGlobalKey, markAsRead)
         },
@@ -113,8 +126,10 @@ class MessageRepository @Inject constructor(
         }
     )
 
-    fun getMessagesFromDatabase(mailbox: Mailbox): Flow<List<Message>> {
-        return messagesDb.loadAll(mailbox.globalKey, RECEIVED.id)
+    fun getMessagesFromDatabase(student: Student, mailbox: Mailbox?): Flow<List<Message>> {
+        return if (mailbox == null) {
+            messagesDb.loadAll(RECEIVED.id, student.email)
+        } else messagesDb.loadAll(mailbox.globalKey, RECEIVED.id)
     }
 
     suspend fun updateMessages(messages: List<Message>) {
@@ -136,7 +151,7 @@ class MessageRepository @Inject constructor(
         )
     }
 
-    suspend fun deleteMessages(student: Student, mailbox: Mailbox, messages: List<Message>) {
+    suspend fun deleteMessages(student: Student, mailbox: Mailbox?, messages: List<Message>) {
         val firstMessage = messages.first()
         sdk.init(student).deleteMessages(
             messages = messages.map { it.messageGlobalKey },
@@ -169,6 +184,34 @@ class MessageRepository @Inject constructor(
         deleteMessages(student, mailbox, listOf(message))
     }
 
+    suspend fun getMailboxes(student: Student, forceRefresh: Boolean) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        isResultEmpty = { it.isEmpty() },
+        shouldFetch = {
+            val isExpired = refreshHelper.shouldBeRefreshed(
+                key = getRefreshKey(mailboxCacheKey, student),
+            )
+            it.isEmpty() || isExpired || forceRefresh
+        },
+        query = { mailboxDao.loadAll(student.email, student.symbol, student.schoolSymbol) },
+        fetch = { sdk.init(student).getMailboxes().mapToEntities(student) },
+        saveFetchResult = { old, new ->
+            mailboxDao.deleteAll(old uniqueSubtract new)
+            mailboxDao.insertAll(new uniqueSubtract old)
+
+            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(mailboxCacheKey, student))
+        }
+    )
+
+    suspend fun getMailboxByStudent(student: Student): Mailbox? {
+        val mailbox = getMailboxByStudentUseCase(student)
+
+        return if (mailbox == null) {
+            getMailboxes(student, forceRefresh = true).toFirstResult()
+            getMailboxByStudentUseCase(student)
+        } else mailbox
+    }
+
     var draftMessage: MessageDraft?
         get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_draft))
             ?.let { json.decodeFromString(it) }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
index e80f028e..79984ce6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/RecipientRepository.kt
@@ -33,9 +33,11 @@ class RecipientRepository @Inject constructor(
 
     suspend fun getRecipients(
         student: Student,
-        mailbox: Mailbox,
-        type: MailboxType
+        mailbox: Mailbox?,
+        type: MailboxType,
     ): List<Recipient> {
+        mailbox ?: return emptyList()
+
         val cached = recipientDb.loadAll(type, mailbox.globalKey)
 
         val isExpired = refreshHelper.shouldBeRefreshed(getRefreshKey(cacheKey, student))
@@ -47,11 +49,15 @@ class RecipientRepository @Inject constructor(
 
     suspend fun getMessageSender(
         student: Student,
-        mailbox: Mailbox,
-        message: Message
-    ): List<Recipient> = sdk.init(student)
-        .getMessageReplayDetails(message.messageGlobalKey)
-        .sender
-        .let(::listOf)
-        .mapToEntities(mailbox.globalKey)
+        mailbox: Mailbox?,
+        message: Message,
+    ): List<Recipient> {
+        mailbox ?: return emptyList()
+
+        return sdk.init(student)
+            .getMessageReplayDetails(message.messageGlobalKey)
+            .sender
+            .let(::listOf)
+            .mapToEntities(mailbox.globalKey)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
new file mode 100644
index 00000000..d96794e5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.domain.messages
+
+import io.github.wulkanowy.data.db.dao.MailboxDao
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.Student
+import javax.inject.Inject
+
+class GetMailboxByStudentUseCase @Inject constructor(
+    private val mailboxDao: MailboxDao,
+) {
+
+    suspend operator fun invoke(student: Student): Mailbox? {
+        return mailboxDao.loadAll(student.email)
+            .filterByStudent(student)
+    }
+
+    private fun List<Mailbox>.filterByStudent(student: Student): Mailbox? {
+        val normalizedStudentName = student.studentName.normalizeStudentName()
+
+        return find {
+            it.studentName.normalizeStudentName() == normalizedStudentName
+        } ?: singleOrNull {
+            it.studentName.getFirstAndLastPart() == normalizedStudentName.getFirstAndLastPart()
+        } ?: singleOrNull {
+            it.studentName.getUnauthorizedVersion() == normalizedStudentName
+        }
+    }
+
+    private fun String.normalizeStudentName(): String {
+        return trim().split(" ")
+            .filter { it.isNotBlank() }
+            .joinToString(" ") { part ->
+                part.lowercase().replaceFirstChar { it.uppercase() }
+            }
+    }
+
+    private fun String.getFirstAndLastPart(): String {
+        val parts = normalizeStudentName().split(" ")
+
+        val endParts = parts.filterIndexed { i, _ ->
+            i == 0 || parts.size - 1 == i
+        }
+        return endParts.joinToString(" ")
+    }
+
+    private fun String.getUnauthorizedVersion(): String {
+        return normalizeStudentName().split(" ")
+            .joinToString(" ") {
+                it.first() + "*".repeat(it.length - 1)
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt
index 3b7bcff0..45523d51 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt
@@ -8,7 +8,6 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.GroupNotificationData
 import io.github.wulkanowy.data.pojos.NotificationData
 import io.github.wulkanowy.ui.modules.Destination
-import io.github.wulkanowy.ui.modules.splash.SplashActivity
 import io.github.wulkanowy.utils.getPlural
 import javax.inject.Inject
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index 18056826..c7824e61 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
-import io.github.wulkanowy.data.repositories.MailboxRepository
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewMessageNotification
@@ -12,12 +11,11 @@ import javax.inject.Inject
 
 class MessageWork @Inject constructor(
     private val messageRepository: MessageRepository,
-    private val mailboxRepository: MailboxRepository,
     private val newMessageNotification: NewMessageNotification,
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
-        val mailbox = mailboxRepository.getMailbox(student)
+        val mailbox = messageRepository.getMailboxByStudent(student)
         messageRepository.getMessages(
             student = student,
             mailbox = mailbox,
@@ -26,7 +24,7 @@ class MessageWork @Inject constructor(
             notify = notify
         ).waitForResult()
 
-        messageRepository.getMessagesFromDatabase(mailbox).first()
+        messageRepository.getMessagesFromDatabase(student, mailbox).first()
             .filter { !it.isNotified && it.unread }.let {
                 if (it.isNotEmpty()) newMessageNotification.notify(it, student)
                 messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
index b1322ada..90b20651 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -1,22 +1,23 @@
 package io.github.wulkanowy.services.sync.works
 
+import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.MailboxRepository
+import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.RecipientRepository
+import io.github.wulkanowy.data.toFirstResult
 import javax.inject.Inject
 
 class RecipientWork @Inject constructor(
-    private val mailboxRepository: MailboxRepository,
+    private val messageRepository: MessageRepository,
     private val recipientRepository: RecipientRepository
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester, notify: Boolean) {
-        mailboxRepository.refreshMailboxes(student)
-
-        val mailbox = mailboxRepository.getMailbox(student)
-
-        recipientRepository.refreshRecipients(student, mailbox, MailboxType.EMPLOYEE)
+        val mailboxes = messageRepository.getMailboxes(student, forceRefresh = true).toFirstResult()
+        mailboxes.dataOrNull?.forEach {
+            recipientRepository.refreshRecipients(student, it, MailboxType.EMPLOYEE)
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index 35030093..cb92b004 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -25,7 +25,6 @@ class DashboardPresenter @Inject constructor(
     private val gradeRepository: GradeRepository,
     private val semesterRepository: SemesterRepository,
     private val messageRepository: MessageRepository,
-    private val mailboxRepository: MailboxRepository,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
     private val timetableRepository: TimetableRepository,
     private val homeworkRepository: HomeworkRepository,
@@ -228,7 +227,7 @@ class DashboardPresenter @Inject constructor(
     private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) {
         flow {
             val semester = semesterRepository.getCurrentSemester(student)
-            val mailbox = mailboxRepository.getMailbox(student)
+            val mailbox = messageRepository.getMailboxByStudent(student)
             val selectedTiles = preferencesRepository.selectedDashboardTiles
 
             val flowSuccess = flowOf(Resource.Success(null))
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
index e31bd84a..27d8613a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
@@ -19,6 +19,7 @@ val debugMessageItems = listOf(
 private fun generateMessage(sender: String, subject: String) = Message(
     subject = subject,
     messageId = 123,
+    email = "",
     date = Instant.now(),
     folderId = 0,
     unread = true,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserAdapter.kt
new file mode 100644
index 00000000..59f6d288
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserAdapter.kt
@@ -0,0 +1,81 @@
+package io.github.wulkanowy.ui.modules.message.mailboxchooser
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DiffUtil.ItemCallback
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.MailboxType
+import io.github.wulkanowy.databinding.ItemMailboxChooserBinding
+import javax.inject.Inject
+
+class MailboxChooserAdapter @Inject constructor() :
+    ListAdapter<MailboxChooserItem, MailboxChooserAdapter.ItemViewHolder>(Differ) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemMailboxChooserBinding.inflate(
+            LayoutInflater.from(parent.context), parent, false
+        )
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        holder.bind(getItem(position))
+    }
+
+    class ItemViewHolder(
+        private val binding: ItemMailboxChooserBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: MailboxChooserItem) {
+            with(binding) {
+                mailboxItemName.text = item.mailbox?.getFirstLine()
+                    ?: root.resources.getString(R.string.message_chip_all_mailboxes)
+                mailboxItemSchool.text = item.mailbox?.getSecondLine()
+                mailboxItemSchool.isVisible = !item.isAll
+
+                root.setOnClickListener { item.onClickListener(item.mailbox) }
+            }
+        }
+
+        private fun Mailbox.getFirstLine() = buildString {
+            if (studentName.isNotBlank() && studentName != userName) {
+                append(studentName)
+                append(" - ")
+            }
+            append(userName)
+        }
+
+        private fun Mailbox.getSecondLine() = buildString {
+            append(schoolNameShort)
+            append(" - ")
+            append(getMailboxType(type))
+        }
+
+        private fun getMailboxType(type: MailboxType): String = when (type) {
+            MailboxType.STUDENT -> R.string.message_mailbox_type_student
+            MailboxType.PARENT -> R.string.message_mailbox_type_parent
+            MailboxType.GUARDIAN -> R.string.message_mailbox_type_guardian
+            MailboxType.EMPLOYEE -> R.string.message_mailbox_type_employee
+            MailboxType.UNKNOWN -> null
+        }.let { it?.let { it1 -> binding.root.resources.getString(it1) }.orEmpty() }
+    }
+
+    private object Differ : ItemCallback<MailboxChooserItem>() {
+        override fun areItemsTheSame(
+            oldItem: MailboxChooserItem,
+            newItem: MailboxChooserItem
+        ): Boolean {
+            return oldItem.mailbox?.globalKey == newItem.mailbox?.globalKey
+        }
+
+        override fun areContentsTheSame(
+            oldItem: MailboxChooserItem,
+            newItem: MailboxChooserItem
+        ): Boolean {
+            return oldItem == newItem
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
new file mode 100644
index 00000000..222412ef
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
@@ -0,0 +1,75 @@
+package io.github.wulkanowy.ui.modules.message.mailboxchooser
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.databinding.DialogMailboxChooserBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class MailboxChooserDialog : BaseDialogFragment<DialogMailboxChooserBinding>(), MailboxChooserView {
+
+    @Inject
+    lateinit var presenter: MailboxChooserPresenter
+
+    @Inject
+    lateinit var mailboxAdapter: MailboxChooserAdapter
+
+    companion object {
+        const val LISTENER_KEY = "mailbox_selected"
+        const val MAILBOX_KEY = "selected_mailbox"
+        const val REQUIRED_KEY = "is_mailbox_required"
+
+        fun newInstance(mailboxes: List<Mailbox>, isMailboxRequired: Boolean, folder: String) =
+            MailboxChooserDialog().apply {
+                arguments = bundleOf(
+                    MAILBOX_KEY to mailboxes.toTypedArray(),
+                    REQUIRED_KEY to isMailboxRequired,
+                    LISTENER_KEY to folder,
+                )
+            }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = DialogMailboxChooserBinding.inflate(inflater).apply { binding = this }.root
+
+    @Suppress("UNCHECKED_CAST")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        presenter.onAttachView(
+            view = this,
+            requireMailbox = requireArguments().getBoolean(REQUIRED_KEY, false),
+            mailboxes = requireArguments().getParcelableArray(MAILBOX_KEY).orEmpty()
+                .toList() as List<Mailbox>,
+        )
+    }
+
+    override fun initView() {
+        binding.accountQuickDialogRecycler.adapter = mailboxAdapter
+    }
+
+    override fun submitData(items: List<MailboxChooserItem>) {
+        mailboxAdapter.submitList(items)
+    }
+
+    override fun onMailboxSelected(item: Mailbox?) {
+        setFragmentResult(
+            requestKey = requireArguments().getString(LISTENER_KEY).orEmpty(),
+            result = bundleOf(MAILBOX_KEY to item),
+        )
+        dismiss()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserItem.kt
new file mode 100644
index 00000000..6923cf08
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserItem.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.ui.modules.message.mailboxchooser
+
+import io.github.wulkanowy.data.db.entities.Mailbox
+
+data class MailboxChooserItem(
+    val mailbox: Mailbox? = null,
+    val isAll: Boolean = false,
+    val onClickListener: (Mailbox?) -> Unit,
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserPresenter.kt
new file mode 100644
index 00000000..5bd7c84a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserPresenter.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.ui.modules.message.mailboxchooser
+
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import timber.log.Timber
+import javax.inject.Inject
+
+class MailboxChooserPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository
+) : BasePresenter<MailboxChooserView>(errorHandler, studentRepository) {
+
+    fun onAttachView(view: MailboxChooserView, mailboxes: List<Mailbox>, requireMailbox: Boolean) {
+        super.onAttachView(view)
+
+        view.initView()
+        Timber.i("Mailbox chooser view was initialized")
+        view.submitData(getMailboxItems(mailboxes, requireMailbox))
+    }
+
+    private fun getMailboxItems(
+        mailboxes: List<Mailbox>,
+        requireMailbox: Boolean,
+    ): List<MailboxChooserItem> = buildList {
+        if (!requireMailbox) {
+            add(MailboxChooserItem(isAll = true, onClickListener = ::onMailboxSelect))
+        }
+        addAll(mailboxes.map {
+            MailboxChooserItem(mailbox = it, isAll = false, onClickListener = ::onMailboxSelect)
+        })
+    }
+
+    fun onMailboxSelect(item: Mailbox?) {
+        view?.onMailboxSelected(item)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserView.kt
new file mode 100644
index 00000000..2e20ee81
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserView.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.ui.modules.message.mailboxchooser
+
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.ui.base.BaseView
+
+interface MailboxChooserView : BaseView {
+
+    fun initView()
+
+    fun submitData(items: List<MailboxChooserItem>)
+
+    fun onMailboxSelected(item: Mailbox?)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index c011f41f..fd75f6f3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -6,7 +6,6 @@ import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.enums.MessageFolder
-import io.github.wulkanowy.data.repositories.MailboxRepository
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -21,7 +20,6 @@ class MessagePreviewPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val mailboxRepository: MailboxRepository,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
 
@@ -187,8 +185,8 @@ class MessagePreviewPresenter @Inject constructor(
         presenterScope.launch {
             runCatching {
                 val student = studentRepository.getCurrentStudent(decryptPass = true)
-                val mailbox = mailboxRepository.getMailbox(student)
-                messageRepository.deleteMessage(student, mailbox, message!!)
+                val mailbox = messageRepository.getMailboxByStudent(student)
+                messageRepository.deleteMessage(student, mailbox!!, message!!)
             }
                 .onFailure {
                     retryCallback = { onMessageDelete() }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 334e389e..b5f687bd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -19,9 +19,13 @@ import androidx.core.text.toHtml
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.databinding.ActivitySendMessageBinding
 import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog
+import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog.Companion.MAILBOX_KEY
+import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog.Companion.LISTENER_KEY
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
@@ -100,6 +104,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         formSubjectValue = binding.sendMessageSubject.text.toString()
         formContentValue =
             binding.sendMessageMessageContent.text.toString().parseAsHtml().toString()
+        binding.sendMessageFrom.setOnClickListener { presenter.onOpenMailboxChooser() }
 
         presenter.onAttachView(
             view = this,
@@ -107,6 +112,9 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
             message = intent.getSerializableExtra(EXTRA_MESSAGE) as? Message,
             reply = intent.getSerializableExtra(EXTRA_REPLY) as? Boolean
         )
+        supportFragmentManager.setFragmentResultListener(LISTENER_KEY, this) { _, bundle ->
+            presenter.onMailboxSelected(bundle.getSerializable(MAILBOX_KEY) as? Mailbox)
+        }
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -205,6 +213,14 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         }
     }
 
+    override fun showMailboxChooser(mailboxes: List<Mailbox>) {
+        MailboxChooserDialog.newInstance(
+            mailboxes = mailboxes,
+            isMailboxRequired = true,
+            folder = LISTENER_KEY,
+        ).show(supportFragmentManager, "chooser")
+    }
+
     override fun popView() {
         finish()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index 6c07ee6a..5ab8f8fc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -1,15 +1,15 @@
 package io.github.wulkanowy.ui.modules.message.send
 
-import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.logResourceStatus
-import io.github.wulkanowy.data.onResourceNotLoading
 import io.github.wulkanowy.data.pojos.MessageDraft
-import io.github.wulkanowy.data.repositories.*
-import io.github.wulkanowy.data.resourceFlow
+import io.github.wulkanowy.data.repositories.MessageRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.RecipientRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
@@ -28,7 +28,6 @@ class SendMessagePresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val mailboxRepository: MailboxRepository,
     private val recipientRepository: RecipientRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: AnalyticsHelper
@@ -36,10 +35,19 @@ class SendMessagePresenter @Inject constructor(
 
     private val messageUpdateChannel = Channel<Unit>()
 
+    private var message: Message? = null
+    private var isReplay: Boolean? = null
+
+    private var mailboxes: List<Mailbox> = emptyList()
+    private var selectedMailbox: Mailbox? = null
+
     fun onAttachView(view: SendMessageView, reason: String?, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
         view.initView()
         initializeSubjectStream()
+        this.message = message
+        this.isReplay = reply
+
         Timber.i("Send message view was initialized")
         loadData(message, reply)
         with(view) {
@@ -110,16 +118,31 @@ class SendMessagePresenter @Inject constructor(
         return false
     }
 
+    fun onOpenMailboxChooser() {
+        view?.showMailboxChooser(mailboxes)
+    }
+
+    fun onMailboxSelected(mailbox: Mailbox?) {
+        selectedMailbox = mailbox
+
+        loadData(message, isReplay)
+    }
+
     private fun loadData(message: Message?, reply: Boolean?) {
         resourceFlow {
             val student = studentRepository.getCurrentStudent()
-            val mailbox = mailboxRepository.getMailbox(student)
+
+            if (selectedMailbox == null && mailboxes.isEmpty()) {
+                selectedMailbox = messageRepository.getMailboxByStudent(student)
+                mailboxes = messageRepository.getMailboxes(student, false).toFirstResult()
+                    .dataOrNull.orEmpty()
+            }
 
             Timber.i("Loading recipients started")
             val recipients = createChips(
                 recipients = recipientRepository.getRecipients(
                     student = student,
-                    mailbox = mailbox,
+                    mailbox = selectedMailbox,
                     type = MailboxType.EMPLOYEE,
                 )
             )
@@ -130,7 +153,7 @@ class SendMessagePresenter @Inject constructor(
                 message != null && reply == true -> recipientRepository.getMessageSender(
                     student = student,
                     message = message,
-                    mailbox = mailbox,
+                    mailbox = selectedMailbox,
                 )
                 else -> emptyList()
             }.let { createChips(it) }
@@ -139,39 +162,42 @@ class SendMessagePresenter @Inject constructor(
                 messageRecipients.size
             )
 
-            Triple(mailbox, recipients, messageRecipients)
+            recipients to messageRecipients
         }
             .logResourceStatus("load recipients")
-            .onEach {
-                when (it) {
-                    is Resource.Loading -> view?.run {
-                        showProgress(true)
-                        showContent(false)
-                    }
-                    is Resource.Success -> it.data.let { (mailbox, recipientChips, selectedRecipientChips) ->
-                        view?.run {
-                            setMailbox(getMailboxName(mailbox))
-                            setRecipients(recipientChips)
-                            if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(
-                                selectedRecipientChips
-                            )
-                            showContent(true)
-                        }
-                    }
-                    is Resource.Error -> {
-                        view?.showContent(true)
-                        errorHandler.dispatch(it.error)
+            .onResourceLoading {
+                view?.run {
+                    showProgress(true)
+                    showContent(false)
+                }
+            }
+            .onResourceNotLoading {
+                view?.run { showProgress(false) }
+            }
+            .onResourceError {
+                view?.showContent(true)
+                errorHandler.dispatch(it)
+            }
+            .onResourceSuccess {
+                it.let { (recipientChips, selectedRecipientChips) ->
+                    view?.run {
+                        setMailbox(getMailboxName(selectedMailbox))
+                        setRecipients(recipientChips)
+                        if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(
+                            selectedRecipientChips
+                        )
+                        showContent(true)
                     }
                 }
-            }.onResourceNotLoading {
-                view?.run { showProgress(false) }
-            }.launch()
+            }
+            .launch()
     }
 
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
+        val mailbox = selectedMailbox ?: return
+
         resourceFlow {
             val student = studentRepository.getCurrentStudent()
-            val mailbox = mailboxRepository.getMailbox(student)
             messageRepository.sendMessage(
                 student = student,
                 subject = subject,
@@ -222,18 +248,21 @@ class SendMessagePresenter @Inject constructor(
         }
     }
 
-    private fun getMailboxName(mailbox: Mailbox): String {
+    private fun getMailboxName(mailbox: Mailbox?): String {
+        mailbox ?: return ""
+
+        // username - accountType [\n student name - ] (school short name)
         return buildString {
             append(mailbox.userName)
             append(" - ")
             append(getMailboxType(mailbox.type))
+            appendLine()
 
             if (mailbox.type == MailboxType.PARENT) {
-                append(" - ")
                 append(mailbox.studentName)
+                append(" - ")
             }
 
-            append(" - ")
             append("(${mailbox.schoolNameShort})")
         }
     }
@@ -267,9 +296,9 @@ class SendMessagePresenter @Inject constructor(
 
     private fun saveDraftMessage() {
         messageRepository.draftMessage = MessageDraft(
-            view?.formRecipientsData!!,
-            view?.formSubjectValue!!,
-            view?.formContentValue!!
+            recipients = view?.formRecipientsData!!,
+            subject = view?.formSubjectValue!!,
+            content = view?.formContentValue!!,
         )
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
index 1057114b..e27a09d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageView.kt
@@ -61,4 +61,5 @@ interface SendMessageView : BaseView {
     fun getMessageBackupDialogStringWithRecipients(recipients: String): String
 
     fun clearDraft()
+    fun showMailboxChooser(mailboxes: List<Mailbox>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
index 234d17eb..6df6153c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.ItemMessageBinding
 import io.github.wulkanowy.databinding.ItemMessageChipsBinding
+import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
@@ -19,13 +20,15 @@ import javax.inject.Inject
 class MessageTabAdapter @Inject constructor() :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    var onItemClickListener: (MessageTabDataItem.MessageItem, position: Int) -> Unit = { _, _ -> }
+    lateinit var onItemClickListener: (MessageTabDataItem.MessageItem, position: Int) -> Unit
 
-    var onLongItemClickListener: (MessageTabDataItem.MessageItem) -> Unit = {}
+    lateinit var onLongItemClickListener: (MessageTabDataItem.MessageItem) -> Unit
 
-    var onHeaderClickListener: (CompoundButton, Boolean) -> Unit = { _, _ -> }
+    lateinit var onHeaderClickListener: (CompoundButton, Boolean) -> Unit
 
-    var onChangesDetectedListener = {}
+    lateinit var onMailboxClickListener: () -> Unit
+
+    lateinit var onChangesDetectedListener: () -> Unit
 
     private var items = mutableListOf<MessageTabDataItem>()
 
@@ -49,12 +52,12 @@ class MessageTabAdapter @Inject constructor() :
         val inflater = LayoutInflater.from(parent.context)
 
         return when (MessageItemViewType.values()[viewType]) {
-            MessageItemViewType.MESSAGE -> ItemViewHolder(
-                ItemMessageBinding.inflate(inflater, parent, false)
-            )
             MessageItemViewType.FILTERS -> HeaderViewHolder(
                 ItemMessageChipsBinding.inflate(inflater, parent, false)
             )
+            MessageItemViewType.MESSAGE -> ItemViewHolder(
+                ItemMessageBinding.inflate(inflater, parent, false)
+            )
         }
     }
 
@@ -69,6 +72,20 @@ class MessageTabAdapter @Inject constructor() :
         val item = items[position] as MessageTabDataItem.FilterHeader
 
         with(holder.binding) {
+            chipMailbox.text = item.selectedMailbox
+                ?: root.context.getString(R.string.message_chip_all_mailboxes)
+            chipMailbox.chipBackgroundColor = ColorStateList.valueOf(
+                if (item.selectedMailbox == null) {
+                    root.context.getCompatColor(R.color.mtrl_choice_chip_background_color)
+                } else root.context.getThemeAttrColor(android.R.attr.colorPrimary, 64)
+            )
+            chipMailbox.setTextColor(
+                if (item.selectedMailbox == null) {
+                    root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
+                } else root.context.getThemeAttrColor(android.R.attr.colorPrimary)
+            )
+            chipMailbox.setOnClickListener { onMailboxClickListener() }
+
             if (item.onlyUnread == null) {
                 chipUnread.isVisible = false
             } else {
@@ -77,6 +94,7 @@ class MessageTabAdapter @Inject constructor() :
                 chipUnread.setOnCheckedChangeListener(onHeaderClickListener)
             }
             chipUnread.isEnabled = item.isEnabled
+
             chipAttachments.isEnabled = item.isEnabled
             chipAttachments.isChecked = item.onlyWithAttachments
             chipAttachments.setOnCheckedChangeListener(onHeaderClickListener)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
index 634dfc0e..c0bd4170 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
@@ -11,6 +11,7 @@ sealed class MessageTabDataItem(val viewType: MessageItemViewType) {
     ) : MessageTabDataItem(MessageItemViewType.MESSAGE)
 
     data class FilterHeader(
+        val selectedMailbox: String?,
         val onlyUnread: Boolean?,
         val onlyWithAttachments: Boolean,
         val isEnabled: Boolean
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 654b0e22..5d608ad3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -10,15 +10,18 @@ import android.widget.CompoundButton
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.updatePadding
+import androidx.fragment.app.setFragmentResultListener
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.databinding.FragmentMessageTabBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
@@ -104,6 +107,7 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
             onItemClickListener = presenter::onMessageItemSelected
             onLongItemClickListener = presenter::onMessageItemLongSelected
             onHeaderClickListener = ::onChipChecked
+            onMailboxClickListener = presenter::onMailboxFilterSelected
             onChangesDetectedListener = ::resetListPosition
         }
 
@@ -123,6 +127,12 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
             messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
             messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
+
+        setFragmentResultListener(requireArguments().getString(MESSAGE_TAB_FOLDER_ID)!!) { _, bundle ->
+            presenter.onMailboxSelected(
+                mailbox = bundle.getSerializable(MailboxChooserDialog.MAILBOX_KEY) as? Mailbox,
+            )
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -246,6 +256,16 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         )
     }
 
+    override fun showMailboxChooser(mailboxes: List<Mailbox>) {
+        (activity as? MainActivity)?.showDialogFragment(
+            MailboxChooserDialog.newInstance(
+                mailboxes = mailboxes,
+                isMailboxRequired = false,
+                folder = requireArguments().getString(MESSAGE_TAB_FOLDER_ID)!!,
+            )
+        )
+    }
+
     override fun hideKeyboard() {
         activity?.hideSoftInput()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index 54711a68..ea142db2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
 import io.github.wulkanowy.data.*
+import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.enums.MessageFolder
-import io.github.wulkanowy.data.repositories.MailboxRepository
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -26,7 +26,6 @@ class MessageTabPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val mailboxRepository: MailboxRepository,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<MessageTabView>(errorHandler, studentRepository) {
 
@@ -36,6 +35,9 @@ class MessageTabPresenter @Inject constructor(
 
     private var lastSearchQuery = ""
 
+    private var mailboxes: List<Mailbox> = emptyList()
+    private var selectedMailbox: Mailbox? = null
+
     private var messages = emptyList<Message>()
 
     private val searchChannel = Channel<String>()
@@ -122,8 +124,7 @@ class MessageTabPresenter @Inject constructor(
 
             runCatching {
                 val student = studentRepository.getCurrentStudent(true)
-                val mailbox = mailboxRepository.getMailbox(student)
-                messageRepository.deleteMessages(student, mailbox, messageList)
+                messageRepository.deleteMessages(student, selectedMailbox, messageList)
             }
                 .onFailure(errorHandler::dispatch)
                 .onSuccess { view?.showMessagesDeleted() }
@@ -202,13 +203,28 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
+    fun onMailboxFilterSelected() {
+        view?.showMailboxChooser(mailboxes)
+    }
+
+    fun onMailboxSelected(mailbox: Mailbox?) {
+        selectedMailbox = mailbox
+        loadData(false)
+    }
+
     private fun loadData(forceRefresh: Boolean) {
         Timber.i("Loading $folder message data started")
 
         flatResourceFlow {
             val student = studentRepository.getCurrentStudent()
-            val mailbox = mailboxRepository.getMailbox(student)
-            messageRepository.getMessages(student, mailbox, folder, forceRefresh)
+
+            if (selectedMailbox == null && mailboxes.isEmpty()) {
+                selectedMailbox = messageRepository.getMailboxByStudent(student)
+                mailboxes = messageRepository.getMailboxes(student, forceRefresh).toFirstResult()
+                    .dataOrNull.orEmpty()
+            }
+
+            messageRepository.getMessages(student, selectedMailbox, folder, forceRefresh)
         }
             .logResourceStatus("load $folder message")
             .onResourceData {
@@ -327,7 +343,16 @@ class MessageTabPresenter @Inject constructor(
                 MessageTabDataItem.FilterHeader(
                     onlyUnread = onlyUnread.takeIf { folder != MessageFolder.SENT },
                     onlyWithAttachments = onlyWithAttachments,
-                    isEnabled = !isActionMode
+                    isEnabled = !isActionMode,
+                    selectedMailbox = selectedMailbox?.let {
+                        buildString {
+                            if (it.studentName.isNotBlank() && it.studentName != it.userName) {
+                                append(it.studentName)
+                                append(" - ")
+                            }
+                            append(it.userName)
+                        }
+                    },
                 )
             )
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index bfa43b20..6ece6621 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
+import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -46,4 +47,6 @@ interface MessageTabView : BaseView {
     fun showActionMode(show: Boolean)
 
     fun showRecyclerBottomPadding(show: Boolean)
+
+    fun showMailboxChooser(mailboxes: List<Mailbox>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
index c69fec65..93e67be0 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder
@@ -25,8 +26,8 @@ fun getRefreshKey(name: String, student: Student): String {
     return "${name}_${student.userLoginId}"
 }
 
-fun getRefreshKey(name: String, student: Student, folder: MessageFolder): String {
-    return "${name}_${student.id}_${folder.id}"
+fun getRefreshKey(name: String, mailbox: Mailbox?, folder: MessageFolder): String {
+    return "${name}_${mailbox?.globalKey ?: "all"}_${folder.id}"
 }
 
 class AutoRefreshHelper @Inject constructor(
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index 320782bd..a8041d61 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -55,17 +55,29 @@
                     android:id="@+id/sendMessageFrom"
                     android:layout_width="0dp"
                     android:layout_height="58dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="8dp"
+                    android:background="?selectableItemBackground"
                     android:gravity="center_vertical"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="32dp"
                     android:textSize="18sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/sendMessageFromHint"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="Jan Kowalski" />
 
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:rotation="270"
+                    android:src="@drawable/ic_chevron_left"
+                    app:layout_constraintBottom_toBottomOf="@id/sendMessageFrom"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/sendMessageFrom"
+                    app:tint="?android:textColorSecondary"
+                    tools:ignore="ContentDescription" />
+
                 <View
                     android:id="@+id/sendMessageFromDivider"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_mailbox_chooser.xml b/app/src/main/res/layout/dialog_mailbox_chooser.xml
new file mode 100644
index 00000000..5c93acb5
--- /dev/null
+++ b/app/src/main/res/layout/dialog_mailbox_chooser.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:id="@+id/account_quick_dialog_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="24dp"
+            android:paddingLeft="24dp"
+            android:paddingEnd="24dp"
+            android:paddingRight="24dp"
+            android:text="@string/message_mailbox_chooser_title"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:firstBaselineToTopHeight="40dp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/account_quick_dialog_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:layout_weight="1"
+            android:overScrollMode="never"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:itemCount="3"
+            tools:listitem="@layout/item_mailbox_chooser" />
+
+    </LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_mailbox_chooser.xml b/app/src/main/res/layout/item_mailbox_chooser.xml
new file mode 100644
index 00000000..7c93199b
--- /dev/null
+++ b/app/src/main/res/layout/item_mailbox_chooser.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="horizontal"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp"
+    tools:context=".ui.modules.message.mailboxchooser.MailboxChooserAdapter">
+
+    <TextView
+        android:id="@+id/mailboxItemName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="12dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/full_names" />
+
+    <TextView
+        android:id="@+id/mailboxItemSchool"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="12dp"
+        android:layout_marginTop="3dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/mailboxItemName"
+        tools:text="@tools:sample/lorem/random" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_message_chips.xml b/app/src/main/res/layout/item_message_chips.xml
index 481a9483..da2e2031 100644
--- a/app/src/main/res/layout/item_message_chips.xml
+++ b/app/src/main/res/layout/item_message_chips.xml
@@ -1,21 +1,30 @@
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/messageChipsLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
-    android:paddingTop="10dp"
-    android:paddingRight="16dp"
     tools:context=".ui.modules.message.tab.MessageTabAdapter">
 
     <com.google.android.material.chip.ChipGroup
         android:id="@+id/messageChipGroup"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:paddingLeft="16dp"
+        android:paddingTop="10dp"
+        android:paddingRight="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:singleLine="true">
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/chip_mailbox"
+            style="@style/Widget.MaterialComponents.Chip.Action"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/message_chip_all_mailboxes" />
 
         <com.google.android.material.chip.Chip
             android:id="@+id/chip_unread"
@@ -37,4 +46,4 @@
             app:checkedIconEnabled="true"
             app:checkedIconTint="@color/mtrl_choice_chip_text_color" />
     </com.google.android.material.chip.ChipGroup>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</HorizontalScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e65a27fc..e365a00c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -301,6 +301,7 @@
     <string name="message_not_exists">Message does not exist</string>
     <string name="message_required_recipients">You need to choose at least 1 recipient</string>
     <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_all_mailboxes">Wszystkie skrzynki</string>
     <string name="message_chip_only_unread">Only unread</string>
     <string name="message_chip_only_with_attachments">Only with attachments</string>
     <string name="message_read">Read: %s</string>
@@ -324,6 +325,7 @@
         <item quantity="other">%1$d selected</item>
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
 
 
     <!--Note-->
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
index ff0a5313..84a0cb40 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -27,7 +27,9 @@ fun getMailboxEntity() = Mailbox(
     globalKey = "v4",
     fullName = "",
     userName = "",
-    userLoginId = 0,
+    email = "test",
+    symbol = "powiatwulkanowy",
+    schoolId = "123456",
     studentName = "",
     schoolNameShort = "",
     type = MailboxType.UNKNOWN,
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
index 9fc83a23..9a2c22fd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.repositories
 import android.content.Context
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
@@ -10,6 +11,7 @@ import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.errorOrNull
 import io.github.wulkanowy.data.toFirstResult
+import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
 import io.github.wulkanowy.getMailboxEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
@@ -55,6 +57,12 @@ class MessageRepositoryTest {
     @MockK
     private lateinit var sharedPrefProvider: SharedPrefProvider
 
+    @MockK
+    private lateinit var mailboxDao: MailboxDao
+
+    @MockK
+    private lateinit var getMailboxByStudentUseCase: GetMailboxByStudentUseCase
+
     private val student = getStudentEntity()
 
     private val mailbox = getMailboxEntity()
@@ -74,26 +82,33 @@ class MessageRepositoryTest {
             refreshHelper = refreshHelper,
             sharedPrefProvider = sharedPrefProvider,
             json = Json,
+            mailboxDao = mailboxDao,
+            getMailboxByStudentUseCase = getMailboxByStudentUseCase,
         )
     }
 
     @Test
     fun `get messages when fetched completely new message without notify`() = runBlocking {
-        every { messageDb.loadAll(any(), any()) } returns flowOf(emptyList())
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(mailbox)
+        every { messageDb.loadAll(mailbox.globalKey, any()) } returns flowOf(emptyList())
         coEvery { sdk.getMessages(Folder.RECEIVED, any()) } returns listOf(
-            getMessageDto()
+            getMessageDto().copy(
+                unreadBy = 5,
+                readBy = 10,
+            )
         )
         coEvery { messageDb.deleteAll(any()) } just Runs
         coEvery { messageDb.insertAll(any()) } returns listOf()
 
-        repository.getMessages(
+        val res = repository.getMessages(
             student = student,
             mailbox = mailbox,
             folder = MessageFolder.RECEIVED,
             forceRefresh = true,
             notify = false,
-        ).toFirstResult().dataOrNull.orEmpty()
+        ).toFirstResult()
 
+        assertEquals(null, res.errorOrNull)
         coVerify(exactly = 1) { messageDb.deleteAll(withArg { checkEquals(emptyList<Message>()) }) }
         coVerify {
             messageDb.insertAll(withArg {
@@ -187,6 +202,7 @@ class MessageRepositoryTest {
     ) = Message(
         messageGlobalKey = "v4",
         mailboxKey = "",
+        email = "",
         correspondents = "",
         messageId = messageId,
         subject = "",
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
similarity index 77%
rename from app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
rename to app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
index 9198560f..96a84a5a 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MailboxRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
@@ -1,65 +1,52 @@
-package io.github.wulkanowy.data.repositories
+package io.github.wulkanowy.domain
 
 import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.MailboxType
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AutoRefreshHelper
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
 import io.mockk.just
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import java.time.Instant
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class MailboxRepositoryTest {
-
-    @SpyK
-    private var sdk = Sdk()
+class GetMailboxByStudentUseCaseTest {
 
     @MockK
     private lateinit var mailboxDao: MailboxDao
 
-    @MockK
-    private lateinit var refreshHelper: AutoRefreshHelper
-
-    private lateinit var systemUnderTest: MailboxRepository
+    private lateinit var systemUnderTest: GetMailboxByStudentUseCase
 
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
 
-        coEvery { refreshHelper.shouldBeRefreshed(any()) } returns false
-        coEvery { refreshHelper.updateLastRefreshTimestamp(any()) } just Runs
         coEvery { mailboxDao.deleteAll(any()) } just Runs
         coEvery { mailboxDao.insertAll(any()) } returns emptyList()
         coEvery { mailboxDao.loadAll(any()) } returns emptyList()
-        coEvery { sdk.getMailboxes() } returns emptyList()
 
-        systemUnderTest = MailboxRepository(
-            mailboxDao = mailboxDao,
-            sdk = sdk,
-            refreshHelper = refreshHelper,
-        )
+        systemUnderTest = GetMailboxByStudentUseCase(mailboxDao = mailboxDao)
     }
 
-    @Test(expected = IllegalArgumentException::class)
+    @Test
     fun `get mailbox that doesn't exist`() = runTest {
         val student = getStudentEntity(
             userName = "Stanisław Kowalski",
             studentName = "Jan Kowalski",
         )
-        coEvery { sdk.getMailboxes() } returns emptyList()
+        coEvery { mailboxDao.loadAll(any()) } returns emptyList()
 
-        systemUnderTest.getMailbox(student)
+        assertNull(systemUnderTest(student))
     }
 
     @Test
@@ -73,7 +60,7 @@ class MailboxRepositoryTest {
             expectedMailbox,
         )
 
-        val selectedMailbox = systemUnderTest.getMailbox(student)
+        val selectedMailbox = systemUnderTest(student)
         assertEquals(expectedMailbox, selectedMailbox)
     }
 
@@ -88,7 +75,7 @@ class MailboxRepositoryTest {
             expectedMailbox,
         )
 
-        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+        assertEquals(expectedMailbox, systemUnderTest(student))
     }
 
     @Test
@@ -102,10 +89,10 @@ class MailboxRepositoryTest {
             expectedMailbox,
         )
 
-        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+        assertEquals(expectedMailbox, systemUnderTest(student))
     }
 
-    @Test(expected = IllegalArgumentException::class)
+    @Test
     fun `get mailbox for not-unique non-authorized student`() = runTest {
         val student = getStudentEntity(
             userName = "Stanisław Kowalski",
@@ -116,7 +103,7 @@ class MailboxRepositoryTest {
             getMailboxEntity("Jan Kurowski"),
         )
 
-        systemUnderTest.getMailbox(student)
+        assertNull(systemUnderTest(student))
     }
 
     @Test
@@ -130,7 +117,7 @@ class MailboxRepositoryTest {
             expectedMailbox,
         )
 
-        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+        assertEquals(expectedMailbox, systemUnderTest(student))
     }
 
     @Test
@@ -144,7 +131,7 @@ class MailboxRepositoryTest {
             expectedMailbox,
         )
 
-        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+        assertEquals(expectedMailbox, systemUnderTest(student))
     }
 
     @Test
@@ -158,7 +145,7 @@ class MailboxRepositoryTest {
             expectedMailbox,
         )
 
-        assertEquals(expectedMailbox, systemUnderTest.getMailbox(student))
+        assertEquals(expectedMailbox, systemUnderTest(student))
     }
 
     private fun getMailboxEntity(
@@ -167,7 +154,9 @@ class MailboxRepositoryTest {
         globalKey = "",
         fullName = "",
         userName = "",
-        userLoginId = 123,
+        email = "",
+        schoolId = "",
+        symbol = "",
         studentName = studentName,
         schoolNameShort = "",
         type = MailboxType.STUDENT,

From d3e276d6fc79d4806befce5c9f43826b4f4ec4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 16 Nov 2022 20:13:48 +0100
Subject: [PATCH 176/429] New Crowdin updates (#2049)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 app/src/main/res/values-cs/strings.xml     |  5 +-
 app/src/main/res/values-de/strings.xml     |  3 +
 app/src/main/res/values-es-rES/strings.xml |  3 +
 app/src/main/res/values-pl/strings.xml     |  3 +
 app/src/main/res/values-ru/strings.xml     | 41 +++++-----
 app/src/main/res/values-sk/strings.xml     |  5 +-
 app/src/main/res/values-uk/strings.xml     | 25 +++---
 app/src/main/res/values/strings.xml        | 92 +---------------------
 8 files changed, 55 insertions(+), 122 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d036e7e4..f41cb17f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -309,9 +309,11 @@
     <string name="message_not_exists">Zpráva neexistuje</string>
     <string name="message_required_recipients">Musíte vybrat alespoň 1 příjemce</string>
     <string name="message_content_min_length">Obsah zprávy musí mít alespoň 3 znaky</string>
+    <string name="message_chip_all_mailboxes">Všechny poštovní schránky</string>
     <string name="message_chip_only_unread">Pouze nepřečtené</string>
     <string name="message_chip_only_with_attachments">Pouze s přílohami</string>
     <string name="message_read">Přečtena: %s</string>
+    <string name="message_read_by">Přečtena přes: %1$d z %2$d osob</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d zpráva</item>
         <item quantity="few">%1$d zprávy</item>
@@ -339,6 +341,7 @@
         <item quantity="other">%1$d vybraných</item>
     </plurals>
     <string name="message_messages_deleted">Zprávy odstraněné</string>
+    <string name="message_mailbox_chooser_title">Vyberte poštovní schránku</string>
     <!--Note-->
     <string name="note_no_items">Žádné informace o poznámkách</string>
     <string name="note_points">Body</string>
@@ -735,7 +738,7 @@
     <string name="pref_ads_consent_description">Volbu můžete kdykoliv změnit v nastavení aplikace. Můžeme použít Vaše data k zobrazení reklam šitých pro vás nebo pomocí méně vašich dat zobrazovat nepřizpůsobené reklamy. Podrobnosti naleznete v našich Zásadách ochrany osobních údajů</string>
     <string name="pref_ads_summary_personalized">Přizpůsobené reklamy</string>
     <string name="pref_ads_summary_non_personalized">Nepřizpůsobené reklamy</string>
-    <string name="pref_ads_over_18_years_old">Mám ukončené 18 let</string>
+    <string name="pref_ads_over_18_years_old">Je mi více než 18 let</string>
     <string name="pref_ads_option_personalized">Ano, přizpůsobené reklamy</string>
     <string name="pref_ads_option_non_personalized">Ano, nepřizpůsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7b544258..6107fbb9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -275,9 +275,11 @@
     <string name="message_not_exists">Nachricht nicht vorhanden</string>
     <string name="message_required_recipients">Sie müssen mindestens 1 Empfänger auswählen.</string>
     <string name="message_content_min_length">Der Inhalt der Nachricht muss mindestens 3 Zeichen lang sein.</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
     <string name="message_chip_only_unread">Nur ungelesen</string>
     <string name="message_chip_only_with_attachments">Nur mit Anhängen</string>
     <string name="message_read">Lesen: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d Nachricht</item>
         <item quantity="other">%1$d Nachrichten</item>
@@ -297,6 +299,7 @@
         <item quantity="other">%1$d ausgewählt</item>
     </plurals>
     <string name="message_messages_deleted">Nachrichten gelöscht</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
     <!--Note-->
     <string name="note_no_items">Keine Informationen über Eintragen</string>
     <string name="note_points">Punkte</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index aecc720b..95a00a60 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -275,9 +275,11 @@
     <string name="message_not_exists">Message does not exist</string>
     <string name="message_required_recipients">You need to choose at least 1 recipient</string>
     <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
     <string name="message_chip_only_unread">Only unread</string>
     <string name="message_chip_only_with_attachments">Only with attachments</string>
     <string name="message_read">Read: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d message</item>
         <item quantity="other">%1$d messages</item>
@@ -297,6 +299,7 @@
         <item quantity="other">%1$d selected</item>
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
     <string name="note_points">Points</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c9abbd02..f612d826 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -309,9 +309,11 @@
     <string name="message_not_exists">Wiadomość nie istnieje</string>
     <string name="message_required_recipients">Musisz wybrać co najmniej 1 adresata</string>
     <string name="message_content_min_length">Treść wiadomości musi zawierać co najmniej 3 znaki</string>
+    <string name="message_chip_all_mailboxes">Wszystkie skrzynki</string>
     <string name="message_chip_only_unread">Tylko nieprzeczytane</string>
     <string name="message_chip_only_with_attachments">Tylko z załącznikami</string>
     <string name="message_read">Przeczytana: %s</string>
+    <string name="message_read_by">Przeczytana przez: %1$d z %2$d osób</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d wiadomość</item>
         <item quantity="few">%1$d wiadomości</item>
@@ -339,6 +341,7 @@
         <item quantity="other">%1$d wybranych</item>
     </plurals>
     <string name="message_messages_deleted">Wiadomości zostały usunięte</string>
+    <string name="message_mailbox_chooser_title">Wybierz skrzynkę</string>
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
     <string name="note_points">Punkty</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e1abb029..195371fd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -77,9 +77,9 @@
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
     <string name="main_session_relogin">Сеанс истёк, авторизуйтесь снова</string>
-    <string name="main_support_title">Application support</string>
-    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
-    <string name="main_support_positive">Enable ads</string>
+    <string name="main_support_title">Поддержка приложения</string>
+    <string name="main_support_description">Вам нравится это приложение? Поддержите его разработку, включив неинвазивную рекламу, которую можно отключить в любое время</string>
+    <string name="main_support_positive">Включить рекламу</string>
     <!--Grade-->
     <string name="grade_header">Оценка</string>
     <string name="grade_semester">%d семестр</string>
@@ -97,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Ожидаемая оценка</string>
     <string name="grade_summary_calculated_average">Рассчитанная средняя оценка</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Как работает \"Рассчитанная средняя оценка\"?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Рассчитанная средняя оценка - это среднее арифметическое, рассчитанное на основе средних оценок по предметам. Это позволяет узнать приблизительную итоговую среднюю оценку. Она рассчитывается способом, выбранным пользователем в настройках приложения. Рекомендуется выбрать подходящий вариант, так как каждая школа по разному считает среднюю оценку. Кроме того, если ваша школа выставляет средние оценки по предметам на странице Vulcan, приложение просто загрузит их. Это можно изменить, заставив приложение считать среднюю оценку в настройках.\n\n<b>Средняя из оценок выбранного семестра</b>:\n1. Вычисление средневзвешенного значения по каждому предмету за семестр\n2.Суммирование вычисленных значений\n3. Вычисление среднего арифметического суммированных значений\n\n<b>Средняя из средних оценок семестров</b>:\n1.Расчет средневзвешенного значения для каждого предмета в семестрах. \n2. Вычисление среднего арифметического из средневзвешенных значений для каждого предмета в семестрах.\n3. Суммирование средних арифметических\n4. Вычисление среднего арифматического из суммированных значений\n\n<b>Средняя из оценок со всего года:</b>\n1. Расчет средневзвешенного значения по каждому предмету за год. Итоговое среднее значение за 1 семестр не имеет значения.\n2. Суммирование вычисленных средних\n3. Расчет среднего арифметического суммированных чисел</string>
     <string name="grade_summary_final_average_help_dialog_title">Как работает \"Итоговая средняя оценка\"?</string>
     <string name="grade_summary_final_average_help_dialog_message">Итоговая средняя оценка - это среднее арифметическое, рассчитанное из всех имеющихся на данный момент итоговых оценок в семестре.\n\nРассчет происходит следующим образом:\n1. Суммирование итоговых оценок, выставленных преподавателями\n2. Полученная сумма делится на число предметов, по которым выставлены оценки</string>
     <string name="grade_summary_final_average">Итоговая средняя оценка</string>
@@ -297,10 +297,10 @@
     <string name="message_move_to_trash">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
     <string name="message_delete_success">Письмо успешно удалено</string>
-    <string name="message_mailbox_type_student">student</string>
-    <string name="message_mailbox_type_parent">parent</string>
-    <string name="message_mailbox_type_guardian">guardian</string>
-    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_mailbox_type_student">ученик</string>
+    <string name="message_mailbox_type_parent">родитель</string>
+    <string name="message_mailbox_type_guardian">опекун</string>
+    <string name="message_mailbox_type_employee">работник</string>
     <string name="message_share">Поделиться</string>
     <string name="message_print">Печать</string>
     <string name="message_subject">Тема</string>
@@ -309,9 +309,11 @@
     <string name="message_not_exists">Письма не существует</string>
     <string name="message_required_recipients">Вы должны выбрать как минимум одного получателя</string>
     <string name="message_content_min_length">Текст сообщения должен содержать как минимум 3 знака</string>
+    <string name="message_chip_all_mailboxes">Все почтовые ящики</string>
     <string name="message_chip_only_unread">Только непрочитанные</string>
     <string name="message_chip_only_with_attachments">Только с вложениями</string>
     <string name="message_read">Прочитано: %s</string>
+    <string name="message_read_by">Прочитано: %1$d из %2$d человек</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d сообщение</item>
         <item quantity="few">%1$d сообщения</item>
@@ -339,6 +341,7 @@
         <item quantity="other">%1$d выбрано</item>
     </plurals>
     <string name="message_messages_deleted">Сообщение удалено</string>
+    <string name="message_mailbox_chooser_title">Выбрать почтовый ящик</string>
     <!--Note-->
     <string name="note_no_items">Нет записей о замечаниях и свершениях</string>
     <string name="note_points">Баллы</string>
@@ -720,10 +723,10 @@
     <string name="pref_other_fill_message_content">Отвечать с историей сообщений</string>
     <string name="pref_other_optional_arithmetic_average">Показывать среднее арифметическое при отсутствии стоимости</string>
     <string name="pref_ads_support_category_name">Поддержка</string>
-    <string name="pref_ads_privacy_policy">Privacy Policy</string>
-    <string name="pref_ads_agreements">Agreements</string>
-    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
-    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_privacy_policy">Политика приватности</string>
+    <string name="pref_ads_agreements">Соглашения</string>
+    <string name="pref_ads_consent">Согласие на обработку данных, связанных с объявлениями</string>
+    <string name="pref_ads_show_in_app">Показать рекламу в приложении</string>
     <string name="pref_ads_support">Посмотреть рекламу для поддержки проекта</string>
     <string name="pref_ads_privacy_title">Согласие на обработку данных</string>
     <string name="pref_ads_privacy_description">Для просмотра рекламы вы должны согласиться с условиями обработки данных нашей Политики конфиденциальности</string>
@@ -731,13 +734,13 @@
     <string name="pref_ads_privacy_link">Политика конфиденциальности</string>
     <string name="pref_ads_loading">Реклама загружается</string>
     <string name="pref_ads_once_per_visit">Спасибо за вашу поддержку, возвращайтесь позже для дополнительной рекламы</string>
-    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
-    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
-    <string name="pref_ads_summary_personalized">Personalized ads</string>
-    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
-    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
-    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
-    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
+    <string name="pref_ads_consent_title">Можем ли мы использовать ваши данные для показа рекламы?</string>
+    <string name="pref_ads_consent_description">Вы можете изменить свой выбор в любое время в настройках приложения. Мы можем использовать ваши данные для показа объявлений в соответствии с вашими пожеланиями или, используя меньше данных, отображать неперсональную рекламу. Пожалуйста, ознакомьтесь с нашей политикой конфиденциальности для подробностей</string>
+    <string name="pref_ads_summary_personalized">Персонализированная реклама</string>
+    <string name="pref_ads_summary_non_personalized">Неперсонализированная реклама</string>
+    <string name="pref_ads_over_18_years_old">Я старше 18 лет</string>
+    <string name="pref_ads_option_personalized">Да, персонализировать рекламу</string>
+    <string name="pref_ads_option_non_personalized">Да, не персонализировать рекламу</string>
     <string name="pref_settings_advanced_title">Расширенные</string>
     <string name="pref_settings_appearance_title">Внешний вид и поведение</string>
     <string name="pref_settings_notifications_title">Уведомления</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 1c6eae8c..9fd06bcb 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -309,9 +309,11 @@
     <string name="message_not_exists">Správa neexistuje</string>
     <string name="message_required_recipients">Musíte vybrať aspoň 1 príjemca</string>
     <string name="message_content_min_length">Obsah správy musí mať aspoň 3 znaky</string>
+    <string name="message_chip_all_mailboxes">Všetky poštové schránky</string>
     <string name="message_chip_only_unread">Iba neprečítané</string>
     <string name="message_chip_only_with_attachments">Iba s prílohami</string>
     <string name="message_read">Prečítaná: %s</string>
+    <string name="message_read_by">Prečítaná cez: %1$d z %2$d osôb</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d správa</item>
         <item quantity="few">%1$d správy</item>
@@ -339,6 +341,7 @@
         <item quantity="other">%1$d vybraných</item>
     </plurals>
     <string name="message_messages_deleted">Správy odstránené</string>
+    <string name="message_mailbox_chooser_title">Vyberte poštovú schránku</string>
     <!--Note-->
     <string name="note_no_items">Žiadne informácie o poznámkach</string>
     <string name="note_points">Body</string>
@@ -735,7 +738,7 @@
     <string name="pref_ads_consent_description">Voľbu môžete kedykoľvek zmeniť v nastavení aplikácie. Môžeme použiť vaše údaje na zobrazenie reklám šitých pre vás alebo pomocou menej vašich dát zobrazovať neprispôsobené reklamy. Podrobnosti nájdete v našich Zásadách ochrany osobných údajov</string>
     <string name="pref_ads_summary_personalized">Prispôsobené reklamy</string>
     <string name="pref_ads_summary_non_personalized">Neprispôsobené reklamy</string>
-    <string name="pref_ads_over_18_years_old">Mám ukončené 18 rokov</string>
+    <string name="pref_ads_over_18_years_old">Mám viac ako 18 rokov</string>
     <string name="pref_ads_option_personalized">Áno, prispôsobené reklamy</string>
     <string name="pref_ads_option_non_personalized">Áno, neprispôsobené reklamy</string>
     <string name="pref_settings_advanced_title">Pokročilé</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2c104ecb..2d3bf372 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -77,8 +77,8 @@
     <string name="main_log_in">Увійти</string>
     <string name="main_session_expired">Минув термін дії сесії</string>
     <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
-    <string name="main_support_title">Підтримка додатків</string>
-    <string name="main_support_description">Вам подобається цей додаток? Підтримуйте його розвиток, увімкнувши неінвазивну рекламу, яку ви можете будь-коли вимкнути</string>
+    <string name="main_support_title">Підтримка додатку</string>
+    <string name="main_support_description">Вам подобається цей додаток? Підтримайте його розвиток, увімкнувши неінвазивну рекламу, яку ви можете відключити в будь-який час</string>
     <string name="main_support_positive">Увімкнути рекламу</string>
     <!--Grade-->
     <string name="grade_header">Оцінка</string>
@@ -97,7 +97,7 @@
     <string name="grade_summary_predicted_grade">Передбачувана оцінка</string>
     <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
     <string name="grade_summary_calculated_average_help_dialog_title">Як працює \"Розрахована середня оцінка\"?</string>
-    <string name="grade_summary_calculated_average_help_dialog_message">Розрахована середня оцінка - це середнє арифметичне, обчислене з середніх оцінок з предметів.Це дозволяє дізнатися приблизну кінцеву середню оцінку.Вона розраховується способом, обраним користувачем у налаштуваннях програми.Рекомендується вибрати відповідний варіант, тому що кожна школа по різному розраховує середню оцінку.Крім того, якщо у вашій школі повідомляється середня оцінка з предметів на сторінці Vulcan, програма тільки завантажує ці оцінки.Це можна змінити шляхом примусового розрахунку середньоЇ оцінки в налаштуваннях програми.\n\n<b>Середні оцінки тільки за обраний семестр</b>:\n1. Розрахунок середньозваженого числа для кожного предмета в даному семестрі\n2. Сумування розрахованих числ\n3. Розрахунок середнього арифметичного з сумованих чисел\n\n<b>Середнє значення з обох семестрів</b>:\n1. Обчислення середньозваженого числа для кожного предмета у 1 та 2 семестрі\n2. Обчислення середнього арифметичного з розрахованих середньозважених числ за 1 та 2 семестри для кожного предмета.\n3. Додавання розрахованих середніх\n4. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення оцінок за весь рік: </b>\n1. Розрахунок середньозваженого числа за рік для кожного предмета. Підсумковий середній показник у 1-му семестрі не має значення.\n2. Сумування розрахованих середніх\n3. Обчислення середнього арифметичного з суммованих середніх</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">Розрахована середня оцінка - це середнє арифметичне, обчислене з середніх оцінок з предметів. Це дозволяє дізнатися приблизну кінцеву середню оцінку. Вона розраховується спосібом, обраним користувачем у налаштуваннях програми. Рекомендується вибрати відповідний варіант, тому що кожна школа по різному розраховує середню оцінку. Крім того, якщо у вашій школі повідомляється середня оцінка з предметів на сторінці Vulcan, програма тільки завантажує ці оцінки і не розраховує їх самостійно. Це можна змінити шляхом примусового розрахунку середньоЇ оцінки в налаштуваннях програми.\n\n<b>Середні оцінки тільки за обраний семестр</b>:\n1. Розрахунок середньозваженого числа для кожного предмета в даному семестрі\n2. Сумування розрахованих числ\n3. Розрахунок середнього арифметичного з сумованих чисел\n\n<b>Середнє значення з обох семестрів</b>:\n1. Обчислення середньозваженого числа для кожного предмета у 1 та 2 семестрі\n2. Обчислення середнього арифметичного з розрахованих середньозважених числ за 1 та 2 семестри для кожного предмета.\n3. Додавання розрахованих середніх\n4. Розрахунок середнього арифметичного підсумованих середніх значень\n\n<b>Середнє значення оцінок за весь рік: </b>\n1. Розрахунок середньозваженого числа за рік для кожного предмета. Підсумковий середній показник у 1-му семестрі не має значення.\n2. Сумування розрахованих середніх\n3. Обчислення середнього арифметичного з суммованих середніх</string>
     <string name="grade_summary_final_average_help_dialog_title">Як працює \"Підсумкова середня оцінка\"?</string>
     <string name="grade_summary_final_average_help_dialog_message">Підсумкове середнє значення - це середнє арифметичне, обчислене з усіх наявних наразі підсумкових оцінок у даному семестрі. \n\nСхема обчислення складається з таких кроків:\n1. Сумування підсумкових оцінок, виставленних викладачами\n2. Ділення на кількість предметів, з яких виставлені ці оцінки</string>
     <string name="grade_summary_final_average">Підсумкова середня оцінка</string>
@@ -220,7 +220,7 @@
     <string name="additional_lessons_delete_series">Всі в серії</string>
     <string name="additional_lessons_start">Час початку</string>
     <string name="additional_lessons_end">Час завершення</string>
-    <string name="additional_lessons_end_time_error">Час завершення має бути більшим, ніж час початку</string>
+    <string name="additional_lessons_end_time_error">Час завершення має бути пізніше часу початку</string>
     <!--Attendance-->
     <string name="attendance_summary_button">Підсумок відвідуваності</string>
     <string name="attendance_absence_school">Відсутність зі шкільних причин</string>
@@ -297,8 +297,8 @@
     <string name="message_move_to_trash">Перемістити до кошика</string>
     <string name="message_delete_forever">Видалити назавжди</string>
     <string name="message_delete_success">Лист було успішно видалено</string>
-    <string name="message_mailbox_type_student">студент</string>
-    <string name="message_mailbox_type_parent">батькові</string>
+    <string name="message_mailbox_type_student">учень</string>
+    <string name="message_mailbox_type_parent">родич</string>
     <string name="message_mailbox_type_guardian">опікун</string>
     <string name="message_mailbox_type_employee">працівник</string>
     <string name="message_share">Поділитись</string>
@@ -309,9 +309,11 @@
     <string name="message_not_exists">Такого листа не існує</string>
     <string name="message_required_recipients">Необхідно обрати принаймні 1 адресата</string>
     <string name="message_content_min_length">Зміст листа повинен складатися принаймні з 3 знаків</string>
+    <string name="message_chip_all_mailboxes">Усі поштові скриньки</string>
     <string name="message_chip_only_unread">Лише непрочитані</string>
     <string name="message_chip_only_with_attachments">Тільки з вкладеннями</string>
     <string name="message_read">Прочитаний: %s</string>
+    <string name="message_read_by">Прочитано: %1$d з %2$d осіб</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d лист</item>
         <item quantity="few">%1$d листи</item>
@@ -338,7 +340,8 @@
         <item quantity="many">%1$d вибрано</item>
         <item quantity="other">%1$d вибрано</item>
     </plurals>
-    <string name="message_messages_deleted">Листи видалені</string>
+    <string name="message_messages_deleted">Листи видалено</string>
+    <string name="message_mailbox_chooser_title">Вибрати поштову скриньку</string>
     <!--Note-->
     <string name="note_no_items">Немає інформації о зауваженнях</string>
     <string name="note_points">Бали</string>
@@ -722,7 +725,7 @@
     <string name="pref_ads_support_category_name">Підтримка</string>
     <string name="pref_ads_privacy_policy">Політика конфіденційності</string>
     <string name="pref_ads_agreements">Угоди</string>
-    <string name="pref_ads_consent">Згода на обробку даних, пов’язаних з оголошеннями</string>
+    <string name="pref_ads_consent">Згода на обробку даних, пов\'язаних з рекламою</string>
     <string name="pref_ads_show_in_app">Показувати рекламу в додатку</string>
     <string name="pref_ads_support">Подивіться одну рекламу для підтримки проєкту</string>
     <string name="pref_ads_privacy_title">Згода в обробці даних</string>
@@ -731,9 +734,9 @@
     <string name="pref_ads_privacy_link">Політика конфіденційності</string>
     <string name="pref_ads_loading">Реклама завантажується</string>
     <string name="pref_ads_once_per_visit">Дякуємо за вашу підтримку, повертайтеся пізніше для більшої кількості реклам</string>
-    <string name="pref_ads_consent_title">Чи можемо ми використовувати ваші дані для відбивання реклами?</string>
-    <string name="pref_ads_consent_description">Ви можете змінити свій вибір в будь-який час в налаштуваннях додатку. Ми можемо використовувати ваші дані для відбивання оголошень, адаптованої до вас або, використовуючи менше ваших даних, відбивати неперсоналізовані оголошення. Перегляньте нашу Політику конфіденційності для деталей</string>
-    <string name="pref_ads_summary_personalized">Персоналізовані оголошення</string>
+    <string name="pref_ads_consent_title">Чи можемо ми використовувати ваші дані для висвітлювання реклами?</string>
+    <string name="pref_ads_consent_description">Ви можете змінити свій вибір в будь-який час в налаштуваннях додатку. Ми можемо використовувати ваші дані для висвітлювання реклами, адаптованої до вас або, використовуючи менше ваших даних, висвітлювати неперсоналізовану рекламу. Перегляньте нашу Політику конфіденційності для подробиць</string>
+    <string name="pref_ads_summary_personalized">Персоналізована реклама</string>
     <string name="pref_ads_summary_non_personalized">Неперсоналізована реклама</string>
     <string name="pref_ads_over_18_years_old">Мені більше 18 років</string>
     <string name="pref_ads_option_personalized">Так, персоналізована реклама</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e365a00c..71d1767e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,15 +26,11 @@
     <string name="student_info_title">Student info</string>
     <string name="dashboard_title">Dashboard</string>
     <string name="notifications_center_title">Notifications center</string>
-
-
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
-
-
     <!--Login-->
     <string name="login_header_default">Sign in with the student or parent account</string>
-    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b>%1$s&lt;/b></string>
+    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="login_nickname_hint">Username</string>
     <string name="login_email_hint">Email</string>
     <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
@@ -78,8 +74,6 @@
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>
     <string name="login_host_standard">Standard</string>
-
-
     <!--Main-->
     <string name="main_account_picker">Account manager</string>
     <string name="main_log_in">Log in</string>
@@ -88,8 +82,6 @@
     <string name="main_support_title">Application support</string>
     <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
     <string name="main_support_positive">Enable ads</string>
-
-
     <!--Grade-->
     <string name="grade_header">Grade</string>
     <string name="grade_semester">Semester %d</string>
@@ -152,8 +144,6 @@
         <item quantity="one">You received %1$d final grade</item>
         <item quantity="other">You received %1$d final grades</item>
     </plurals>
-
-
     <!--Timetable-->
     <string name="timetable_lesson">Lesson</string>
     <string name="timetable_room">Room</string>
@@ -189,8 +179,6 @@
         <item quantity="one">%d change</item>
         <item quantity="other">%d changes</item>
     </plurals>
-
-
     <!--Completed lessons-->
     <string name="completed_lessons_title">Completed lessons</string>
     <string name="completed_lessons_button">Show completed lessons</string>
@@ -198,8 +186,6 @@
     <string name="completed_lessons_topic">Topic</string>
     <string name="completed_lessons_absence">Absence</string>
     <string name="completed_lessons_resources">Resources</string>
-
-
     <!--Additional lessons-->
     <string name="additional_lessons_title">Additional lessons</string>
     <string name="additional_lessons_button">Show additional lessons</string>
@@ -215,8 +201,6 @@
     <string name="additional_lessons_start">Start time</string>
     <string name="additional_lessons_end">End time</string>
     <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
-
-
     <!--Attendance-->
     <string name="attendance_summary_button">Attendance summary</string>
     <string name="attendance_absence_school">Absent for school reasons</string>
@@ -249,12 +233,8 @@
         <item quantity="one">%d attendance</item>
         <item quantity="other">%d attendance</item>
     </plurals>
-
-
     <!--Attendance summary-->
     <string name="attendance_summary_total">Total</string>
-
-
     <!--Exam-->
     <string name="exam_no_items">No exams this week</string>
     <string name="exam_type">Type</string>
@@ -271,8 +251,6 @@
         <item quantity="one">%d exam</item>
         <item quantity="other">%d exams</item>
     </plurals>
-
-
     <!--Message-->
     <string name="message_inbox">Inbox</string>
     <string name="message_sent">Sent</string>
@@ -301,7 +279,7 @@
     <string name="message_not_exists">Message does not exist</string>
     <string name="message_required_recipients">You need to choose at least 1 recipient</string>
     <string name="message_content_min_length">The message content must be at least 3 characters</string>
-    <string name="message_chip_all_mailboxes">Wszystkie skrzynki</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
     <string name="message_chip_only_unread">Only unread</string>
     <string name="message_chip_only_with_attachments">Only with attachments</string>
     <string name="message_read">Read: %s</string>
@@ -326,8 +304,6 @@
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
     <string name="message_mailbox_chooser_title">Choose mailbox</string>
-
-
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
     <string name="note_points">Points</string>
@@ -343,7 +319,6 @@
         <item quantity="one">You received %1$d note</item>
         <item quantity="other">You received %1$d notes</item>
     </plurals>
-
     <!--Praise-->
     <plurals name="praise_number_item">
         <item quantity="one">%d praise</item>
@@ -357,7 +332,6 @@
         <item quantity="one">You received %1$d praise</item>
         <item quantity="other">You received %1$d praises</item>
     </plurals>
-
     <!--Neutral notes-->
     <plurals name="neutral_note_number_item">
         <item quantity="one">%d neutral note</item>
@@ -371,8 +345,6 @@
         <item quantity="one">You received %1$d neutral note</item>
         <item quantity="other">You received %1$d neutral notes</item>
     </plurals>
-
-
     <!--Homework-->
     <string name="homework_no_items">No info about homework</string>
     <string name="homework_mark_as_done">Mark as done</string>
@@ -393,8 +365,6 @@
         <item quantity="one">%d homework</item>
         <item quantity="other">%d homework</item>
     </plurals>
-
-
     <!--Lucky number-->
     <string name="lucky_number_title">Lucky number</string>
     <string name="lucky_number_header">Today\'s lucky number is</string>
@@ -402,13 +372,9 @@
     <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
     <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
     <string name="lucky_number_history_button">Show history</string>
-
-
     <!--Lucky number history-->
     <string name="lucky_number_history_title">Lucky number history</string>
     <string name="lucky_number_history_empty">No info about lucky numbers</string>
-
-
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile devices</string>
     <string name="mobile_devices_no_items">No devices</string>
@@ -418,12 +384,8 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
-
-
     <!--School and teachers-->
     <string name="schoolandteachers_title">School and teachers</string>
-
-
     <!--School-->
     <string name="school_title">School</string>
     <string name="school_no_info">No info about school</string>
@@ -434,14 +396,10 @@
     <string name="school_pedagogue">Name of pedagogue</string>
     <string name="school_address_button">Show on map</string>
     <string name="school_telephone_button">Call</string>
-
-
     <!--Teacher-->
     <string name="teachers_title">Teachers</string>
     <string name="teacher_no_items">No info about teachers</string>
     <string name="teacher_no_subject">No subject</string>
-
-
     <!--Conference-->
     <string name="conferences_title">Conferences</string>
     <string name="conference_no_items">No info about conferences</string>
@@ -459,7 +417,6 @@
     </plurals>
     <string name="conferences_present">Present at conference</string>
     <string name="conference_agenda">Agenda</string>
-
     <!--Director information-->
     <string name="school_announcement_title">School announcements</string>
     <string name="school_announcement_no_items">No school announcements</string>
@@ -475,8 +432,6 @@
         <item quantity="one">You have %1$d new school announcement</item>
         <item quantity="other">You have %1$d new school announcements</item>
     </plurals>
-
-
     <!--Account-->
     <string name="account_add_new">Add account</string>
     <string name="account_logout">Logout</string>
@@ -491,8 +446,6 @@
     <string name="account_contact">Contact</string>
     <string name="account_address">Residence details</string>
     <string name="account_personal_data">Personal information</string>
-
-
     <!--About-->
     <string name="about_version">App version</string>
     <string name="about_contributor">Contributors</string>
@@ -516,17 +469,11 @@
     <string name="about_licenses">Licenses</string>
     <string name="about_licenses_summary">Licenses of libraries used in the application</string>
     <string name="about_feedback_template" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nIdentyfikator instalacji: %4$s\nTreść zgłoszenia:</string>
-
-
     <!--Licenses-->
     <string name="license_dialog_title">License</string>
-
-
     <!--Contributor-->
     <string name="contributor_avatar_description">Avatar</string>
     <string name="contributor_see_more">See more on GitHub</string>
-
-
     <!--Student info-->
     <string name="student_info_empty">No info about student or student family</string>
     <string name="student_info_first_name">Name</string>
@@ -549,19 +496,13 @@
     <string name="student_info_female">Female</string>
     <string name="student_info_last_name">Last name</string>
     <string name="student_info_guardian">Guardian</string>
-
-
     <!--Account edit-->
     <string name="account_edit_nick_hint">Nick</string>
     <string name="account_edit_header">Add nick</string>
     <string name="account_edit_avatar_title">Choose avatar color</string>
-
-
     <!--Log viewer-->
     <string name="logviewer_share">Share logs</string>
     <string name="logviewer_refresh">Refresh</string>
-
-
     <!--Dashboard-->
     <string name="dashboard_timetable_title">Lessons</string>
     <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
@@ -580,7 +521,6 @@
     <string name="dashboard_timetable_third_time">until %1$s</string>
     <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
     <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
-
     <string name="dashboard_homework_title">Homework</string>
     <string name="dashboard_homework_no_homework">No homework to do</string>
     <string name="dashboard_homework_error">An error occurred while loading the homework</string>
@@ -589,11 +529,9 @@
         <item quantity="other">%1$d more homework</item>
     </plurals>
     <string name="dashboard_homework_time">due %1$s</string>
-
     <string name="dashboard_grade_title">Last grades</string>
     <string name="dashboard_grade_no_grade">No new grades</string>
     <string name="dashboard_grade_error">An error occurred while loading the grades</string>
-
     <string name="dashboard_announcements_title">School announcements</string>
     <string name="dashboard_announcements_no_announcements">No current announcements</string>
     <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
@@ -601,7 +539,6 @@
         <item quantity="one">%1$d more announcement</item>
         <item quantity="other">%1$d more announcements</item>
     </plurals>
-
     <string name="dashboard_exams_title">Exams</string>
     <string name="dashboard_exams_no_exams">No upcoming exams</string>
     <string name="dashboard_exams_error">An error occurred while loading the exams</string>
@@ -609,7 +546,6 @@
         <item quantity="one">%1$d more exam</item>
         <item quantity="other">%1$d more exams</item>
     </plurals>
-
     <string name="dashboard_conferences_title">Conferences</string>
     <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
     <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
@@ -617,16 +553,11 @@
         <item quantity="one">%1$d more conference</item>
         <item quantity="other">%1$d more conferences</item>
     </plurals>
-
     <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
     <string name="dashboard_horizontal_group_no_data">None</string>
-
-
     <!--Error dialog-->
     <string name="dialog_error_check_update">Check for updates</string>
     <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
-
-
     <!--Generic-->
     <string name="all_content">Content</string>
     <string name="all_retry">Retry</string>
@@ -654,16 +585,12 @@
     <string name="all_undo">Undo</string>
     <string name="all_change">Change</string>
     <string name="all_add_to_calendar">Add to calendar</string>
-
-
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
     <string name="widget_timetable_theme_title">Choose theme</string>
     <string name="widget_timetable_theme_light">Light</string>
     <string name="widget_timetable_theme_dark">Dark</string>
     <string name="widget_timetable_theme_system">System Theme</string>
-
-
     <!--Preferences-->
     <string name="pref_view_header">App</string>
     <string name="pref_view_list">Default view</string>
@@ -679,7 +606,6 @@
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
     <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
     <string name="pref_view_app_language">Language</string>
-
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_header_other">Other</string>
     <string name="pref_notify_switch">Show notifications</string>
@@ -699,7 +625,6 @@
     <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
     <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
     <string name="pref_notification_go_to_settings">Go to settings</string>
-
     <string name="pref_services_header">Synchronization</string>
     <string name="pref_services_switch">Automatic update</string>
     <string name="pref_services_suspended">Suspended on holidays</string>
@@ -710,12 +635,10 @@
     <string name="pref_services_message_sync_failed">Sync failed</string>
     <string name="pref_services_sync_in_progress">Sync in progress</string>
     <string name="pref_services_last_full_sync_date">Last full sync: %s</string>
-
     <string name="pref_other_grade_modifier_plus">Value of the plus</string>
     <string name="pref_other_grade_modifier_minus">Value of the minus</string>
     <string name="pref_other_fill_message_content">Reply with message history</string>
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
-
     <string name="pref_ads_support_category_name">Support</string>
     <string name="pref_ads_privacy_policy">Privacy Policy</string>
     <string name="pref_ads_agreements">Agreements</string>
@@ -735,13 +658,11 @@
     <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
     <string name="pref_ads_option_personalized">Yes, personalized ads</string>
     <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
-
     <string name="pref_settings_advanced_title">Advanced</string>
     <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
     <string name="pref_settings_notifications_title">Notifications</string>
     <string name="pref_settings_sync_title">Synchronization</string>
     <string name="pref_settings_ads_title">Advertisements</string>
-
     <string name="pref_grades_appearance_header">Grades</string>
     <string name="pref_dashboard_appearance_header">Dashboard</string>
     <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
@@ -750,7 +671,6 @@
     <string name="pref_grades_advanced_header">Grades</string>
     <string name="pref_counted_average_advanced_header">Calculated average</string>
     <string name="pref_messages_advanced_header">Messages</string>
-
     <string name="pref_appearance_category">Appearance &amp; Behavior</string>
     <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
     <string name="pref_notifications_category_summary">App notifications, fix problems</string>
@@ -761,8 +681,6 @@
     <string name="pref_advanced_category">Advanced</string>
     <string name="pref_about_category_summary">App version, contributors, social portals</string>
     <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
-
-
     <!--Notification Channels-->
     <string name="channel_new_grades">New grades</string>
     <string name="channel_new_homework">New homework</string>
@@ -777,8 +695,6 @@
     <string name="channel_debug">Debug</string>
     <string name="channel_change_timetable">Timetable change</string>
     <string name="channel_new_attendance">New attendance</string>
-
-
     <!--Colors-->
     <string name="all_black">Black</string>
     <string name="all_red">Red</string>
@@ -786,15 +702,11 @@
     <string name="all_green">Green</string>
     <string name="all_purple">Purple</string>
     <string name="all_empty_color">No color</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>
     <string name="update_download_success_button">Restart</string>
     <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
-
-
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>

From 2d83218f618fcb927e9a6247817623ed5562e301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 16 Nov 2022 20:31:02 +0100
Subject: [PATCH 177/429] Version 1.8.0

---
 app/build.gradle                                  | 10 +++++-----
 app/src/main/play/release-notes/pl-PL/default.txt | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 99672f1f..62a5a21f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 114
-        versionName "1.7.5"
+        versionCode 115
+        versionName "1.8.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -160,8 +160,8 @@ kapt {
 play {
     defaultToAppBundles = false
     track = 'production'
-//    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-//    userFraction = 0.05d
+    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
+    userFraction = 0.25d
     updatePriority = 4
     enabled.set(false)
 }
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:701016eda2"
+    implementation "io.github.wulkanowy:sdk:1.8.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 064401ab..996d5eeb 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,7 +1,9 @@
-Wersja 1.7.5
+Wersja 1.8.0
 
-- naprawiliśmy kilka błędów w obsłudze nowego modułu wiadomości
-- naprawiliśmy wyświetlanie napisu "Brak ocen", jesli uczeń nie zdobył w danym semestrze jeszcze żadnych ocen
-- naprawiliśmy logowanie do aplikacji rodzicom będącym jednocześnie nauczycielami
+- naprawiliśmy liczenie średniej ucznia w ocenach klasy dla wykresu "Wszystkie"
+- zmieniliśmy kolejność przycisków akcji w podglądzie wiadomości
+- ulepszyliśmy oznaczenie nieodczytanych wiadomości
+- naprawiliśmy pokazywanie informacji o odczytanej wiadomości w wysłanych
+- dodaliśmy opcję ręcznego wybierania skrzynki pocztowej
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 6c115fb915cfcc29c1a25e3f94476c473a4e1ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 18 Nov 2022 16:32:04 +0100
Subject: [PATCH 178/429] Fallback to subject name from timetable when
 attendance item doesn't have it (#2052)

* Fallback to subject name from timetable when attendance item doesn't have it

* Fix tests

* Add some unit tests
---
 .../java/io/github/wulkanowy/data/Resource.kt |   2 +-
 .../wulkanowy/data/db/dao/TimetableDao.kt     |   3 +
 .../data/mappers/AttendanceMapper.kt          |   9 +-
 .../data/repositories/AttendanceRepository.kt |  11 +-
 .../data/mappers/AttendanceMapperKtTest.kt    | 143 ++++++++++++++++++
 .../repositories/AttendanceRepositoryTest.kt  |  27 ++--
 6 files changed, 180 insertions(+), 15 deletions(-)
 create mode 100644 app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt

diff --git a/app/src/main/java/io/github/wulkanowy/data/Resource.kt b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
index 44f8a1b4..6b611e47 100644
--- a/app/src/main/java/io/github/wulkanowy/data/Resource.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
@@ -49,8 +49,8 @@ fun <T, U> Resource<T>.mapData(block: (T) -> U) = when (this) {
 
 fun <T> Flow<Resource<T>>.logResourceStatus(name: String, showData: Boolean = false) = onEach {
     val description = when (it) {
-        is Resource.Loading -> "started"
         is Resource.Intermediate -> "intermediate data received" + if (showData) " (data: `${it.data}`)" else ""
+        is Resource.Loading -> "started"
         is Resource.Success -> "success" + if (showData) " (data: `${it.data}`)" else ""
         is Resource.Error -> "exception occurred: ${it.error}"
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
index 5e6eec66..b4b7379f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
@@ -13,4 +13,7 @@ interface TimetableDao : BaseDao<Timetable> {
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
     fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Timetable>>
+
+    @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
+    fun load(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): List<Timetable>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt
index 46e67fda..c0ed0c8c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/AttendanceMapper.kt
@@ -3,17 +3,22 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.pojo.Attendance as SdkAttendance
 import io.github.wulkanowy.sdk.pojo.AttendanceSummary as SdkAttendanceSummary
 
-fun List<SdkAttendance>.mapToEntities(semester: Semester) = map {
+fun List<SdkAttendance>.mapToEntities(semester: Semester, lessons: List<Timetable>) = map {
     Attendance(
         studentId = semester.studentId,
         diaryId = semester.diaryId,
         date = it.date,
         timeId = it.timeId,
         number = it.number,
-        subject = it.subject,
+        subject = it.subject.ifBlank {
+            lessons.find { lesson ->
+                lesson.date == it.date && lesson.number == it.number
+            }?.subject.orEmpty()
+        },
         name = it.name,
         presence = it.presence,
         absence = it.absence,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
index 9aa6562a..fd5d8bd1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.AttendanceDao
+import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
@@ -9,8 +10,10 @@ import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Absent
 import io.github.wulkanowy.utils.*
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.withContext
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalTime
@@ -20,6 +23,7 @@ import javax.inject.Singleton
 @Singleton
 class AttendanceRepository @Inject constructor(
     private val attendanceDb: AttendanceDao,
+    private val timetableDb: TimetableDao,
     private val sdk: Sdk,
     private val refreshHelper: AutoRefreshHelper,
 ) {
@@ -48,10 +52,15 @@ class AttendanceRepository @Inject constructor(
             attendanceDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
         },
         fetch = {
+            val lessons = withContext(Dispatchers.IO) {
+                timetableDb.load(
+                    semester.diaryId, semester.studentId, start.monday, end.sunday
+                )
+            }
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
                 .getAttendance(start.monday, end.sunday, semester.semesterId)
-                .mapToEntities(semester)
+                .mapToEntities(semester, lessons)
         },
         saveFetchResult = { old, new ->
             attendanceDb.deleteAll(old uniqueSubtract new)
diff --git a/app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt b/app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt
new file mode 100644
index 00000000..a35e5d30
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt
@@ -0,0 +1,143 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.sdk.pojo.Attendance
+import io.github.wulkanowy.sdk.scrapper.attendance.SentExcuse
+import org.junit.Test
+import java.time.Instant
+import java.time.LocalDate
+import kotlin.test.assertEquals
+
+class AttendanceMapperTest {
+
+    @Test
+    fun `map attendance when fallback is not necessary`() {
+        val attendance = listOf(
+            getSdkAttendance(1, LocalDate.of(2022, 11, 17), "Oryginalna 1"),
+            getSdkAttendance(2, LocalDate.of(2022, 11, 17), "Oryginalna 2"),
+        )
+        val lessons = listOf(
+            getEntityTimetable(1, LocalDate.of(2022, 11, 17), "Pierwsza"),
+            getEntityTimetable(2, LocalDate.of(2022, 11, 17), "Druga"),
+        )
+
+        val result = attendance.mapToEntities(getEntitySemester(), lessons)
+        assertEquals("Oryginalna 1", result[0].subject)
+        assertEquals("Oryginalna 2", result[1].subject)
+    }
+
+    @Test
+    fun `map attendance when fallback is not always necessary`() {
+        val attendance = listOf(
+            getSdkAttendance(1, LocalDate.of(2022, 11, 17), "Oryginalna 1"),
+            getSdkAttendance(2, LocalDate.of(2022, 11, 17), ""),
+        )
+        val lessons = listOf(
+            getEntityTimetable(1, LocalDate.of(2022, 11, 17), "Pierwsza"),
+            getEntityTimetable(2, LocalDate.of(2022, 11, 17), "Druga"),
+        )
+
+        val result = attendance.mapToEntities(getEntitySemester(), lessons)
+        assertEquals("Oryginalna 1", result[0].subject)
+        assertEquals("Druga", result[1].subject)
+    }
+
+    @Test
+    fun `map attendance when fallback is sometimes empty`() {
+        val attendance = listOf(
+            getSdkAttendance(1, LocalDate.of(2022, 11, 17), "Oryginalna 1"),
+            getSdkAttendance(2, LocalDate.of(2022, 11, 17), ""),
+        )
+        val lessons = listOf(
+            getEntityTimetable(1, LocalDate.of(2022, 11, 17), "Pierwsza"),
+        )
+
+        val result = attendance.mapToEntities(getEntitySemester(), lessons)
+        assertEquals("Oryginalna 1", result[0].subject)
+        assertEquals("", result[1].subject)
+    }
+
+    @Test
+    fun `map attendance when fallback is empty`() {
+        val attendance = listOf(
+            getSdkAttendance(1, LocalDate.of(2022, 11, 17), ""),
+            getSdkAttendance(2, LocalDate.of(2022, 11, 17), ""),
+        )
+        val lessons = listOf(
+            getEntityTimetable(1, LocalDate.of(2022, 11, 18), "Pierwsza"),
+            getEntityTimetable(2, LocalDate.of(2022, 10, 17), "Druga"),
+        )
+
+        val result = attendance.mapToEntities(getEntitySemester(), lessons)
+        assertEquals("", result[0].subject)
+        assertEquals("", result[1].subject)
+    }
+
+    @Test
+    fun `map attendance with all subject fallback`() {
+        val attendance = listOf(
+            getSdkAttendance(1, LocalDate.of(2022, 11, 17)),
+            getSdkAttendance(2, LocalDate.of(2022, 11, 17)),
+        )
+        val lessons = listOf(
+            getEntityTimetable(1, LocalDate.of(2022, 11, 17), "Pierwsza"),
+            getEntityTimetable(2, LocalDate.of(2022, 11, 17), "Druga"),
+        )
+
+        val result = attendance.mapToEntities(getEntitySemester(), lessons)
+        assertEquals("Pierwsza", result[0].subject)
+        assertEquals("Druga", result[1].subject)
+    }
+
+    private fun getSdkAttendance(number: Int, date: LocalDate, subject: String = "") = Attendance(
+        number = number,
+        name = "ABSENCE",
+        subject = subject,
+        date = date,
+        timeId = 1,
+        categoryId = 1,
+        deleted = false,
+        excuseStatus = SentExcuse.Status.WAITING,
+        excusable = false,
+        absence = false,
+        excused = false,
+        exemption = false,
+        lateness = false,
+        presence = false,
+    )
+
+    private fun getEntityTimetable(number: Int, date: LocalDate, subject: String = "") = Timetable(
+        number = number,
+        start = Instant.now(),
+        end = Instant.now(),
+        date = date,
+        subject = subject,
+        subjectOld = "",
+        group = "",
+        room = "",
+        roomOld = "",
+        teacher = "",
+        teacherOld = "",
+        info = "",
+        changes = false,
+        canceled = false,
+        studentId = 0,
+        diaryId = 0,
+        isStudentPlan = false,
+    )
+
+    private fun getEntitySemester() = Semester(
+        studentId = 0,
+        diaryId = 0,
+        kindergartenDiaryId = 0,
+        diaryName = "",
+        schoolYear = 0,
+        semesterId = 0,
+        semesterName = 0,
+        start = LocalDate.now(),
+        end = LocalDate.now(),
+        classId = 0,
+        unitId = 0
+    )
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
index 7d22f726..896491ef 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.dao.AttendanceDao
+import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.errorOrNull
 import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.toFirstResult
@@ -29,6 +30,9 @@ class AttendanceRepositoryTest {
     @MockK
     private lateinit var attendanceDb: AttendanceDao
 
+    @MockK
+    private lateinit var timetableDb: TimetableDao
+
     @MockK(relaxUnitFun = true)
     private lateinit var refreshHelper: AutoRefreshHelper
 
@@ -51,8 +55,9 @@ class AttendanceRepositoryTest {
     fun setUp() {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
+        coEvery { timetableDb.load(any(), any(), any(), any()) } returns emptyList()
 
-        attendanceRepository = AttendanceRepository(attendanceDb, sdk, refreshHelper)
+        attendanceRepository = AttendanceRepository(attendanceDb, timetableDb, sdk, refreshHelper)
     }
 
     @Test
@@ -60,8 +65,8 @@ class AttendanceRepositoryTest {
         // prepare
         coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester))
+            flowOf(remoteList.mapToEntities(semester, emptyList())),
+            flowOf(remoteList.mapToEntities(semester, emptyList()))
         )
         coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { attendanceDb.deleteAll(any()) } just Runs
@@ -83,9 +88,9 @@ class AttendanceRepositoryTest {
         // prepare
         coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)),
-            flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.mapToEntities(semester))
+            flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList())),
+            flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList())), // after fetch end before save result
+            flowOf(remoteList.mapToEntities(semester, emptyList()))
         )
         coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { attendanceDb.deleteAll(any()) } just Runs
@@ -100,7 +105,7 @@ class AttendanceRepositoryTest {
         coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
         coVerify {
             attendanceDb.insertAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
+                it.size == 1 && it[0] == remoteList.mapToEntities(semester, emptyList())[1]
             })
         }
         coVerify { attendanceDb.deleteAll(match { it.isEmpty() }) }
@@ -111,9 +116,9 @@ class AttendanceRepositoryTest {
         // prepare
         coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList.dropLast(1)
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
-            flowOf(remoteList.mapToEntities(semester)),
-            flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
-            flowOf(remoteList.dropLast(1).mapToEntities(semester))
+            flowOf(remoteList.mapToEntities(semester, emptyList())),
+            flowOf(remoteList.mapToEntities(semester, emptyList())), // after fetch end before save result
+            flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList()))
         )
         coEvery { attendanceDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { attendanceDb.deleteAll(any()) } just Runs
@@ -129,7 +134,7 @@ class AttendanceRepositoryTest {
         coVerify { attendanceDb.insertAll(match { it.isEmpty() }) }
         coVerify {
             attendanceDb.deleteAll(match {
-                it.size == 1 && it[0] == remoteList.mapToEntities(semester)[1]
+                it.size == 1 && it[0] == remoteList.mapToEntities(semester, emptyList())[1]
             })
         }
     }

From b16036774460ab500303ab7cb8093ee1584aa8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sat, 19 Nov 2022 08:52:35 +0100
Subject: [PATCH 179/429]  Add support for reversed student name mailbox
 matching  (#2051)

* Add support for reversed student name mailbox matching

* Add additional log stmt to mailbox matching in all mailbox load

* Revert changes in mapper
---
 .../github/wulkanowy/data/mappers/MessageMapper.kt   |  2 +-
 .../domain/messages/GetMailboxByStudentUseCase.kt    | 10 ++++++++++
 .../domain/GetMailboxByStudentUseCaseTest.kt         | 12 ++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 8825c574..87111dd4 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -6,7 +6,7 @@ import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
-fun List<SdkMessage>.mapToEntities(student: Student, mailbox: Mailbox?, allMailboxes: List<Mailbox>) = map {
+fun List<SdkMessage>.mapToEntities(student: Student, mailbox: Mailbox?, allMailboxes: List<Mailbox>): List<Message> = map {
     Message(
         messageGlobalKey = it.globalKey,
         mailboxKey = mailbox?.globalKey ?: allMailboxes.find { box ->
diff --git a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
index d96794e5..a696d9b2 100644
--- a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
+++ b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
@@ -21,6 +21,8 @@ class GetMailboxByStudentUseCase @Inject constructor(
             it.studentName.normalizeStudentName() == normalizedStudentName
         } ?: singleOrNull {
             it.studentName.getFirstAndLastPart() == normalizedStudentName.getFirstAndLastPart()
+        } ?: singleOrNull {
+            it.studentName.getReversedName() == normalizedStudentName
         } ?: singleOrNull {
             it.studentName.getUnauthorizedVersion() == normalizedStudentName
         }
@@ -43,6 +45,14 @@ class GetMailboxByStudentUseCase @Inject constructor(
         return endParts.joinToString(" ")
     }
 
+    private fun String.getReversedName(): String {
+        val parts = normalizeStudentName().split(" ")
+
+        return parts
+            .asReversed()
+            .joinToString(" ")
+    }
+
     private fun String.getUnauthorizedVersion(): String {
         return normalizeStudentName().split(" ")
             .joinToString(" ") {
diff --git a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
index 96a84a5a..02980026 100644
--- a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
@@ -64,6 +64,18 @@ class GetMailboxByStudentUseCaseTest {
         assertEquals(expectedMailbox, selectedMailbox)
     }
 
+    @Test
+    fun `get mailbox for user with reversed name`() = runTest {
+        val student = getStudentEntity(
+            userName = "Kowalski Jan",
+            studentName = "Jan Kowalski",
+        )
+        val expectedMailbox = getMailboxEntity("Kowalski Jan")
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(expectedMailbox)
+
+        assertEquals(expectedMailbox, systemUnderTest(student))
+    }
+
     @Test
     fun `get mailbox for unique non-authorized student`() = runTest {
         val student = getStudentEntity(

From 650cbd5a10f8d6e27242f7306daa546cab7ed4ad Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Sat, 19 Nov 2022 14:11:26 +0100
Subject: [PATCH 180/429] Add info about optional ads in README (#2054)

---
 README.cs.md | 2 +-
 README.de.md | 4 ++--
 README.en.md | 2 +-
 README.md    | 2 +-
 README.sk.md | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.cs.md b/README.cs.md
index 2b0dc12e..d3d4e255 100644
--- a/README.cs.md
+++ b/README.cs.md
@@ -34,7 +34,7 @@ Neoficiální klient deníku VULCAN UONET+ pro žáka a rodiče
 * podpora více účtů s možností přejmenování žáků
 * tmavý a černý (AMOLED) motiv
 * offline režim
-* žádné reklamy
+* volitelné reklamy na podporu projektu
 
 ## Stáhnout
 
diff --git a/README.de.md b/README.de.md
index 6df10ecd..853abd13 100644
--- a/README.de.md
+++ b/README.de.md
@@ -21,7 +21,7 @@ Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre
     * Prozentsatz der Anwesenheit
     * Prüfungen
     * Stundenplan
-    * Unterricht abgeschlossen
+    * abgeschlossene Unterrichtsstunden
     * Nachrichten
     * Hausaufgaben
     * Anmerkungen
@@ -34,7 +34,7 @@ Inoffizieller Android VULCAN UONET+ Registrierungsclient für Schüler und ihre
 * Unterstützung für mehrere Konten mit der Möglichkeit, den Namen des Schülers zu ändern
 * dunkles und schwarzes (AMOLED) Thema
 * Offline-Modus
-* keine Werbung
+* optionale Werbungen, die es uns ermöglichen das Projekt zu unterstützen
 
 ## Herunterladen
 
diff --git a/README.en.md b/README.en.md
index 417b74de..7877bf37 100644
--- a/README.en.md
+++ b/README.en.md
@@ -34,7 +34,7 @@ Unofficial android VULCAN UONET+ register client for both students and their par
 * support for multiple accounts with the ability to rename students 
 * dark and black (AMOLED) theme
 * offline mode
-* no ads
+* optional ads which allow to support the project
 
 ## Download
 
diff --git a/README.md b/README.md
index 75b6cfca..09480e7d 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 * obsługa wielu kont wraz z możliwością zmiany nazwy ucznia 
 * ciemny i czarny (AMOLED) motyw
 * tryb offline
-* brak reklam
+* opcjonalne reklamy umożliwiające wsparcie projektu
 
 ## Pobierz
 
diff --git a/README.sk.md b/README.sk.md
index 240f8835..64786556 100644
--- a/README.sk.md
+++ b/README.sk.md
@@ -34,7 +34,7 @@ Neoficiálny klient denníka VULCAN UONET+ pre žiaka a rodičov
 * podpora viacerých účtov s možnosťou premenovania žiakov
 * tmavý a čierny (AMOLED) motív
 * offline režim
-* žiadne reklamy
+* voliteľné reklamy na podporu projektu
 
 ## Stiahnuť
 

From fdce2cf477cc98d4035431e1419e046d1db6d2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sat, 19 Nov 2022 22:50:51 +0100
Subject: [PATCH 181/429] Improve error handling in horizontal tile on
 dashboard  (#2053)

---
 .../wulkanowy/data/mappers/MessageMapper.kt   |  10 +-
 .../data/repositories/MessageRepository.kt    |  14 +-
 .../ui/modules/dashboard/DashboardItem.kt     |  19 ++-
 .../modules/dashboard/DashboardPresenter.kt   |  82 ++++++-----
 .../dashboard/adapters/DashboardAdapter.kt    | 136 ++++++++++--------
 .../wulkanowy/utils/ContextExtension.kt       |   7 +
 app/src/main/res/drawable/ic_error_filled.xml |   9 ++
 .../item_dashboard_horizontal_group.xml       |  53 ++++++-
 8 files changed, 228 insertions(+), 102 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_error_filled.xml

diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 87111dd4..120eb183 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -6,12 +6,18 @@ import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 
-fun List<SdkMessage>.mapToEntities(student: Student, mailbox: Mailbox?, allMailboxes: List<Mailbox>): List<Message> = map {
+fun List<SdkMessage>.mapToEntities(
+    student: Student,
+    mailbox: Mailbox?,
+    allMailboxes: List<Mailbox>
+): List<Message> = map {
     Message(
         messageGlobalKey = it.globalKey,
         mailboxKey = mailbox?.globalKey ?: allMailboxes.find { box ->
             box.fullName == it.mailbox
-        }?.globalKey!!,
+        }?.globalKey.let { mailboxKey ->
+            requireNotNull(mailboxKey) { "Can't find ${it.mailbox} in $allMailboxes" }
+        },
         email = student.email,
         messageId = it.id,
         correspondents = it.correspondents,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index f8be4296..f95b8dbe 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.repositories
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
@@ -14,9 +14,7 @@ import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
-import io.github.wulkanowy.data.networkBoundResource
 import io.github.wulkanowy.data.pojos.MessageDraft
-import io.github.wulkanowy.data.toFirstResult
 import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
@@ -194,7 +192,9 @@ class MessageRepository @Inject constructor(
             it.isEmpty() || isExpired || forceRefresh
         },
         query = { mailboxDao.loadAll(student.email, student.symbol, student.schoolSymbol) },
-        fetch = { sdk.init(student).getMailboxes().mapToEntities(student) },
+        fetch = {
+            sdk.init(student).getMailboxes().mapToEntities(student)
+        },
         saveFetchResult = { old, new ->
             mailboxDao.deleteAll(old uniqueSubtract new)
             mailboxDao.insertAll(new uniqueSubtract old)
@@ -207,7 +207,11 @@ class MessageRepository @Inject constructor(
         val mailbox = getMailboxByStudentUseCase(student)
 
         return if (mailbox == null) {
-            getMailboxes(student, forceRefresh = true).toFirstResult()
+            getMailboxes(student, forceRefresh = true)
+                .onResourceError { throw it }
+                .onResourceSuccess { Timber.i("Found ${it.size} new mailboxes") }
+                .waitForResult()
+
             getMailboxByStudentUseCase(student)
         } else mailbox
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
index e220ae23..d019dea6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
@@ -33,18 +33,27 @@ sealed class DashboardItem(val type: Type) {
     }
 
     data class HorizontalGroup(
-        val unreadMessagesCount: Int? = null,
-        val attendancePercentage: Double? = null,
-        val luckyNumber: Int? = null,
+        val unreadMessagesCount: Cell<Int?>? = null,
+        val attendancePercentage: Cell<Double>? = null,
+        val luckyNumber: Cell<Int>? = null,
         override val error: Throwable? = null,
         override val isLoading: Boolean = false
     ) : DashboardItem(Type.HORIZONTAL_GROUP) {
 
+        data class Cell<T>(
+            val data: T?,
+            val error: Boolean,
+            val isLoading: Boolean,
+        ) {
+            val isHidden: Boolean
+                get() = data == null && !error && !isLoading
+        }
+
         override val isDataLoaded
-            get() = unreadMessagesCount != null || attendancePercentage != null || luckyNumber != null
+            get() = unreadMessagesCount?.isLoading == false || attendancePercentage?.isLoading == false || luckyNumber?.isLoading == false
 
         val isFullDataLoaded
-            get() = luckyNumber != -1 && attendancePercentage != -1.0 && unreadMessagesCount != -1
+            get() = luckyNumber?.isLoading != true && attendancePercentage?.isLoading != true && unreadMessagesCount?.isLoading != true
     }
 
     data class Grades(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index cb92b004..22b0d267 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -226,50 +226,71 @@ class DashboardPresenter @Inject constructor(
 
     private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) {
         flow {
-            val semester = semesterRepository.getCurrentSemester(student)
-            val mailbox = messageRepository.getMailboxByStudent(student)
             val selectedTiles = preferencesRepository.selectedDashboardTiles
-
             val flowSuccess = flowOf(Resource.Success(null))
+
             val luckyNumberFlow = luckyNumberRepository.getLuckyNumber(student, forceRefresh)
                 .mapResourceData {
                     it ?: LuckyNumber(0, LocalDate.now(), 0)
                 }
+                .onResourceError { errorHandler.dispatch(it) }
                 .takeIf { DashboardItem.Tile.LUCKY_NUMBER in selectedTiles } ?: flowSuccess
 
-            val messageFLow = messageRepository.getMessages(
-                student = student,
-                mailbox = mailbox,
-                folder = MessageFolder.RECEIVED,
-                forceRefresh = forceRefresh
-            ).takeIf { DashboardItem.Tile.MESSAGES in selectedTiles } ?: flowSuccess
+            val messageFLow = flatResourceFlow {
+                val mailbox = messageRepository.getMailboxByStudent(student)
 
-            val attendanceFlow = attendanceSummaryRepository.getAttendanceSummary(
-                student = student,
-                semester = semester,
-                subjectId = -1,
-                forceRefresh = forceRefresh
-            ).takeIf { DashboardItem.Tile.ATTENDANCE in selectedTiles } ?: flowSuccess
+                messageRepository.getMessages(
+                    student = student,
+                    mailbox = mailbox,
+                    folder = MessageFolder.RECEIVED,
+                    forceRefresh = forceRefresh
+                )
+            }
+                .onResourceError { errorHandler.dispatch(it) }
+                .takeIf { DashboardItem.Tile.MESSAGES in selectedTiles } ?: flowSuccess
+
+            val attendanceFlow = flatResourceFlow {
+                val semester = semesterRepository.getCurrentSemester(student)
+                attendanceSummaryRepository.getAttendanceSummary(
+                    student = student,
+                    semester = semester,
+                    subjectId = -1,
+                    forceRefresh = forceRefresh
+                )
+            }
+                .onResourceError { errorHandler.dispatch(it) }
+                .takeIf { DashboardItem.Tile.ATTENDANCE in selectedTiles } ?: flowSuccess
 
             emitAll(
                 combine(
-                    luckyNumberFlow,
-                    messageFLow,
-                    attendanceFlow
+                    flow = luckyNumberFlow,
+                    flow2 = messageFLow,
+                    flow3 = attendanceFlow,
                 ) { luckyNumberResource, messageResource, attendanceResource ->
                     val resList = listOf(luckyNumberResource, messageResource, attendanceResource)
-                    resList.firstNotNullOfOrNull { it.errorOrNull }?.let { throw it }
-                    val isLoading = resList.any { it is Resource.Loading }
-
-                    val luckyNumber = luckyNumberResource.dataOrNull?.luckyNumber
-                    val messageCount = messageResource.dataOrNull?.count { it.unread }
-                    val attendancePercentage = attendanceResource.dataOrNull?.calculatePercentage()
 
                     DashboardItem.HorizontalGroup(
-                        isLoading = isLoading,
-                        attendancePercentage = if (attendancePercentage == 0.0 && isLoading) -1.0 else attendancePercentage,
-                        unreadMessagesCount = if (messageCount == 0 && isLoading) -1 else messageCount,
-                        luckyNumber = if (luckyNumber == 0 && isLoading) -1 else luckyNumber
+                        isLoading = resList.any { it is Resource.Loading },
+                        error = resList.map { it.errorOrNull }.let { errors ->
+                            if (errors.all { it != null }) {
+                                errors.firstOrNull()
+                            } else null
+                        },
+                        attendancePercentage = DashboardItem.HorizontalGroup.Cell(
+                            data = attendanceResource.dataOrNull?.calculatePercentage(),
+                            error = attendanceResource.errorOrNull != null,
+                            isLoading = attendanceResource is Resource.Loading,
+                        ),
+                        unreadMessagesCount = DashboardItem.HorizontalGroup.Cell(
+                            data = messageResource.dataOrNull?.count { it.unread },
+                            error = messageResource.errorOrNull != null,
+                            isLoading = messageResource is Resource.Loading,
+                        ),
+                        luckyNumber = DashboardItem.HorizontalGroup.Cell(
+                            data = luckyNumberResource.dataOrNull?.luckyNumber,
+                            error = luckyNumberResource.errorOrNull != null,
+                            isLoading = luckyNumberResource is Resource.Loading,
+                        )
                     )
                 })
         }
@@ -280,11 +301,8 @@ class DashboardPresenter @Inject constructor(
 
                 if (it.isLoading) {
                     Timber.i("Loading horizontal group data started")
-
-                    if (it.isFullDataLoaded) {
-                        firstLoadedItemList += DashboardItem.Type.HORIZONTAL_GROUP
-                    }
                 } else {
+                    firstLoadedItemList += DashboardItem.Type.HORIZONTAL_GROUP
                     Timber.i("Loading horizontal group result: Success")
                 }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
index a3c423a8..2c06e45f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
@@ -171,81 +171,105 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         position: Int
     ) {
         val item = items[position] as DashboardItem.HorizontalGroup
-        val unreadMessagesCount = item.unreadMessagesCount
-        val attendancePercentage = item.attendancePercentage
-        val luckyNumber = item.luckyNumber
-        val error = item.error
-        val isLoading = item.isLoading
-        val binding = horizontalGroupViewHolder.binding
-        val context = binding.root.context
         val isLoadingVisible =
-            (isLoading && !item.isDataLoaded) || (isLoading && !item.isFullDataLoaded)
+            (item.isLoading && !item.isDataLoaded) || (item.isLoading && !item.isFullDataLoaded)
+        val isWideErrorShow = isLoadingVisible || item.error != null
+
+        with(horizontalGroupViewHolder.binding) {
+            dashboardHorizontalGroupItemInfoContainer.isVisible = isWideErrorShow
+            dashboardHorizontalGroupItemInfoProgress.isVisible = isLoadingVisible
+            dashboardHorizontalGroupItemInfoErrorText.isVisible = item.error != null
+
+            bindLuckyNumber(item, isWideErrorShow)
+            bindMessages(item, isWideErrorShow)
+            bindAttendance(item, isWideErrorShow)
+        }
+    }
+
+    private fun ItemDashboardHorizontalGroupBinding.bindLuckyNumber(
+        item: DashboardItem.HorizontalGroup,
+        isWideErrorShow: Boolean
+    ) {
+        with(dashboardHorizontalGroupItemLuckyValue) {
+            isVisible = item.luckyNumber?.error != true
+            text = if (item.luckyNumber?.data == 0) {
+                context.getString(R.string.dashboard_horizontal_group_no_data)
+            } else item.luckyNumber?.data?.toString()
+        }
+        dashboardHorizontalGroupItemLuckyError.isVisible = item.luckyNumber?.error == true
+        with(dashboardHorizontalGroupItemLuckyContainer) {
+            isVisible = item.luckyNumber?.isHidden == false && !isWideErrorShow
+            setOnClickListener { onLuckyNumberTileClickListener() }
+
+            val isAttendanceHidden = item.attendancePercentage?.isHidden == true
+            val isMessagesHidden = item.unreadMessagesCount?.isHidden == true
+            val isLuckyNumberHidden = item.luckyNumber?.isHidden == true
+
+            updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                updateMarginsRelative(
+                    end = if (isAttendanceHidden && isMessagesHidden && !isLuckyNumberHidden) {
+                        0
+                    } else context.dpToPx(8f).toInt()
+                )
+            }
+        }
+    }
+
+    private fun ItemDashboardHorizontalGroupBinding.bindMessages(
+        item: DashboardItem.HorizontalGroup,
+        isWideErrorShow: Boolean
+    ) {
+        dashboardHorizontalGroupItemMessageError.isVisible = item.unreadMessagesCount?.error == true
+        with(dashboardHorizontalGroupItemMessageValue) {
+            isVisible = item.unreadMessagesCount?.error != true
+            text = item.unreadMessagesCount?.data.toString()
+        }
+        with(dashboardHorizontalGroupItemMessageContainer) {
+            isVisible = item.unreadMessagesCount?.isHidden == false && !isWideErrorShow
+            setOnClickListener { onMessageTileClickListener() }
+        }
+    }
+
+    private fun ItemDashboardHorizontalGroupBinding.bindAttendance(
+        item: DashboardItem.HorizontalGroup,
+        isWideErrorShow: Boolean
+    ) {
+        val attendancePercentage = item.attendancePercentage?.data
         val attendanceColor = when {
             attendancePercentage == null || attendancePercentage == .0 -> {
-                context.getThemeAttrColor(R.attr.colorOnSurface)
+                root.context.getThemeAttrColor(R.attr.colorOnSurface)
             }
             attendancePercentage <= ATTENDANCE_SECOND_WARNING_THRESHOLD -> {
-                context.getThemeAttrColor(R.attr.colorPrimary)
+                root.context.getThemeAttrColor(R.attr.colorPrimary)
             }
             attendancePercentage <= ATTENDANCE_FIRST_WARNING_THRESHOLD -> {
-                context.getThemeAttrColor(R.attr.colorTimetableChange)
+                root.context.getThemeAttrColor(R.attr.colorTimetableChange)
             }
-            else -> context.getThemeAttrColor(R.attr.colorOnSurface)
+            else -> root.context.getThemeAttrColor(R.attr.colorOnSurface)
         }
         val attendanceString = if (attendancePercentage == null || attendancePercentage == .0) {
-            context.getString(R.string.dashboard_horizontal_group_no_data)
+            root.context.getString(R.string.dashboard_horizontal_group_no_data)
         } else {
             "%.2f%%".format(attendancePercentage)
         }
 
-        with(binding.dashboardHorizontalGroupItemAttendanceValue) {
+        dashboardHorizontalGroupItemAttendanceError.isVisible =
+            item.attendancePercentage?.error == true
+        with(dashboardHorizontalGroupItemAttendanceValue) {
+            isVisible = item.attendancePercentage?.error != true
             text = attendanceString
             setTextColor(attendanceColor)
         }
-
-        with(binding) {
-            dashboardHorizontalGroupItemMessageValue.text = unreadMessagesCount.toString()
-            dashboardHorizontalGroupItemLuckyValue.text = if (luckyNumber == 0) {
-                context.getString(R.string.dashboard_horizontal_group_no_data)
-            } else luckyNumber?.toString()
-
-            dashboardHorizontalGroupItemInfoContainer.isVisible = error != null || isLoadingVisible
-            dashboardHorizontalGroupItemInfoProgress.isVisible = isLoadingVisible
-            dashboardHorizontalGroupItemInfoErrorText.isVisible = error != null
-
-            with(dashboardHorizontalGroupItemLuckyContainer) {
-                isVisible = luckyNumber != null && luckyNumber != -1 && !isLoadingVisible
-                setOnClickListener { onLuckyNumberTileClickListener() }
-
-                updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                    updateMarginsRelative(
-                        end = if (attendancePercentage == null && unreadMessagesCount == null && luckyNumber != null) {
-                            0
-                        } else {
-                            context.dpToPx(8f).toInt()
-                        }
-                    )
+        with(dashboardHorizontalGroupItemAttendanceContainer) {
+            isVisible = item.attendancePercentage?.isHidden == false && !isWideErrorShow
+            setOnClickListener { onAttendanceTileClickListener() }
+            updateLayoutParams<ConstraintLayout.LayoutParams> {
+                matchConstraintPercentWidth = when {
+                    item.luckyNumber?.isHidden == true && item.unreadMessagesCount?.isHidden == true -> 1.0f
+                    item.luckyNumber?.isHidden == true || item.unreadMessagesCount?.isHidden == true -> 0.5f
+                    else -> 0.4f
                 }
             }
-
-            with(dashboardHorizontalGroupItemAttendanceContainer) {
-                isVisible =
-                    attendancePercentage != null && attendancePercentage != -1.0 && !isLoadingVisible
-                updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    matchConstraintPercentWidth = when {
-                        luckyNumber == null && unreadMessagesCount == null -> 1.0f
-                        luckyNumber == null || unreadMessagesCount == null -> 0.5f
-                        else -> 0.4f
-                    }
-                }
-                setOnClickListener { onAttendanceTileClickListener() }
-            }
-
-            with(dashboardHorizontalGroupItemMessageContainer) {
-                isVisible =
-                    unreadMessagesCount != null && unreadMessagesCount != -1 && !isLoadingVisible
-                setOnClickListener { onMessageTileClickListener() }
-            }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index dd91d36d..cc4c5aaa 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -2,9 +2,11 @@ package io.github.wulkanowy.utils
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.*
 import android.text.TextPaint
 import android.util.DisplayMetrics.DENSITY_DEFAULT
+import android.widget.ImageView
 import androidx.annotation.*
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
@@ -12,6 +14,7 @@ import androidx.core.graphics.applyCanvas
 import androidx.core.graphics.drawable.RoundedBitmapDrawable
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.widget.ImageViewCompat
 
 
 @ColorInt
@@ -85,3 +88,7 @@ fun Context.createNameInitialsDrawable(
     return RoundedBitmapDrawableFactory.create(this.resources, bitmap)
         .apply { isCircular = true }
 }
+
+fun ImageView.setTint(@ColorInt color: Int) {
+    ImageViewCompat.setImageTintList(this, ColorStateList.valueOf(color))
+}
diff --git a/app/src/main/res/drawable/ic_error_filled.xml b/app/src/main/res/drawable/ic_error_filled.xml
new file mode 100644
index 00000000..61b575dc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/item_dashboard_horizontal_group.xml b/app/src/main/res/layout/item_dashboard_horizontal_group.xml
index 1d43d511..0c59d1eb 100644
--- a/app/src/main/res/layout/item_dashboard_horizontal_group.xml
+++ b/app/src/main/res/layout/item_dashboard_horizontal_group.xml
@@ -37,9 +37,25 @@
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_goneMarginEnd="16dp"
                 app:tint="?colorOnSurface"
                 tools:ignore="ContentDescription" />
 
+            <ImageView
+                android:id="@+id/dashboard_horizontal_group_item_lucky_error"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginEnd="-4dp"
+                android:layout_marginBottom="-4dp"
+                android:background="@drawable/ic_circle"
+                android:backgroundTint="?attr/colorSurface"
+                android:contentDescription="@string/error_unknown"
+                android:src="@drawable/ic_error_filled"
+                app:layout_constraintBottom_toBottomOf="@id/dashboard_horizontal_group_item_lucky_icon"
+                app:layout_constraintEnd_toEndOf="@id/dashboard_horizontal_group_item_lucky_icon"
+                app:tint="?colorError"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/dashboard_horizontal_group_item_lucky_value"
                 android:layout_width="wrap_content"
@@ -89,9 +105,25 @@
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_goneMarginEnd="16dp"
                 app:tint="?colorOnSurface"
                 tools:ignore="ContentDescription" />
 
+            <ImageView
+                android:id="@+id/dashboard_horizontal_group_item_message_error"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginEnd="-4dp"
+                android:layout_marginBottom="-4dp"
+                android:background="@drawable/ic_circle"
+                android:backgroundTint="?attr/colorSurface"
+                android:contentDescription="@string/error_unknown"
+                android:src="@drawable/ic_error_filled"
+                app:layout_constraintBottom_toBottomOf="@id/dashboard_horizontal_group_item_message_icon"
+                app:layout_constraintEnd_toEndOf="@id/dashboard_horizontal_group_item_message_icon"
+                app:tint="?colorError"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/dashboard_horizontal_group_item_message_value"
                 android:layout_width="wrap_content"
@@ -106,7 +138,8 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/dashboard_horizontal_group_item_message_icon"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="16" />
+                tools:text="16"
+                tools:visibility="visible" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 
@@ -145,9 +178,25 @@
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_goneMarginEnd="16dp"
                 app:tint="?colorOnSurface"
                 tools:ignore="ContentDescription" />
 
+            <ImageView
+                android:id="@+id/dashboard_horizontal_group_item_attendance_error"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginEnd="-4dp"
+                android:layout_marginBottom="-4dp"
+                android:background="@drawable/ic_circle"
+                android:backgroundTint="?attr/colorSurface"
+                android:contentDescription="@string/error_unknown"
+                android:src="@drawable/ic_error_filled"
+                app:layout_constraintBottom_toBottomOf="@id/dashboard_horizontal_group_item_attendance_icon"
+                app:layout_constraintEnd_toEndOf="@id/dashboard_horizontal_group_item_attendance_icon"
+                app:tint="?colorError"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/dashboard_horizontal_group_item_attendance_value"
                 android:layout_width="wrap_content"
@@ -211,4 +260,4 @@
             android:indeterminate="true"
             app:indicatorSize="28dp" />
     </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>

From 9c60ce688b48226e7ffe44f5029a89de8744f7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 20 Nov 2022 00:05:34 +0100
Subject: [PATCH 182/429] Version 1.8.1

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 62a5a21f..f6a82ad2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 115
-        versionName "1.8.0"
+        versionCode 116
+        versionName "1.8.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,7 +161,7 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.25d
+    userFraction = 0.10d
     updatePriority = 4
     enabled.set(false)
 }
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.8.0"
+    implementation "io.github.wulkanowy:sdk:1.8.1"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 996d5eeb..7b2fda86 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 1.8.0
+Wersja 1.8.1
 
 - naprawiliśmy liczenie średniej ucznia w ocenach klasy dla wykresu "Wszystkie"
 - zmieniliśmy kolejność przycisków akcji w podglądzie wiadomości

From 49e68f5c8bdc47d276268bbd4100d47be1490112 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 20:50:47 +0000
Subject: [PATCH 183/429] Bump agconnect-crash from 1.7.3.300 to 1.7.3.302
 (#2060)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f6a82ad2..a7c09c56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -250,7 +250,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:21.3.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.8.0.300'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.302'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From 890d60811b9e67dd905feff4366724474dc7065c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 20:51:07 +0000
Subject: [PATCH 184/429] Bump agcp from 1.7.3.301 to 1.7.3.302 (#2059)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e8e1052b..d09063fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'com.huawei.agconnect:agcp:1.7.3.301'
+        classpath 'com.huawei.agconnect:agcp:1.7.3.302'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"

From 85ce23845ff9498f11d053dea3babbcc17711ef6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Nov 2022 20:51:23 +0000
Subject: [PATCH 185/429] Bump firebase-bom from 31.0.3 to 31.1.0 (#2057)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a7c09c56..de3b4913 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.0.3')
+    playImplementation platform('com.google.firebase:firebase-bom:31.1.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From ae39bd94e5815b6807b60b8cbce366595b88dec3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 20:42:38 +0000
Subject: [PATCH 186/429] Bump hilt_version from 2.44.1 to 2.44.2 (#2058)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d09063fb..487e5f6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.7.21'
         about_libraries = '10.5.1'
-        hilt_version = "2.44.1"
+        hilt_version = "2.44.2"
     }
     repositories {
         mavenCentral()

From 9dc12204961c1a90df941f39136a4ba7e311ce60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:36:14 +0000
Subject: [PATCH 187/429] Bump about_libraries from 10.5.1 to 10.5.2 (#2066)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 487e5f6e..b219c831 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.7.21'
-        about_libraries = '10.5.1'
+        about_libraries = '10.5.2'
         hilt_version = "2.44.2"
     }
     repositories {

From 8f50ee82b3275d92fd45af6948e25287b02156d0 Mon Sep 17 00:00:00 2001
From: Patryk <43276401+Zaptyp@users.noreply.github.com>
Date: Mon, 28 Nov 2022 19:50:14 +0100
Subject: [PATCH 188/429] Change fakelog to https (#2063)

---
 app/src/main/res/values/api_hosts.xml            | 2 +-
 app/src/main/res/xml/network_security_config.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 8413d68e..e7373e11 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -40,7 +40,7 @@
         <item>https://vulcan.net.pl/?login</item>
         <item>https://vulcan.net.pl/?login</item>
         <item>https://vulcan.net.pl/?login</item>
-        <item>http://fakelog.cf/?email</item>
+        <item>https://fakelog.cf/?email</item>
     </string-array>
     <string-array name="hosts_symbols">
         <item>Default</item>
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index 84ff05a0..17fac4d1 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-<base-config cleartextTrafficPermitted="true"/>
   <debug-overrides>
     <trust-anchors>
       <certificates src="user" />

From 302d723cfbba95279142dd04197766f863b61e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 1 Dec 2022 18:14:28 +0100
Subject: [PATCH 189/429] Suppress menu deprecations (#2031)

---
 .../github/wulkanowy/ui/modules/account/AccountFragment.kt   | 1 +
 .../modules/account/accountdetails/AccountDetailsFragment.kt | 1 +
 .../wulkanowy/ui/modules/attendance/AttendanceFragment.kt    | 1 +
 .../wulkanowy/ui/modules/dashboard/DashboardFragment.kt      | 1 +
 .../ui/modules/debug/logviewer/LogViewerFragment.kt          | 5 ++---
 .../io/github/wulkanowy/ui/modules/grade/GradeFragment.kt    | 1 +
 .../ui/modules/grade/details/GradeDetailsFragment.kt         | 5 ++---
 .../ui/modules/message/preview/MessagePreviewFragment.kt     | 1 +
 .../wulkanowy/ui/modules/message/tab/MessageTabFragment.kt   | 2 ++
 .../wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt  | 1 +
 .../wulkanowy/ui/modules/timetable/TimetableFragment.kt      | 1 +
 11 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt
index 051c93c9..f115372a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountFragment.kt
@@ -34,6 +34,7 @@ class AccountFragment : BaseFragment<FragmentAccountBinding>(R.layout.fragment_a
 
     override val titleStringId = R.string.account_title
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
index c3137ec5..c6fe8a69 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
@@ -43,6 +43,7 @@ class AccountDetailsFragment :
             }
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index 6354b5e0..21f30b04 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -84,6 +84,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         }
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
index de0b4a6c..cd66d6c2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
@@ -61,6 +61,7 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
         fun newInstance() = DashboardFragment()
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerFragment.kt
index 1e11c874..929e7264 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerFragment.kt
@@ -1,9 +1,7 @@
 package io.github.wulkanowy.ui.modules.debug.logviewer
 
 import android.content.Intent
-import android.content.Intent.EXTRA_EMAIL
-import android.content.Intent.EXTRA_STREAM
-import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
+import android.content.Intent.*
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
@@ -36,6 +34,7 @@ class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragme
         fun newInstance() = LogViewerFragment()
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index 0a8561ee..15df47a1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -51,6 +51,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
 
     override val currentPageIndex get() = binding.gradeViewPager.currentItem
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index 81f3226a..23d767a6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -5,9 +5,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
+import android.view.View.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -42,6 +40,7 @@ class GradeDetailsFragment :
     override val isViewEmpty
         get() = gradeDetailsAdapter.itemCount == 0
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 2a5523f4..8c6b0402 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -73,6 +73,7 @@ class MessagePreviewFragment :
         }
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 5d608ad3..eddb4324 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -86,6 +86,7 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         }
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
@@ -135,6 +136,7 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         }
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.action_menu_message_tab, menu)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
index 361a5944..6ff7a39b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
@@ -65,6 +65,7 @@ class StudentInfoFragment :
             }
     }
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index fdd4afac..6fd12632 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -51,6 +51,7 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)

From 429fdfa4a0380bb520e116e0112c01c524f5de1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Dec 2022 19:02:25 +0100
Subject: [PATCH 190/429] Update project to Android SDK 33 (#2011)

---
 app/build.gradle                              |  14 ++--
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   3 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   5 --
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 4369 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 2798 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 6193 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 9606 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 13447 -> 0 bytes
 app/src/main/AndroidManifest.xml              |   8 +-
 .../github/wulkanowy/ui/base/ErrorDialog.kt   |   2 +-
 .../github/wulkanowy/ui/base/ThemeManager.kt  |  18 ++++-
 .../accountdetails/AccountDetailsFragment.kt  |  11 +--
 .../account/accountedit/AccountEditDialog.kt  |  13 ++--
 .../accountquick/AccountQuickDialog.kt        |  10 +--
 .../ui/modules/attendance/AttendanceDialog.kt |   8 +-
 .../ui/modules/conference/ConferenceDialog.kt |  10 +--
 .../wulkanowy/ui/modules/exam/ExamDialog.kt   |   8 +-
 .../grade/details/GradeDetailsDialog.kt       |  20 +++--
 .../statistics/GradeStatisticsFragment.kt     |   5 +-
 .../homework/details/HomeworkDetailsDialog.kt |   8 +-
 .../ui/modules/login/LoginActivity.kt         |  27 ++++++-
 .../login/recover/LoginRecoverFragment.kt     |   2 +-
 .../LoginStudentSelectFragment.kt             |   9 +--
 .../LoginStudentSelectPresenter.kt            |   2 +-
 .../studentselect/LoginStudentSelectView.kt   |   2 +-
 .../login/symbol/LoginSymbolFragment.kt       |   8 +-
 .../wulkanowy/ui/modules/main/MainActivity.kt |  13 +++-
 .../ui/modules/main/MainPresenter.kt          |   7 +-
 .../mailboxchooser/MailboxChooserDialog.kt    |   4 +-
 .../message/preview/MessagePreviewFragment.kt |  12 +--
 .../message/send/SendMessageActivity.kt       |   9 ++-
 .../modules/message/tab/MessageTabFragment.kt |  12 ++-
 .../wulkanowy/ui/modules/note/NoteDialog.kt   |  10 +--
 .../notifications/NotificationsFragment.kt    |  64 ++++++++++++++++
 .../SchoolAnnouncementDialog.kt               |  10 +--
 .../notifications/NotificationsFragment.kt    |  63 ++++++++++------
 .../notifications/NotificationsPresenter.kt   |  32 ++++++--
 .../notifications/NotificationsView.kt        |  10 ++-
 .../studentinfo/StudentInfoFragment.kt        |  22 +++---
 .../ui/modules/timetable/TimetableDialog.kt   |  14 ++--
 .../ui/modules/timetable/TimetableFragment.kt |   5 +-
 .../completed/CompletedLessonDialog.kt        |  10 +--
 .../github/wulkanowy/utils/BundleExtension.kt |  32 ++++++++
 .../io/github/wulkanowy/utils/IntentUtils.kt  |  21 ++++++
 .../ic_launcher_foreground_dev_mono.xml       |  20 +++++
 .../drawable/ic_launcher_foreground_mono.xml  |  12 +++
 .../res/layout/fragment_notifications.xml     |  69 ++++++++++++++++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   3 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   5 --
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 4025 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 2569 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 5740 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 8796 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 12531 -> 0 bytes
 app/src/main/res/values/strings.xml           |   5 ++
 .../main/res/xml/data_extraction_rules.xml    |  17 +++++
 .../LoginStudentSelectPresenterTest.kt        |   4 +-
 57 files changed, 496 insertions(+), 182 deletions(-)
 delete mode 100644 app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
 delete mode 100644 app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
 delete mode 100644 app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
 create mode 100644 app/src/main/res/drawable/ic_launcher_foreground_dev_mono.xml
 create mode 100644 app/src/main/res/drawable/ic_launcher_foreground_mono.xml
 create mode 100644 app/src/main/res/layout/fragment_notifications.xml
 delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png
 delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png
 delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 app/src/main/res/xml/data_extraction_rules.xml

diff --git a/app/build.gradle b/app/build.gradle
index de3b4913..cf7223ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,13 +16,13 @@ apply from: 'hooks.gradle'
 
 android {
     namespace 'io.github.wulkanowy'
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 116
         versionName "1.8.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -193,9 +193,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.8.0"
+    implementation "androidx.core:core-ktx:1.9.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
-    implementation "androidx.activity:activity-ktx:1.5.1"
+    implementation "androidx.activity:activity-ktx:1.6.1"
     implementation "androidx.appcompat:appcompat:1.5.1"
     implementation "androidx.fragment:fragment-ktx:1.5.4"
     implementation "androidx.annotation:annotation:1.5.0"
@@ -271,9 +271,9 @@ dependencies {
     testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
     kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
 
-    androidTestImplementation "androidx.test:core:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test:core:1.5.0"
+    androidTestImplementation "androidx.test:runner:1.5.1"
+    androidTestImplementation "androidx.test.ext:junit:1.1.4"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index 7dbec2cb..b7b756b9 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/colorPrimary" />
     <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
-</adaptive-icon>
\ No newline at end of file
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_dev_mono" />
+</adaptive-icon>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 7dbec2cb..00000000
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 81e723eccf63eb93c41506650615abaf157a8f93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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
Sp4|)#3=E#GelF{r5}E)q0tuu5

diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 394b5707650277a585ca2ea7cd3bf0d446e86a33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2798
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

diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 365b4d663a8eae4600393c92446ebcbb629b0d1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6193
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

diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 463c089b3e4df8c3a886cba98803ca235999570c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9606
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

diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 53d6f5bbdf0b974b55cca892794e00aafdd39502..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13447
zcmeAS@N?(olHy`uVBq!ia0y~yU^oE69Bd2>3_*8t*clj1{5)M8Ln>~)jb*P04wcsP
z@b-S0mzjCl%=eOstmmyJ9!6JJLD7N+9`QWZzejC<xH<@kFHp)m8qdgHeNwBs-zoEE
zu*0``t?NF||Nd-F!ECkMwAqF4KhIfyLG8QR_kHin@8!>V|Kq1;dx-}&WKkqwzrU*F
z%Kz2X-=z)2w&&kJFzw*|_TmRImt?2%ZD+G|*u5~)xSlUcJjQzm-@1dGN)w%}UY%JK
z&0N&5HDGn`jWw4~ZhP`<)r<XGqrdzT`||wkm*;C;tNzZF_+kD#miwXUm#r22_qvNC
zy!kpsE<F@l&E1{-(o|%{L6H?*hvv-Ti{7+ZUjNE#_Mm|OAxkcwU6w2=d;7)z|4Se1
z$Q~`3av{*qomIA_m+RYZp>MM`AFBQkci1xR@f?fo1-w<dF~Zlkec5?rbITW%rH9on
z6n~iUFL!^8T*Q>wv;7YKa0o2>rts@CzZKU@i*pP<tE5}adZf;Uo?92GQNwmPedqj1
zPR-{te(kjER5kK&-#YD{h{6wh2iJpNIkp~3X31W2ef~<e8KPfIpNbqvm6+}8ruZ-I
z=#89rdrLMHhldpZHO@IE(R{w=eBL{2Pvhni3EjmjmoA^RTX3pmu7dfC2#>~+OHHQi
z8s6ONnRhcaH%;A9^x<{EA_@EEN~bwT$`dZF<lPtTdq3W)=D^I<q6KlP>89$-O<7N|
zi<o4;+>yoR!*rud;zlfQiFGGqP=pf8zROWH?ls{Xi*w)2^Jt%bO6KGH2OdGEZ_Lkn
zu{6ygK5vR_9!Ets=fVBXqDB|q_q^|`PO#GU_;jK>m2b_Ru(|KH=~n%Xc;+!{>!*2a
z71|tu=blbFS#H-?-B_(Ok5Q%aiRwj}joZZMMDDGdxbpF<wF|a4@hsyreRozlDc-S5
zu5!nfn|C**YOsFi{&G-k#>Q`{^EC43Xin}CTz2aFvW8QO_f6qQoMiIJ;Q6%w@}5d;
zf7YsTsvrFHQ|ra*uac|IaYYyMALTSZ8Ce!Q_q;q;UC{A$=B1y^JPvH1&oR~L>X*2@
zi!ZA>-*0>(zhmK5cU#`tgwH+=@oJ3s^OUB{Jj3z1pnvJj1H62OAIhIRIkNf9bJL55
zn~qLD@P@}oB8{ake*MF^$Ma@ai(Lvl9k$<LeSJxH-2VG4KPDY5pKBuY&iI|>yS*mT
zS2kUH{{P;z$&-ELkIa9xqEElo=(R<QR-e@0&h*50lAi6|D(BPYu2bLp(OqTdW3x>!
zIOcV#bjGMu?g({^nRV|?zRJ$W^EP$#<yXFQkeNA|Pu*i)Z&dE<MQ`4mopiPQ_ss<f
zv0>MIC#e)IdZKyeT-~&LH@anhxK6rSe)|(wm{y%({Q7#oNiKX%@+-gVR{iBT`KtO}
zPQ&w%1=sukoId}at&^p!p*}P%O=YXrWuL5al?j!{G#;y*xc+k4`H<C%RfTRa{QJ|x
zGj+ujM)P2<{Hg^ikKDRXE&St}nVBiXxyB>!Y4+B$FM4mQzpQ=VA+#~w!|YYbZ}GI0
zEfXfCU2U;6e_gWu^6b*4#{DjnY~mh^Pcaah6ESV(%|NcnT?fu*pV9oW`@-xJPp19X
zCqKA!Y0Vn;iV26)Jry?n`O5X>*Y8MY4b4lBnFW=!io3;AQ*ECdH+V2vC1KWnxvhWZ
zs($z_$9XMSNaw_vnhWQb?6|o6KzzcB{>nh6{rQs;=7v>g_8nCJAS+bxA^*b5qL;oF
zYK`~HJsak)-g@h?@ukbrKUp|^9{s6SX%8>zS;?Zdddsca$yc&^!=H0jtSH_YCLOrq
z^4jSK^mz?Ar=_Ok{E1xJ_3;#wRiJfm)faF7X(|0CN0=i{ELVw`GSl*I|5d(9Uv9C$
z4sOBu{w{C#F6CKoazyg+r>{}EGuL0Nd8q!%?xC;XeDx!>=1bZ2d5xc5Nhu8zn>lsf
zz3bX@lKB3W&YWo;bYcGEqq&!u%O9RNXU22>3;U@D{A*5}vH3qe>h870o(E)S?hjoR
z@ayO&)w}PV9++gim3@8Z+t(xI>i6fHwB^6k`cDola7+pBmy>g6YjHOZ64E(y=8jE}
zTKAXFN7Q2099uq5p|)gKzRHJa{wHteT1|}ITQ$+v-`4fp*SFr^zP@(<X7f|!=FbPs
zDc-lYu`TGA^X2Q8aNKscRQ%@O6UtBiyt=yN%cs<!xG1kvr%$&Ah6Oo!>Bp(0i|eUa
z?=JtYq13>Vz0%$wda>l|;~Sm?{$sdZvoOvv?3(kWck3S}K7Tgpt*rGV=VtcFn=31y
zoLU$A<kiK+OP<`Z461tCW#Dygp6XF{{z=`^=95;p^GiGU9jr67pD!YB;c)8osh$Jo
z=6WKc6W1y<w*O>4ZESq<%9Sg2PLHm1-8H)F`Rht_bFN+KuI4+xyc5iY|7Blx+wd&>
z|KIIV4A#kWB6dz%^UXkWOQ+YuJzu^YwqJeq#*xMM6w1G|yIc<W%e1#{j!Lagf3B?6
zgw5Py6E<aEkKwE9(N_1L#9DsGF)T2kGN_IrC}WzNao`mB70<r~&ac_KuRX)qQuAK_
z#L3Rv?$j9H{QKeXllkWNMYdR$ROL3vKh~NW(*0uV^7NDmSLK|T_LUzt(rR6{WSQN=
zYk`V-wVyU^O458$?sdsM<z&=WrFQqeJ?rkjPM8v)UU|7)e$vV-lJj19sw4z1tdx|j
zcGH;JnWx<v@tfOY{=^`0_HQ5Z_Dsy#`_@d+Br+@}CjG(l$G2L!pL|&4ni9A^F2!o=
zs?|2_EU6w7&R)pa$9k+{wP?9cVV-8xwTO48AD*ez-{;|XewM0BUW-7gY;(NLx%c<|
z#qQMaKYl{drIm|kXXEL|Q%^-VZhe18RqM#(zX{LM=H~5Esr~Zg$d1CT&+go^?$e2M
zTDCpMb6Eu!=L~0`^u|h&Y~DY2RLu`;ssH=c>TdI-$KLzvUte4D=9K7mHv3~smEBL=
zm$jPUIfY>c=bc!-!uATosd<mDygL5(%$wga;i>1ox}8dKyz*=Pq&4<`|LI0enDqJi
z-FXbpzr9i1e0#e%#{tg=?~EDK7(;r_UCA)Bk(8Bvr2a}PNS*z1;#c!mU;VwV#rv0)
zy!G<yk&jPK+qTX<GE?*Bue0VUTz}8ZVUTzyC!6&4#z`S7?mrW!eKXo%u3>Dvz;EsU
z8E4KM`*Jw<%S*5GZ*mm()vsJ};_bnBr>8d;vT~p330tex7;huIW3!BtOUB-V;x|4y
z1qHPP=!A<0D(3yYo}T)1&)55P=WU;yy0<rv_fOEPDf1(?_pOmPXz<Ctc1GvN&l%5-
z88gmjWr=rK`ih_DT9r#j^nbgeN`<TcR@X-UR=!rBbxCDA+yBs4lh;(fH8q<1OMS9t
z!7AqcGg#hP35yuUC+v#ayOH-ZYgVaP!pt4NvX`9Tzj<}D`p&XHJEDajq}18XEIq9o
z#&|!3Z|7s51IkX7Uq1JmhIC(BzxB-qjd%AGCdb*IzOHQF-o{t@zTo-8!znL={crNr
zm6!K4?ldhCn=xbBwh2jw3$A@)iutX7`b<vpof)^<x2xNJe7!!8^Ur4MvI)M2+b940
ze$QJiJ@uw9LwRY>MA>7XPFB8rse1p!Q`u}?r6XIe@&2s(8-7VD-mBq$eYrQ2NT0+*
zffu%pe2mrF8avfjT>a0i7W<C9;H|yyN}nY>HUUS(jeZ+2^6|;MsPkNRclXJjYis9v
zG4PaY&t~{`!9OD{>ej>W!a`RLJlnjkhr^KRj>FdLo86vIw^Z3@Rc8Nh$L*B5z)v+L
zKZ`bPh&Er|d|&pd0Dq_6qWLe?mww_+xSV><fV(#7hxm(<;w78d&3NyZ2wQ&se!o=i
zvHi|W;mGgrc8dwe+|z1zIrkx{>#TzP;bqcaW7GaV&osGl`1PLk*88V=DOi=OUH6+)
z@aomtZg&1j+RObWPV%14a=Ndvs!k`@W`DlC<;Fy2ONY+z4<C=G)LmbflI6!YGbOd>
zzU1N9Mb55kLaOqrejS}y^i%i13hxwwVgso)m$U9q+hr3H`)<eor_((@+W)tR;cB#+
zE1P_L($Cmk6I%IgUBv8vttd?Je0=EL-IIHEzgIK9y>)fa>EPRkW1k3Y*fC|&|9Y*f
z1qoMPp8KGnRv&db#gVn@?<1wdtxNgxmw6g;-6-xBySZ14;acta_xmT$%)NC*b3?A=
zy8tuB^chlVMxJZq7I*dVh&nAgH^njL-<iPG`BR?we|0U4;BPn<rmp6*;g;pTk}n#O
zPIF&In&0<XcA>a}>&M-tIZe-5o&`vn*eE_UTYg$$+MlcqQLAgGo}AAW-~TUSv%tSI
zcXoyeJ~;I6Z%W$jZF1~2<%K<w<uAEJPW)XE!p9gkH%!6&Mb#JegvEa5&Ru__--|~~
zR&~ps^7elH`->0C*^f(j8oD&sg|8O>lrbSVMPR!9<EvRm)2_YrRdP7Xd{;p)|9+hA
z2Yop!mu+=_w|Y+s+xJX@dGZStb6efFC!&pJUduG<I6eQUq~u+fllq?juWxaC@NW0X
zt-;H+8vniM5>0u3q%-BV`F#$<YL}`#tUpS1+birZ{(SlJN%xc~%Nrxxvzr5A%};D#
zvQO9>_Iskpzb(0ie@?!<%$pc!)we!cy(IC2+kxHQH(54x>J=qVJ(b@OnQ(m}S76)^
zH}`~ne$&-k?Q?4sLfCTue+dpU$r71a{CuvN>Z*W)oQF6#^*s5m+Po-LXue>T>Xh|L
ztLx@5r_7dv4c1HkOaECBvP$J|{{0Ad`7=7w##<)8bUq_*GeahFTTjmakM2fqk4dXq
zrYx0jSo0y|75ko96Be+S$$nzKG5hcH3=`R#$I4u|>f`!<zOVe1S+sJ)ggJAJ+ePjb
zbsxQ+w}3x&+f<bwv(HKWURk1*x>jVO<T-g0k1oDQc|O-jm!HdvD*Y3-?`E!Zuyt!_
z5RHsn@BM3k)_?gp7WFCmHJ>;m<Ildne%*m-%~jW#hc8am_MGWyd30qHlhNu}YfY<^
zRvsp|K-phggDiP&q)Mzy5C5}&ucJL{Q0&*qOaA*Fnsen5_f~tJCA-yq6gIzPjtD>N
ze9XsS`Z<}1`PSQ$-6xg*|C@3$xqqUl{vHRj`frjuYu?N_8m9L8|L^$z@}Af@vx9#c
zre3N46}j}#Jf_A28)APld|SqrdGVs+6~;I{!3Cdg+*~`m&|hzg^7`7(z7G}8FPK)d
zx3#@z@4j<uqutldv2g72pR05<{Tzp^^t#wxA&=u2BObjt$yc~`imw6Fg5)C=TdSIN
zOiV7FXJk6?>-S>y-A@>1M{>HATC%G*=;$TP&TV7S=-sg;wcB~>qSe2?PyfUcW_2id
zh4P=2ni?sCKRUACtPU^=o6eg3!c*UibHk~}CP{yIX8b=hC-SM{`6Vg_rxdlS`2si}
zXIze1!#LyR!+i~_Ws~O#%wBmhMoMFHDO20q!j{*(lTI_gJl|IN@}=#Pr~PWb_SaS`
z{!)JN`BBoQUsuD=+C7<>qjn&zLj2mA!c(W#Z_VGUI@LEqkkiTSNAb=-mI*&ZXX=~?
zbDtrsP~e&NO#4z?yxQJ|HeTUx51w*gcplJx?UHkw%&m`aHv8Sye_)|{>B^m$l{t%k
zc?7U3IW7(k3Xqh_5NEVn8NwSFy4}dQxFzI&{*CkH{`2h)Ju7>}yYl<LpXpmA?`58y
zJz2S1+`9DP?_1mNue<uRUoO<_pwmK)&L3e5e+WvXMQrP3ILp)L{9)IcHTP?8G9D{)
zkNDjEZ~k?kLsL5b>o32ycUSxFFDKPm)o-q>{<kh(U*Pm@t`~EZ+Id(6zKQ&HT{(x9
z$5<!Yzu{fmFZn$y3-^WXc9_Aq<yKMrm0#}1dp7Ratt__u{EEb%Nf)2bx85)85-AyZ
zar^oZ*Qm2jl{yn;mItj}BEctWbZFZe;b)=?xa{|D=#6@7mB{u%k!is+d8>GaeID;-
zG!;D8-#<a~OJnHw0P(NyeD&mQUzG?g`0t;)#o^<T7Xlm&OCGaKU8QmD{QAxbg4<L@
zPH|lLaP-BCAHG(1&Egdqyk>mg|A}kojQR18w=KKALU_*_wx7x`qJ2)5h-qwgQK{Z;
zv-EoW&GqxIuTw8@;d5M@P<Up3*4KG@3m0l7+!SNFl3aMX?f=x1LFOODI^z5qbl={Z
z7(7`$dfSh*Tl`V04+mbW$@!YK{5;d~Yim}1zNYam!c6f*sk70Wg7-6K<Rsh_14r``
zr-ix~UiSTFV*IxM*DBxHk@^20vd@;&sQMFAv`NH?^XRJoe~zzKayq9m`@z3gTefTo
zKCh~>g>Bkzi9^4x2|iF2WBRM4xl+>hVr0C+fsga+w`Crms#^OiWa}5*D31N}d(Ue4
zIC}n%x5%1u`8)rybMNno2^L*3WDA?fJ8$8|IrWBm>ufjVh%@e+d^-A)aIDrBMy8lM
zTTU)BSd#f!E939q%gZ?H?Kju%4!EBG%i!S_xmou2cUs#8IqB9u;#?mWm$^Fm45xwj
z;+>zWa&p*ba~_Dh^P+m`C$(3B;?>rSpw_ddW%;?R3%NgEt=1B&`>5Q{vDc=uF5&F!
z^|Nbde6}tZTje;{v#I{`C!4CPGd9a6Cy1_kn&12Em9+2dd#pO;+ZCl_`j_@e|D7=D
zQeV^lBeyv>e1Exo?e+husZPdGmsNW*GBw_D|2qHWrP%dfdB4Bi*6NOv$y!$ZO()WA
zfAe<zE!)HR3YpIM`Rmte>%Egp_<8fk54USV3+&VnTxVm7`JBa+lFofnFMIZ_MM{^q
z=*geW^7hfPz4-b0``h{EzZIt2e(t%zcx$EL!qC+$N?v!>v;-GC`Fe_FLsqOqty*K#
zaSf4N%^&M4j2T<R+QMEH=|pMDSZ<p1XQq$*F+O8HlUuXa*F6>8%rCh5pkCw&J?kLl
z7QRdSE)*?QvrJKGa0~vE6?5nA0i($d*905(T2zD-6}>(i_l_n1^@YZmn|p7+dUv+F
z>dT6pzwh@>j}g%A73tqw|2OrTmU3Br+Uv08&sjI<EnMciq1KVFP`yH}v?)I8(i6Xg
zott%y8PpFP@9aEl{<<W6&rF6FPjYfIgifwGskW5=_P*ce7S%8%>X`1m+rDHr_cjlw
z>6!7F`%*Qnj&K_2>b|{mdE>_IH+>qu`7rIBK4HOf7K>MBD;u2UYZA78?#^{T%Fpoj
zjJ}LTz}w$CuFYnA($6NnowOmlM}1pF`7)VDof}qWW~$3~cV=?yY~SX}RLHbPMt=Ub
zz~#5!pJmxlR=-~Rcz^h-r=1z+p84CYEc|A%C4q5fmfJLk_1Cuu+?y9z^J~lX=d4*;
zvmY!K5Wf1V{(W~}UYaqZ)z6=bf?_r06%|GM!ggPc=4|-!|7q^+HB4ec5sxCQuRWW0
zd+X|B-xprx{Pj1au*JGm=o@3P>&h<&cNXv6W^-uPCQg9{sXQY))6(+Q$9gX}KK)i#
z*BB<;px?GoIc=}s_G{6c8&;RU*XoYZ>E&f+58L(d^}V{=Sq_Vy`%hg{Fx$+@aJF|@
zua2IWP~JWlhK<QOQ=GH6J_(<?YC@6)W5l^HpSd?oWhjtZ6uz0&@SX?5!r*36K7%>l
z9}kIJY*YXIc`ciYm$FYW`-Fh%e}68gMlXN&^Krk_b*+l*c?r5lwPro}w<aXX(T8Wl
z8G~F=#tFLF6Ea_{lisUjT)b!dIu2`3$0XhveLAsGFV&vgeqh-7<Nf|?;kj`;9Hz}W
zd1alv!GTm3i+yEl-E+4+Ut@UDKzNG&0-+DHr%ai7z~FEZ^J;I!3U`ZN##;KykB#$V
zMe^7FGuO?Yad)4sWv;i3{OaR%f46qI9y@2Syt^yLso`_=cd4jNzZDqOf|>rT3Y*;j
z<kS4d#J1Gg90ktmhs!2UylgV-`reJYTrvsSr{x)fE=%{;?#*FTG1~uvGfH)u?^3~A
zT8oYxnz{Oz!Rv%&p8}aeYNpTfiu3buXuflTPf##1XFm69&I@*GY?s}R<ZE3$+`|xe
zRU$k7{ysC+89u@Z5f6g0ymReUXD_|P;gT~U_=ZKv3WLp4Zf!7FzU#Ga{X5I~$_%oi
zlP}6fEnQWiW%tiDVMlKw+lF3-T{j|J8V|LfNZBs3VQ=H!m8OpjrFAX1?)gl&oVVei
z;IoBSW=#qy*x=YwT>Z_$hw1W>x&CJuUcP+#!!l^$j)MA-knn^VKN-vf7u01R4x5}9
zyJ+!5p4-oTCn{{wve}-}>6@_X(!U8&xr%~m&PJ~<O;k=RW_p&!@`Jr#lH&e1v94_%
z6ZpLreA<8M@=15Dqx)|jJQ%?*BbMKhac%oj^MKl^ijr*h3tqljv*xIRL*sOl<A?bA
z!oR)U%;|IE+?6kB`aAyDDSpoS`bu}z$FomaRw*BP6P+)b*0R~U{FYBkvUd2dIsfKQ
znHOgkw^)&R^5pBmZ`2qM7fDY_aAW$g&*4k@n@2r8@_RGu8NR&SF6zVn{LIQ*^XD^(
zSns+~B*##B%-8(ppMs5ZgqGfTzGh9#(}@cCar!x(49S--ow)7kIl1932Xh<q8^wnG
zhaT9P&zv;v8(Tk1WwUZk$`y^-Pmi4Roqfiwa6@sot`Wy(hNLeOLW<w-I=#$Q$79|@
z;~XioGfAA=Rz5NM8oMXv|6#^;Kg>+0e(CQ2&v7Hw?auu$rjBC9i}RN+DKT8f^O?#0
zM^4<lvn&D!O3vG+UH@?{L@;Yx%)?iq2WP#XYtp%<;$P*$#Vxui2UcyGWp!?$`b!~s
zt)6D)9*zsoy;42b&zNz%F?OosG4l_bw_2{7z-!jxq+D&9x#;xum*1+Im3w~FZxp?D
zdCpU_@a+C~{L5wU{A5-1{=#$X@9+0c^X0Qugbr<DPdmSEVoJf1TDN}z>_7ZpG1SkP
zQ?sJf<Am>lyjk<(JNB~da7^o9X<fV^BQ@+=OnyPj#YcONupJMz`P9y{vgq-}c^{;1
zYafWz<v$<zc3<`#i-lj6J~2<$4JmVSiwr*2*fDASi~sQ}|H)67(jv7WC1JX2L*9mV
zh6_HtH{Ftb)0Zx<f5KaLK#?mcy;XGK$&E9&Zv67|Q>sz@znV`s)8|j@xBqwJp<&I7
zfKO@X=Pl7^{lKjo9VYpI=ijnV7v1GUtNH%ywg1X|X7Byk$3E*ug?!1qx#`iyIWm_V
zSN@Tk!E2hZec@Wg3tkfyaw8&G_Po5v<(kj+FUbEJ^M%*{MY7{k-^;~5;t()fd-zfL
z!J^=x+8+<wpNPF$;<fnO@w4XlWBTUnMs3mX_Vj$oe#VIDh798>5zZjVtfr)Q-2CU`
z)?cmKA|K$Qd-SQS^&7PVimz<CjSsqqui0T|{pO~#T+IhZ&Yn__hO)P}CeE2N$5~KN
zFt_0*hqK7#`*BPheFi2XUzHZU*e@)ep5pWI$)y*$<#!Ul8@XKhyQb=Asxsp=`~Njd
zi`T~Po_5D~X&cKiE5`i}4YTuhb!Ke6WwY%6;v2K3v3)xszgW5F+^$y>CS?3F{<r<g
z6>~1z9R}~_o8K!~vu|E$MMH3>TgX(g{p%x@1sA;I2srqJKXCQcj{nEa^X^D+Co;V)
zZ19zR$WU2fq2yTjV$1CHm*;+Pkqo)9$I{X;bJAUw6Y@4UcAP8YRlQ`o?5`@*mA?xv
zEtlEskeByv=8YRS^bTarI9SfR;X32GC+tTgR=qr+@$=A`Ge74^@ZG(>US4x!@n)+p
z-yd>63Ot*cC)n-MuxqmYm-NWlX1NOWVSznbl3~);i~ei>WX#Z)O`j1YR3E(hzUygD
zf3Ehty?@JAhu6>aZdf=|xBt(9U&;qlxEb?yzcu@G$y<No^|<P_rz$=k6+dZw-p0A=
z+Z)fk<?}C3Yp=f^TRziv`PRqhtlyi=TV4D6+mlZ9c?SR9u3SD(s4o3&`pdh!w}0HL
zzvlzf&ac;^vxEPI82tP!X>jU^{{-b<_pk6j_}TDd`AVLs<yWiDtTSxAQY8QXsrc@>
z@oS!(dVTF|#A^Qd13AoVvN$d*^%gI>;iP}TJH%`565})X_Evkw#mPyU<w(4|vT|}L
z|NoQf^Gh^dUR&(We}Y|^@mRln{+p=1$;bH`6Rt58Dt_}%dmiihSGn%qtx5KlmX^y`
z{@E!m!OO|nne_3$w2W$lp}aumij@cYsx?2G%#xgKt0J|fKk9}NdsxK6Fm_J;$4X_~
zr#0THI!u*ppI86=-QAQ63mgxfdFaJdviQipiBcSD$}N$rX53vJWcAth(+OpkiBo4e
zRJ`B&ebVFO{nF>VpG0p?JL|DJY;Di;b*(SXC#lspTr_Zh^nY4Pz~U(n9z<M;sGmFO
z(<QaTZAbFvirn^-KcmVnHg~a3;>E-K($a}@*QAL{W^*zm_|CPO$|GwPBC*)5S4bzn
zuFlTVxmF~v@%(&y|6_f!-tTri=3C8CF!j_X`T9Q-Yrb9$591f$acHe+IQs6wLgt_0
zSKdB)y?(#i+1cjnC$hZX^SN&V>+|{2M-ElS`ZCS?!_+y|>uL3Yw1R?yIg20qcRvi6
zIe)%F^DOhMDVvqFv)gx@pSA7WXU(T$a{OQPic2C=i5J^*cCk0uvN#<3aku=wDN{@T
zwvf25i~D|MUCf(Q@wP)yStqN|kWnvalT-QZdDm|-3Nfs>yxiY>Uh&gYQ(4ZXmZ}^u
zRri^ZprZGV*>3%hI|_}f*Vw<C9k>3zyp+@}p&Kb5|2w3gobP4S(Kq3UTW`U{Df>fK
zUCa?Hum?4r4gVV%pIfDS_v(Z<k2=@iz2X&qo8`JA(+9=_zH=-BD`ey9A0A@8w7<T7
zbJ&%cEC(7?Yd@bgKPl?=McKWN<DBk4HlZzfcXypi-|>82^@(q9Z})D#{o>-{*6Xw8
z?M^*C&2KK}jh&|o?`_$#<$l9SH@2KMi{O7D6CF49N;@a3+KCGnU!S#RP4PR8W`$ZA
z%}Rk?J9F<wWwPG*_5I%JZPCq}IT{$bcZEI4(U078<f$=({Es!eZ?4)rX_C;Vf4|>L
z|4++Pb9nMX%h+Us;|FP-xwmH)aa@~!^q>Bbqen}b)tY&Q?ymf_+{;Ac&UyVk6BAbj
z`g(iM-gWZAge@hTn{VH?Hhxu{bxNfD^dxS(e>=SH)|bwen&Zj9b3*Y&W@FD4^NM#n
zpRbBY2p3=o%Gj1M_u!qK#oB-GPGR|=`Xl@M+uQ1U_V4;^?aXH=H1$zTWMm|FgR5Ho
zp}CTO4QGouHz^)_ka2=tMa5>9+iKn7<&h5_EO1<Mh4bsrh*ufA{)OM*Sv-xS;rm*V
zwdVgGw#&ENZ)UmEwX2CiV*UPqzrHSApzhCg-PoPU;zhO#Z(aSbm+Gs}y?^0zV6DAv
zcx6#hQGCM0Q}dUd^QyZ#LxkJZ;_wyqZ^7rUWK7!-x!{a!*WGnNcVA6;+m?1_#ikcZ
z?+>!;=H)%lVM<{5^5@U%Yin08IvVTB@I=vX!`c`@G1sKiUrc|<@Z0~{V3@@c&$@Zq
z*6SO})gH`@zr&pM_j({tmW0^iIaB|v+Gxhn*QTSvk-J>fSy*`f^34u&+g-X>xLWx-
zzFspm^2X`wCGTTPA{@#)ZYeQrT6OGO&vO6pU(yT=f8TO39oTh#w)y!P(|<gj9?!yl
z^GoUfrJGYYy$$k~+65o)lg-`LXKT#3{hvaDm)9xj0|@~E6V4p@S<1<%WqJ5Z)(Qb%
z7UuL!lhtO|KI#-?ya)&i^PO>Np6hGv6;D@hV)?XmdX8S}hUpCbcE2)~vdoN#XJ#m{
z=;eN}a;ckG<$(r9Q$B&^%d+b~9AtNUE@sI!&sc!}2m7C2^?yFL-+a+;?0I0VJ%`uY
z|7u-(dD;$2gj?<xo13`saae$W-a45{Gj5cphK0GtPW626(7fvJ@45RfpYqH4>0@o0
zuv@uU*E7bk;rF}U>o1x5Jbt~m>g%T0yAPgR`|{TJ%hgr0*3Lcl=F;Bk?^>IW7;f9i
zaiUXa(_Ujfr<vET{WW+SuQ>hmeWq_KzWOK4jGu0~f7+af500@td&s=R-_tvKOXGQ_
ztrCJ-OTsQ*Gi$%rce%Co(4vydkqo@6e7u!n92xfb*YJv*wrplNVH{ChyRrHA%jNUK
zensEkSKFH^%+4>j=F`nNw!$+q{$D-wOWp9b{2Q<5*OSsD5|?{4{|nkXYr=;cn|gY(
zXJ=m&*En-lw5+n^Xj-w2<hB**{+o3LeZPM%Vr5KdJ$n7XP8~spldBt<*|`Mg%wp5>
zU%S)J;k@yl)6;Z~y$pUZYg~R%Kie#K)`Q6wuc|}bnF8<pk5c+--MCYsnTfO9_1X1T
z6ExBot4b|v8aY?4oV>x5_x{rJS6OcSyx_d#hN$$}PPdEV@iXqe_$4pgep{5~#pUJx
zOE+;`-rvpnz(+meP4gV9(o-A$zG`G{QaSv-P}XJXj`xg@EML!>w#Zq5VM&mi+p!q2
zpA%=V{Jq|ksUSVVhFfFz@gsLk;}=`@ZCJ57yQOQzQA_<*vkR{}FwWU|_quq=+bB(y
zS6obczTc}p_F3MxYRffFg>$Y6Z4c*58*}K_Ig74Xdr>~ShRII2BfGAssL0RN)z$XE
zmi;$=nXmBuFuTpAb?=cRW@gbZ>9@kUj;?q*b7q@tYRnS>=U+1a-Wa!^nzL5+#<P;Z
ze!0-}#y2?&?K<ASdX&SYu*fJbq<%}u%S%z}498{|Cih&QVN<#3!)|}OpGSV|KH4pQ
zTlDY7Fusqh`a9Y#U3jm)Ht}$qMs;7>4ek}Wuk+7|b95W!xUb~-_Winl=xXzIi-S&t
zstQf8yME)!n^%nX2QHn{dm-BObkaHnhOlf=5fO>SIvTUraWf@c<hlM!qp!J?P4ee+
zDWjB*%j+|RWVKrBC(fL?^XmQk`z2TZoWAjd|Jv;O;>`^AgDtwwGhI=9H+lNRKqU`F
zb?YP1x3{Z5&&~0Ccj7?agcA(WukP=k8s))o@Fq*cx@Uo6C*<R%M&4#|D18-nv8`c3
zYCE5-(Uk7X?^&95F#Wl5^QcDqW8bCzoTW7v-)QMxXxOMR`Go&mfdyW14iUZi2^qi2
zH8uC^G>a51bM{F+KJnsWS*_x2>9z%>v9k@i6OLD;3o$&uxwClr$KnNU^4B)#aWr)B
z8y&0>W00)aX`<vD;qh3BDWrkn$|vEeUSGuxj&|L9lx6)cKi7q0=8h8_&N*hLx9;1Q
zZ;INR+Uv+=scPOZ_pWzjYf3IpN&Sr6G=GN6kqZ)j6f759Q2hLyQ%fr|-&V6}ho)_H
zWZ==cW1s(Q-(vPvtJm27ja;^P#=-~pU6=ZECv=(a=}L)My>-X_t(zSfRv*t0y1YSg
z#;TXn;@8vjs;WM^sk^iae6>{e+Pk|dA^n7C?Qf}S#?al>+<$YpkM(ZuW+-@<;3{A7
zfYE4<5U1)<nLirM$CyNmOD&eM9C%cvlhmHFu`I%B{mzUFd6Va62B=-!njJpfQ(mjO
z!)@`-TT47Ai#Mpg`mt=&*L{1Q9oJn`Kh-NxY*v=kr40+EZtl_#4sz39qOj1|VW)Dc
zkn7qg&feUIQx^Fy)MlR*_jb0;&QsS`Ts_NVU-sI~s`FM)$aXb}&8(X?N@!R)uPFTg
z@9&}eJBm5)+E;vdkmabQ#?W=?LNDW{BexQLeFfw@7&<vORDModD03+El6v#K>rb9M
zncuLmjZMci^#<3f?hVV&@)hn#+;xck`rm1@cJcgkXlxEz(Gazk_lnl~y0@m&`&>h^
zKKcn<>zjDRe&=B)vCGre32b;`oPJJ)-}XyDZ^FjyB2D}$t+^8&Yi6o-bbVN{`SARh
zUnv)>*N12YzFLzmF=_YY$JxEkGFn@frv<I3jfh}>#V-@%yMM-F*{9cnnf~S~TVyBq
ztY~A%kZ$VoN(uI5SK+^QB`NI3qi+3{H`-4+O&c7)vlc(!Qg$O~KYwLA>+g#D+j4KW
zY~@(Tuz#Li^46$Y3lozsd1|!{3nSWAw!KrUJ!5$!NmE4r?uJCEWgD*x3C)|o@?y+Q
zhq+1ae;FqvOcT9zCzhi@%P*tm%C{MO6PmYw+aPMv(LdXI`PReJIQR}tjL>NQelXB|
z(J9eg_PV-jEff_WnyS@aa`Bek`DNw%=f~VdHCvXrdN?p-nQyY2blQHIpW)3HEq@&B
zWH;aKV7V&Tz@IMCQ+fNrgX8B*x_Xx^S)$)Km4P`eWu8Lqs>x1HAsk1G7~7cC-e&Bq
z`BU@Dm3xKrn-{kj%O^Qs6JS_b+sP8jHs>DKk>5{?eu^Zti0)q6vB)k@zjl@OG-08X
zg>5QqlO%t=pL(jbvV%u*QVQS11ZLTH3hiqY8RXAR;g`$%+j~;4)oEi>lJaezL)sT)
z7u#*~P*l-XYFW1QjQj+4)~!;jgP!U?o2bYxoTA_ud!A+f<?{v0d0$5x3h!9dapo{v
z{|^yXR@SYi7yk;Xaq9OgHSFvPJSg8`l(GBFw!}o)f6Ig3M!ixIa^SnV)c=EU={xJ~
zx!ISQ^5v&Hr$$ws57D~1ucM>G?*Plyzb}>U#xI{bZ`~*M7S$;e85twaO}lET^=e<C
z)>Xx6${M9pSbmo3w6g_t-#d6rkA0sTlh`{Q*O|>xYwd(2C2#gx?tP@%C%5wV+K=oN
z-Cv*FXlT%}u(4HA-reu*Yx_t?=*rUMKk9$^?q7agKV`CWTePL!l6{92vN+kRepbxy
zb8HLzwad*}ZrbVor*1AbJUlKeEE$n={e{~mI{0%`-qLEVs8i@sHG49Lh5zWWZ@+w3
z+H5-F{bYiPPS2Mwo8+%#eex^%^zrtg!}6ky@p?s7M?e0ns*5Y?n42_D<*>M4XM#$F
zg4(j<>sPL94=~@-IqASfft9<Ta@N#@F#Nf{blIfxNt61v?9cnTIbw&g-;_6>zMFjr
z7ngKu4E9=ckn6>}C3XkTUojN>#1fUe)BGuCO`*?{WFuDlzmaxsOO^6fRNv-Gim{zt
zzxcs*!w=?P+dBH49|l^9`0|*$lqW|-wC9U<{jqH8DQsOVnOv?j`-A9*%k!UZ_!qA+
z^@-@roZ_gA7qJz`9{&5MQ4~C*#hQ7K?4M_c79Y%MY<6H;#$M{%)D%^(I$eL3<J_gZ
zHIBV1?Ka$hLO%WR?7hLk_3yumicUWVSC;aoKQezN@-W*m*A;hX98od&#q#gpznzCC
zPgeKw^j2P>bob5D&?Wa?z3E$iEPIEO<2+xF87=9WMHRtk8ve7zGu4->2-GwkyY4yR
zZ(h(P_5I72#XaOScK^dvt~vWd(n)2D-S#W5rfi6b`;(FLM#IM0=Jc_;x=5w7?>|4-
z?!xp=;`B@2(;NvZ6=r(t<V*Yb59r@;;e2r7+nRR)W)II+$)9_7+tah%%H93@@y&;g
zc?`aMoYE~5$NA@~#W5R~S$8g+*XQLE-aGNvoeLNG;+HJZ5%*TAPG{Eie^9g9zR_!*
z|H>zoo@&uk<)o_2=SA*lWRRNn<k3PuxwjJ!#Pf1iZ1Q<wa8O2FcJE5d|Gqwds^)l=
zN?u*UY8AV4?`Fq+D(!QUzN%ktd~)r<lP9NZXPNz-_p<ign`N8QB~H&<>EB{Ccd8C|
za;f4A#+6)Yf=Uw>r2CwioGj9%8~ie-VVibqRqaaK&5chaZs&j1{NSDV)m>}qldngP
z<jN{5&p){NpfQ)(l`pIRtjmuReD>B;FMNtG%ceydUm8TVB`>OTOxxfnl*<0|_jZX%
zQ@-pkyy6(w@W$|)&Nk(Ag_DZ28_sXF`)OwyT2L~-w_o0WzN@y4FjtN3RGXPPXJ#Il
z7u(^P+s{%b?Qvnk)T5s`1Z6Z$zjG%PR=K*{|6Lliv(RWRZ&*Nf-`8W?PAO^nCxp6*
zAJG5b8&!McTm0mcTvl!_HvQ=bzV5sKm5<Nn(&ZVp&YXYBCOOC`a-~NFO>p5@{qbf)
z-?R58QsV!u2$7rZDSyGLSx0Mgs@sGo0j3vaUp@IZah{*s>W~zNqE8#$A3Zv@AbR$R
zSLvN9{yNoRk39NW>evr2xuee^>Zx>O%H<=Q9cO>|pm%uE<mG=>g~cCw^qbd5EYh20
zWzHdns=$cNfAp*5_b)9<?}({;`Lm_v<;{l=zjv;&^OCxBWAlSa>LE+MFZJl>{?l|!
zXPV4$B_6F8=L!xxAIzEHJ@?6SyQ!ze`@>gzKQmT}uvY%DN@i9@(nrRc7k~IgyCzLf
z-LzCzNqPR!y+>`2?M;h{KRVA*rdq96b#J`&q>gs4qnjJ8EEE_7J97M5>^5%v>%MHs
znwbm2rk`UL^jSKwRj+iPO8Xf``P9>gMY}Hj>+H<l?c%=wRHMJIl}dkKX6?qS{KBGJ
zJSQ!m=Ct(D&4%A>UcXo_J(OmV_GpM)DB0nV-jce1*)p;7i|m-V=Z1w$a#u_F@N5%j
z@XY2(sVycGkIK%P6!fRa=}-~dpR|~F25b9GcY95|CLUd@c_gxZGh<1*NVlDeapV-i
zJcY)2wny&BUA*Ye@9Q<oaqiRL6N(9v&(tQ)S9l`i;__kHrq0esXLOnE>i*kT$p@^n
z@zAsX>s0gS3}0JC-8zrw&o>0IiSFL+dvh<})HQW?Cmk?}Ii>7sn3LsZp*Qs>`_zsC
z?}{IP-=9jkUpsTsrpNqScggS>&lc?w>YSWt`*-j1Uo4>x{;GUizp-4CGkPA}y6DZ?
zCr{@3o96y<*4wMDcHn%PmHpJar&-GKD_f46?9pu8-<QrD9C^j%i9Cl3N19l#u%e2_
zinGFnh53BGe)B%>4XR8L+S=x^YNLUc=B3xIGaJtdJ>ATsJ^Ki!V*iFulX;u}_<8nC
zYMsc%Dmi0L&64<<KXcX@8s@i}WL#)t-Y+P-C?#x_$8&Q-<#LtP@0U$n#30tjE%=k&
z$WHl(p}b;`by*LOu9DKbzy6n(Ik%sF%55q6z+(L(Ar2!=`M$!mWeKj8PahvSwP3aI
zhS^aSY*i1xuQ=(h!oHw>e$&6ynK_B)Z`|NFc6Qp;v8LASo$H2$qLsT&JUZ=ifIsoO
zi9^?iias49Ri^oZlV;BI<u=nfe_GJ;41;Ul>JK0EY9Bvh<Ms5K^>?b%#_F1^S5IF~
z5zsikOhLJ0ijSD9-v{B>aq7#KhbtaCvMOOK=bfo;RaLC(3@2t+2p@31wLnasb9H}k
zkly~;Q?~4mcRKW@eU^#jB3{myr{+X4{y2F3@JuVQ)6b>s4{|;5e(*g(>4<?l-^c7L
zYgRmba*)Z)$eArNA>lXs;>Gjpebs)yI{f6xo{Lii=4(wA4`69qaq_%K!DEdN8~)@^
zTA1Px!EtVh`%jh0h8x=wfBian-JR8XyMseRt&Zwb^DBqy{p?Q{v_3k-z*Uj;^s`)d
zw{&s3%MtFv#>VZR-XC=I-+N8w|7#=nv+o>*cB>l-eb_snqc`%7RhMeP4jZ8~)`Q^-
z7#ejr@~>zd-*2QiD==W|erv5&{_l6}P&{vvYxOX6X3k6ND-&h3rqBNsv2e#HOJ%k>
zJ`<P&#ROOy{x+YLdzRMR$#X+N=!?~p)9b(NWw6|0eXcWuSM|PVOg6(_wROGc8Mysr
zf2%KgneH6f5pnOpDej{448M3LZhdZ~-gmd#pe$eILA9mej?HHdFMkxN80f=xFh0RZ
zb4{S~#`6=DH?29V%*1^A<%)Itl(kmHpPw;<U#`FV_pi#CIYMhb&hG5Y)^yx<z-qt#
zbom7j{+4HWo!Xelb@b#zP0i(Yi<tk*xz)Gt=UukGvVY&VyHB1d?b%+R^oXfyU8hBQ
z|BM+6WnY>qq#t5t&KGO64ga!}#aDll`AfA0{w5p0*~~dPH=6T@okNSX&Ka(WKL5=`
z&+>RZlgJAA!s^5k)WpPN?6Uav0pZC_{b@W)be*J3GNwz&+zAvGx)doc_AQ|-BI5g<
zW4+aPB*d;U|3CKrgZUn|^{GeG&bschy)N?RQ2GIXt?UVm><=OnXSLO)Ej@9`JoUcr
zrKYX>9hvsMckMm0*~!^Br6W;DvGHY!p<;_9(<IM`-8mY<4PSHR?yd;@T)^y5?8}jK
zIpfH=#^Q%_EVc){N@UnQ?PW#Y!=nxUN%JlHYT1J?n44_;78K$>OSETm(+r-2K1wad
zbI))Jo?qf()IC*u=8*tngDeSyjT`K{1zq|D&#<l8R`KEf=j(<Ihi9d4D9*gG^Xi)@
zud=r(-y$EmHuNXWx10hp)%#kU)fzSDh7;)zS{@j?m`oNe^hr`NFi<m0I3?*Jsx;}t
z#4MvD^}(CIFWFG6vbk7oQ?^O!^_)X?%-cW6e2BTs?y+DxpZm##K7pFHj3X(o9Lxz8
z#X5^643Z^0k|h%?1Ala+JO8o%w=3e?J&Ce)8fEVa%GL^$y>(OK&gc6e^kV5@%@hOG
z7Rw+OBLlY1w4P&1lUlmc1d5yg+q!(&mmqke`G)D4#=9~PR4;hDubp^kio_h5e@c^B
zI!+|zb;K*z<uh|TOh2F}o9E8q{bWUcqs}vj*!@xyyc^0NeXK9v%*U|dZmtLe0|SGn
LtDnm{r-UW|a(mpD

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7835db90..3773093b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <queries>
         <intent>
@@ -36,13 +37,14 @@
     <application
         android:name=".WulkanowyApp"
         android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
         android:theme="@style/WulkanowyTheme"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="DataExtractionRules,UnusedAttribute">
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:exported="true"
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index e979fa8a..fe0e6469 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -37,7 +37,7 @@ class ErrorDialog : DialogFragment() {
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val error = requireArguments().getSerializable(ARGUMENT_KEY) as Throwable
+        val error = requireArguments().serializable<Throwable>(ARGUMENT_KEY)
 
         val binding = DialogErrorBinding.inflate(layoutInflater)
         binding.bindErrorDetails(error)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
index 2d83bbbf..e1c23457 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -1,6 +1,9 @@
 package io.github.wulkanowy.ui.base
 
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
 import android.content.pm.PackageManager.GET_ACTIVITIES
+import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
@@ -41,9 +44,8 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
         )
     }
 
-    private fun isThemeApplicable(activity: AppCompatActivity) =
-        activity.packageManager
-            .getPackageInfo(activity.packageName, GET_ACTIVITIES)
+    private fun isThemeApplicable(activity: AppCompatActivity): Boolean =
+        getPackageInfo(activity)
             .activities
             .singleOrNull { it.name == activity::class.java.canonicalName }
             ?.theme
@@ -52,4 +54,14 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
                     || it == R.style.WulkanowyTheme_Login || it == R.style.WulkanowyTheme_Login_Black
                     || it == R.style.WulkanowyTheme_MessageSend || it == R.style.WulkanowyTheme_MessageSend_Black
             }
+
+    @Suppress("DEPRECATION")
+    private fun getPackageInfo(activity: AppCompatActivity): PackageInfo {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            activity.packageManager.getPackageInfo(
+                activity.packageName,
+                PackageManager.PackageInfoFlags.of(GET_ACTIVITIES.toLong())
+            )
+        } else activity.packageManager.getPackageInfo(activity.packageName, GET_ACTIVITIES)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
index c6fe8a69..41b97b07 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
@@ -6,6 +6,7 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
 import androidx.core.view.get
 import androidx.core.view.isVisible
 import dagger.hilt.android.AndroidEntryPoint
@@ -21,6 +22,7 @@ import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoFragment
 import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
 import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.nickOrName
+import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -37,10 +39,9 @@ class AccountDetailsFragment :
 
         private const val ARGUMENT_KEY = "Data"
 
-        fun newInstance(student: Student) =
-            AccountDetailsFragment().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, student) }
-            }
+        fun newInstance(student: Student) = AccountDetailsFragment().apply {
+            arguments = bundleOf(ARGUMENT_KEY to student)
+        }
     }
 
     @Suppress("DEPRECATION")
@@ -52,7 +53,7 @@ class AccountDetailsFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentAccountDetailsBinding.bind(view)
-        presenter.onAttachView(this, requireArguments()[ARGUMENT_KEY] as Student)
+        presenter.onAttachView(this, requireArguments().serializable(ARGUMENT_KEY))
     }
 
     override fun initView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
index 21a7a492..6e2bc8c4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.GridLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.DialogAccountEditBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -24,12 +26,9 @@ class AccountEditDialog : BaseDialogFragment<DialogAccountEditBinding>(), Accoun
 
         private const val ARGUMENT_KEY = "student_with_semesters"
 
-        fun newInstance(student: Student) =
-            AccountEditDialog().apply {
-                arguments = Bundle().apply {
-                    putSerializable(ARGUMENT_KEY, student)
-                }
-            }
+        fun newInstance(student: Student) = AccountEditDialog().apply {
+            arguments = bundleOf(ARGUMENT_KEY to student)
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -45,7 +44,7 @@ class AccountEditDialog : BaseDialogFragment<DialogAccountEditBinding>(), Accoun
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        presenter.onAttachView(this, requireArguments()[ARGUMENT_KEY] as Student)
+        presenter.onAttachView(this, requireArguments().serializable(ARGUMENT_KEY))
     }
 
     override fun initView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
index 4279102e..d23978f5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
@@ -13,6 +14,7 @@ import io.github.wulkanowy.ui.modules.account.AccountAdapter
 import io.github.wulkanowy.ui.modules.account.AccountFragment
 import io.github.wulkanowy.ui.modules.account.AccountItem
 import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -30,9 +32,7 @@ class AccountQuickDialog : BaseDialogFragment<DialogAccountQuickBinding>(), Acco
 
         fun newInstance(studentsWithSemesters: List<StudentWithSemesters>) =
             AccountQuickDialog().apply {
-                arguments = Bundle().apply {
-                    putSerializable(STUDENTS_ARGUMENT_KEY, studentsWithSemesters.toTypedArray())
-                }
+                arguments = bundleOf(STUDENTS_ARGUMENT_KEY to studentsWithSemesters.toTypedArray())
             }
     }
 
@@ -49,8 +49,8 @@ class AccountQuickDialog : BaseDialogFragment<DialogAccountQuickBinding>(), Acco
 
     @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val studentsWithSemesters =
-            (requireArguments()[STUDENTS_ARGUMENT_KEY] as Array<StudentWithSemesters>).toList()
+        val studentsWithSemesters = requireArguments()
+            .serializable<Array<StudentWithSemesters>>(STUDENTS_ARGUMENT_KEY).toList()
 
         presenter.onAttachView(this, studentsWithSemesters)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index 9b5c63e4..eab24f91 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.databinding.DialogAttendanceBinding
 import io.github.wulkanowy.utils.descriptionRes
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
 class AttendanceDialog : DialogFragment() {
@@ -22,16 +24,14 @@ class AttendanceDialog : DialogFragment() {
         private const val ARGUMENT_KEY = "Item"
 
         fun newInstance(exam: Attendance) = AttendanceDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            arguments = bundleOf(ARGUMENT_KEY to exam)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            attendance = getSerializable(ARGUMENT_KEY) as Attendance
-        }
+        attendance = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt
index 477b762b..7834b6e8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.data.db.entities.Conference
 import io.github.wulkanowy.databinding.DialogConferenceBinding
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
 class ConferenceDialog : DialogFragment() {
@@ -22,16 +24,14 @@ class ConferenceDialog : DialogFragment() {
         private const val ARGUMENT_KEY = "item"
 
         fun newInstance(conference: Conference) = ConferenceDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, conference) }
+            arguments = bundleOf(ARGUMENT_KEY to conference)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.let {
-            conference = it.getSerializable(ARGUMENT_KEY) as Conference
-        }
+        conference = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
@@ -57,4 +57,4 @@ class ConferenceDialog : DialogFragment() {
             conferenceDialogAgendaTitle.isVisible = conference.agenda.isNotBlank()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
index 41adc008..876b563f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
@@ -4,12 +4,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.databinding.DialogExamBinding
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.openCalendarEventAdd
+import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 import java.time.LocalTime
 
@@ -24,16 +26,14 @@ class ExamDialog : DialogFragment() {
         private const val ARGUMENT_KEY = "Item"
 
         fun newInstance(exam: Exam) = ExamDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+            arguments = bundleOf(ARGUMENT_KEY to exam)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            exam = getSerializable(ARGUMENT_KEY) as Exam
-        }
+        exam = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index 34594111..a1ef2ec5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
@@ -27,22 +28,19 @@ class GradeDetailsDialog : DialogFragment() {
 
         private const val COLOR_THEME_KEY = "Theme"
 
-        fun newInstance(grade: Grade, colorTheme: GradeColorTheme) =
-            GradeDetailsDialog().apply {
-                arguments = Bundle().apply {
-                    putSerializable(ARGUMENT_KEY, grade)
-                    putSerializable(COLOR_THEME_KEY, colorTheme)
-                }
-            }
+        fun newInstance(grade: Grade, colorTheme: GradeColorTheme) = GradeDetailsDialog().apply {
+            arguments = bundleOf(
+                ARGUMENT_KEY to grade,
+                COLOR_THEME_KEY to colorTheme
+            )
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            grade = getSerializable(ARGUMENT_KEY) as Grade
-            gradeColorTheme = getSerializable(COLOR_THEME_KEY) as GradeColorTheme
-        }
+        grade = requireArguments().serializable(ARGUMENT_KEY)
+        gradeColorTheme = requireArguments().serializable(COLOR_THEME_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
index 2af59c01..edc384c5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -15,6 +15,7 @@ import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.setOnItemSelectedListener
 import javax.inject.Inject
 
@@ -48,8 +49,8 @@ class GradeStatisticsFragment :
         messageContainer = binding.gradeStatisticsRecycler
         presenter.onAttachView(
             view = this,
-            type = savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? GradeStatisticsItem.DataType,
-            subjectName = savedInstanceState?.getSerializable(SAVED_SUBJECT_NAME) as? String,
+            type = savedInstanceState?.serializable(SAVED_CHART_TYPE),
+            subjectName = savedInstanceState?.serializable(SAVED_SUBJECT_NAME),
         )
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
index f9d46351..5e2cc65d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -14,6 +15,7 @@ import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.databinding.DialogHomeworkBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -35,16 +37,14 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
         private const val ARGUMENT_KEY = "Item"
 
         fun newInstance(homework: Homework) = HomeworkDetailsDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+            arguments = bundleOf(ARGUMENT_KEY to homework)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            homework = getSerializable(ARGUMENT_KEY) as Homework
-        }
+        homework = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index aac60b56..8f237e53 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -2,8 +2,11 @@ package io.github.wulkanowy.ui.modules.login
 
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build.VERSION_CODES.TIRAMISU
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import dagger.hilt.android.AndroidEntryPoint
@@ -16,6 +19,9 @@ import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
 import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.notifications.NotificationsFragment
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.UpdateHelper
 import javax.inject.Inject
 
@@ -28,6 +34,9 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     @Inject
     lateinit var updateHelper: UpdateHelper
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     companion object {
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
     }
@@ -55,7 +64,7 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) onBackPressed()
+        if (item.itemId == android.R.id.home) onBackPressedDispatcher.onBackPressed()
         return true
     }
 
@@ -71,6 +80,22 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         openFragment(LoginStudentSelectFragment.newInstance(studentsWithSemesters))
     }
 
+    fun navigateToNotifications() {
+        val isNotificationsPermissionRequired = appInfo.systemVersion >= TIRAMISU
+        val isPermissionGranted = ContextCompat.checkSelfPermission(
+            this, "android.permission.POST_NOTIFICATIONS"
+        ) == PackageManager.PERMISSION_GRANTED
+
+        if (isNotificationsPermissionRequired && !isPermissionGranted) {
+            openFragment(NotificationsFragment.newInstance(), clearBackStack = true)
+        } else navigateToFinish()
+    }
+
+    fun navigateToFinish() {
+        startActivity(MainActivity.getStartIntent(this))
+        finish()
+    }
+
     fun onAdvancedLoginClick() {
         openFragment(LoginAdvancedFragment.newInstance())
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
index 786bbfce..b9afba98 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
@@ -98,7 +98,7 @@ class LoginRecoverFragment :
             loginRecoverButton.setOnClickListener { presenter.onRecoverClick() }
             loginRecoverErrorRetry.setOnClickListener { presenter.onRecoverClick() }
             loginRecoverErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-            loginRecoverLogin.setOnClickListener { (activity as LoginActivity).onBackPressed() }
+            loginRecoverLogin.setOnClickListener { (activity as LoginActivity).onBackPressedDispatcher.onBackPressed() }
         }
 
         with(bindingLocal.loginRecoverHost) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index c42a4e9d..03aced14 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -13,10 +13,10 @@ import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 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.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -51,7 +51,7 @@ class LoginStudentSelectFragment :
         binding = FragmentLoginStudentSelectBinding.bind(view)
         presenter.onAttachView(
             view = this,
-            students = requireArguments().getSerializable(ARG_STUDENTS) as List<StudentWithSemesters>,
+            students = requireArguments().serializable(ARG_STUDENTS),
         )
     }
 
@@ -79,9 +79,8 @@ class LoginStudentSelectFragment :
         }
     }
 
-    override fun openMainView() {
-        startActivity(MainActivity.getStartIntent(requireContext()))
-        requireActivity().finish()
+    override fun navigateToNext() {
+        (requireActivity() as LoginActivity).navigateToNotifications()
     }
 
     override fun showProgress(show: Boolean) {
diff --git 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
index 3455b3cf..5a40a6bc 100644
--- 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
@@ -100,7 +100,7 @@ class LoginStudentSelectPresenter @Inject constructor(
                     }
                     is Resource.Success -> {
                         syncManager.startOneTimeSyncWorker(quiet = true)
-                        view?.openMainView()
+                        view?.navigateToNext()
                         logRegisterEvent(studentsWithSemesters)
                     }
                     is Resource.Error -> {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index f2acd76c..8d403271 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -9,7 +9,7 @@ interface LoginStudentSelectView : BaseView {
 
     fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>)
 
-    fun openMainView()
+    fun navigateToNext()
 
     fun showProgress(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 36c40d15..ab27ecf3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -18,11 +18,7 @@ import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.hideSoftInput
-import io.github.wulkanowy.utils.openEmailClient
-import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.showSoftInput
+import io.github.wulkanowy.utils.*
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -54,7 +50,7 @@ class LoginSymbolFragment :
         binding = FragmentLoginSymbolBinding.bind(view)
         presenter.onAttachView(
             view = this,
-            loginData = requireArguments().getSerializable(SAVED_LOGIN_DATA) as LoginData,
+            loginData = requireArguments().serializable(SAVED_LOGIN_DATA),
         )
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 5cd6fa10..d332ee35 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -6,6 +6,8 @@ import android.os.Build.VERSION_CODES.P
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
@@ -50,6 +52,8 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     @Inject
     lateinit var appInfo: AppInfo
 
+    private var onBackCallback: OnBackPressedCallback? = null
+
     private var accountMenu: MenuItem? = null
 
     private val overlayProvider by lazy { ElevationOverlayProvider(this) }
@@ -88,6 +92,9 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         this.savedInstanceState = savedInstanceState
         messageContainer = binding.mainMessageContainer
         updateHelper.messageContainer = binding.mainFragmentContainer
+        onBackCallback = onBackPressedDispatcher.addCallback(this, enabled = false) {
+            presenter.onBackPressed()
+        }
 
         val destination = intent.getStringExtra(EXTRA_START_DESTINATION)
             ?.takeIf { savedInstanceState == null }
@@ -266,6 +273,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
         analytics.popCurrentScreen(navController.currentFrag!!::class.simpleName)
         navController.pushFragment(fragment)
+        onBackCallback?.isEnabled = !isRootView
     }
 
     override fun popView(depth: Int) {
@@ -273,10 +281,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
         analytics.popCurrentScreen(navController.currentFrag!!::class.simpleName)
         navController.safelyPopFragments(depth)
-    }
-
-    override fun onBackPressed() {
-        presenter.onBackPressed { super.onBackPressed() }
+        onBackCallback?.isEnabled = !isRootView
     }
 
     override fun showStudentAvatar(student: Student) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 9c32d858..458e966d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -139,12 +139,9 @@ class MainPresenter @Inject constructor(
         return true
     }
 
-    fun onBackPressed(default: () -> Unit) {
+    fun onBackPressed() {
         Timber.i("Back pressed in main view")
-        view?.run {
-            if (isRootView) default()
-            else popView()
-        }
+        view?.popView()
     }
 
     fun onTabSelected(index: Int, wasSelected: Boolean): Boolean {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
index 222412ef..37f9a19b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
@@ -10,6 +10,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.databinding.DialogMailboxChooserBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.utils.parcelableArray
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -52,8 +53,7 @@ class MailboxChooserDialog : BaseDialogFragment<DialogMailboxChooserBinding>(),
         presenter.onAttachView(
             view = this,
             requireMailbox = requireArguments().getBoolean(REQUIRED_KEY, false),
-            mailboxes = requireArguments().getParcelableArray(MAILBOX_KEY).orEmpty()
-                .toList() as List<Mailbox>,
+            mailboxes = requireArguments().parcelableArray<Mailbox>(MAILBOX_KEY).orEmpty().toList(),
         )
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 8c6b0402..6c54d9fc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -13,6 +13,7 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.core.content.getSystemService
+import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -23,6 +24,7 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
+import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.shareText
 import javax.inject.Inject
 
@@ -66,10 +68,8 @@ class MessagePreviewFragment :
     companion object {
         const val MESSAGE_ID_KEY = "message_id"
 
-        fun newInstance(message: Message): MessagePreviewFragment {
-            return MessagePreviewFragment().apply {
-                arguments = Bundle().apply { putSerializable(MESSAGE_ID_KEY, message) }
-            }
+        fun newInstance(message: Message) = MessagePreviewFragment().apply {
+            arguments = bundleOf(MESSAGE_ID_KEY to message)
         }
     }
 
@@ -84,8 +84,8 @@ class MessagePreviewFragment :
         binding = FragmentMessagePreviewBinding.bind(view)
         messageContainer = binding.messagePreviewContainer
         presenter.onAttachView(
-            this,
-            (savedInstanceState ?: arguments)?.getSerializable(MESSAGE_ID_KEY) as? Message
+            view = this,
+            message = (savedInstanceState ?: arguments)?.serializable(MESSAGE_ID_KEY),
         )
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index b5f687bd..14f3d718 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -28,6 +28,7 @@ import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialo
 import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog.Companion.LISTENER_KEY
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.nullableSerializable
 import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
@@ -108,12 +109,12 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
 
         presenter.onAttachView(
             view = this,
-            reason = intent.getSerializableExtra(EXTRA_REASON) as? String,
-            message = intent.getSerializableExtra(EXTRA_MESSAGE) as? Message,
-            reply = intent.getSerializableExtra(EXTRA_REPLY) as? Boolean
+            reason = intent.nullableSerializable(EXTRA_REASON),
+            message = intent.nullableSerializable(EXTRA_MESSAGE),
+            reply = intent.nullableSerializable(EXTRA_REPLY)
         )
         supportFragmentManager.setFragmentResultListener(LISTENER_KEY, this) { _, bundle ->
-            presenter.onMailboxSelected(bundle.getSerializable(MAILBOX_KEY) as? Mailbox)
+            presenter.onMailboxSelected(bundle.nullableSerializable(MAILBOX_KEY))
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index eddb4324..c78ccc6e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -9,6 +9,7 @@ import android.view.View.*
 import android.widget.CompoundButton
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
+import androidx.core.os.bundleOf
 import androidx.core.view.updatePadding
 import androidx.fragment.app.setFragmentResultListener
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -27,6 +28,7 @@ import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.nullableSerializable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -43,12 +45,8 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
 
         const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id"
 
-        fun newInstance(folder: MessageFolder): MessageTabFragment {
-            return MessageTabFragment().apply {
-                arguments = Bundle().apply {
-                    putString(MESSAGE_TAB_FOLDER_ID, folder.name)
-                }
-            }
+        fun newInstance(folder: MessageFolder) = MessageTabFragment().apply {
+            arguments = bundleOf(MESSAGE_TAB_FOLDER_ID to folder.name)
         }
     }
 
@@ -131,7 +129,7 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
 
         setFragmentResultListener(requireArguments().getString(MESSAGE_TAB_FOLDER_ID)!!) { _, bundle ->
             presenter.onMailboxSelected(
-                mailbox = bundle.getSerializable(MailboxChooserDialog.MAILBOX_KEY) as? Mailbox,
+                mailbox = bundle.nullableSerializable(MailboxChooserDialog.MAILBOX_KEY),
             )
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
index 5811456b..e46ab42c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
@@ -13,6 +14,7 @@ import io.github.wulkanowy.databinding.DialogNoteBinding
 import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
 class NoteDialog : DialogFragment() {
@@ -25,17 +27,15 @@ class NoteDialog : DialogFragment() {
 
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Note) = NoteDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(note: Note) = NoteDialog().apply {
+            arguments = bundleOf(ARGUMENT_KEY to note)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            note = getSerializable(ARGUMENT_KEY) as Note
-        }
+        note = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt
new file mode 100644
index 00000000..163ba8cd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt
@@ -0,0 +1,64 @@
+package io.github.wulkanowy.ui.modules.notifications
+
+import android.os.Bundle
+import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
+import androidx.appcompat.app.AlertDialog
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentNotificationsBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.utils.openNotificationSettings
+
+@AndroidEntryPoint
+class NotificationsFragment :
+    BaseFragment<FragmentNotificationsBinding>(R.layout.fragment_notifications) {
+
+    private val permission = "android.permission.POST_NOTIFICATIONS"
+
+    private val requestPermissionLauncher = registerForActivityResult(RequestPermission()) {
+        if (it) {
+            navigateToFinish()
+        } else showSettingsDialog()
+    }
+
+    companion object {
+        fun newInstance() = NotificationsFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentNotificationsBinding.bind(view)
+        initView()
+    }
+
+    private fun initView() {
+        with(binding) {
+            notificationsSkip.setOnClickListener { navigateToFinish() }
+            notificationsEnable.setOnClickListener { requestPermission() }
+        }
+    }
+
+    private fun showSettingsDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.notifications_header_title)
+            .setMessage(R.string.notifications_header_description)
+            .setNegativeButton(R.string.notifications_skip) { dialog, _ ->
+                dialog.dismiss()
+                navigateToFinish()
+            }
+            .setPositiveButton(R.string.pref_notification_go_to_settings) { _, _ ->
+                requireActivity().openNotificationSettings()
+            }
+            .show()
+    }
+
+    private fun requestPermission() {
+        requestPermissionLauncher.launch(permission)
+    }
+
+    private fun navigateToFinish() {
+        (requireActivity() as LoginActivity).navigateToFinish()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
index 7dcd51ce..0a71afef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
@@ -4,11 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.databinding.DialogSchoolAnnouncementBinding
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
 class SchoolAnnouncementDialog : DialogFragment() {
@@ -21,17 +23,15 @@ class SchoolAnnouncementDialog : DialogFragment() {
 
         private const val ARGUMENT_KEY = "item"
 
-        fun newInstance(exam: SchoolAnnouncement) = SchoolAnnouncementDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(announcement: SchoolAnnouncement) = SchoolAnnouncementDialog().apply {
+            arguments = bundleOf(ARGUMENT_KEY to announcement)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            announcement = getSerializable(ARGUMENT_KEY) as SchoolAnnouncement
-        }
+        announcement = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
index 364ad213..77a3c6cf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
@@ -1,18 +1,16 @@
 package io.github.wulkanowy.ui.modules.settings.notifications
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.SharedPreferences
-import android.net.Uri
-import android.os.Build
+import android.content.pm.PackageManager
 import android.os.Bundle
-import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
@@ -26,7 +24,7 @@ import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openInternetBrowser
-import timber.log.Timber
+import io.github.wulkanowy.utils.openNotificationSettings
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -42,7 +40,14 @@ class NotificationsFragment : PreferenceFragmentCompat(),
 
     override val titleStringId get() = R.string.pref_settings_notifications_title
 
+    private val notificationsPermission = "android.permission.POST_NOTIFICATIONS"
+
     override val isNotificationPermissionGranted: Boolean
+        get() = ContextCompat.checkSelfPermission(
+            requireContext(), notificationsPermission
+        ) == PackageManager.PERMISSION_GRANTED
+
+    override val isNotificationPiggybackPermissionGranted: Boolean
         get() {
             val packageNameList =
                 NotificationManagerCompat.getEnabledListenerPackages(requireContext())
@@ -51,6 +56,13 @@ class NotificationsFragment : PreferenceFragmentCompat(),
             return appPackageName in packageNameList
         }
 
+    private val requestPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) {
+            if (it) {
+                presenter.onNotificationsPermissionResult()
+            } else openNotificationsPermissionDialog()
+        }
+
     private val notificationSettingsPiggybackContract =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             presenter.onNotificationPiggybackPermissionResult()
@@ -156,25 +168,29 @@ class NotificationsFragment : PreferenceFragmentCompat(),
             .show()
     }
 
-    @SuppressLint("InlinedApi")
     override fun openSystemSettings() {
-        val intent = if (appInfo.systemVersion >= Build.VERSION_CODES.O) {
-            Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
-                putExtra("android.provider.extra.APP_PACKAGE", requireActivity().packageName)
-            }
-        } else {
-            Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-                data = Uri.fromParts("package", requireActivity().packageName, null)
-            }
-        }
-        try {
-            requireActivity().startActivity(intent)
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
+        requireActivity().openNotificationSettings()
     }
 
-    override fun openNotificationPermissionDialog() {
+    override fun requestNotificationPermissions() {
+        requestPermissionLauncher.launch(notificationsPermission)
+    }
+
+    override fun openNotificationsPermissionDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.notifications_header_title)
+            .setMessage(R.string.notifications_header_description)
+            .setPositiveButton(R.string.pref_notification_go_to_settings) { _, _ ->
+                requireActivity().openNotificationSettings()
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                setNotificationPreferencesChecked(false)
+            }
+            .setOnDismissListener { setNotificationPreferencesChecked(false) }
+            .show()
+    }
+
+    override fun openNotificationPiggyBackPermissionDialog() {
         AlertDialog.Builder(requireContext())
             .setTitle(getString(R.string.pref_notification_piggyback_popup_title))
             .setMessage(getString(R.string.pref_notification_piggyback_popup_description))
@@ -202,6 +218,11 @@ class NotificationsFragment : PreferenceFragmentCompat(),
             .show()
     }
 
+    override fun setNotificationPreferencesChecked(isChecked: Boolean) {
+        findPreference<SwitchPreferenceCompat>(getString(R.string.pref_key_notifications_enable))?.isChecked =
+            isChecked
+    }
+
     override fun setNotificationPiggybackPreferenceChecked(isChecked: Boolean) {
         findPreference<SwitchPreferenceCompat>(getString(R.string.pref_key_notifications_piggyback))?.isChecked =
             isChecked
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
index 4cbdac94..232b0348 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
@@ -26,12 +26,13 @@ class NotificationsPresenter @Inject constructor(
 
         with(view) {
             enableNotification(
-                preferencesRepository.notificationsEnableKey,
-                preferencesRepository.isServiceEnabled
+                notificationKey = preferencesRepository.notificationsEnableKey,
+                enable = preferencesRepository.isServiceEnabled
             )
             initView(appInfo.isDebug)
         }
 
+        checkNotificationsPermissionState()
         checkNotificationPiggybackState()
 
         Timber.i("Settings notifications view was initialized")
@@ -49,12 +50,17 @@ class NotificationsPresenter @Inject constructor(
                         view?.openNotificationExactAlarmSettings()
                     }
                 }
+                notificationsEnableKey -> {
+                    if (isNotificationsEnable && view?.isNotificationPermissionGranted == false) {
+                        view?.requestNotificationPermissions()
+                    }
+                }
                 isDebugNotificationEnableKey -> {
                     chuckerCollector.showNotification = isDebugNotificationEnable
                 }
                 isNotificationPiggybackEnabledKey -> {
-                    if (isNotificationPiggybackEnabled && view?.isNotificationPermissionGranted == false) {
-                        view?.openNotificationPermissionDialog()
+                    if (isNotificationPiggybackEnabled && view?.isNotificationPiggybackPermissionGranted == false) {
+                        view?.openNotificationPiggyBackPermissionDialog()
                     }
                 }
             }
@@ -70,9 +76,15 @@ class NotificationsPresenter @Inject constructor(
         view?.openSystemSettings()
     }
 
+    fun onNotificationsPermissionResult() {
+        view?.run {
+            setNotificationPreferencesChecked(isNotificationPermissionGranted)
+        }
+    }
+
     fun onNotificationPiggybackPermissionResult() {
         view?.run {
-            setNotificationPiggybackPreferenceChecked(isNotificationPermissionGranted)
+            setNotificationPiggybackPreferenceChecked(isNotificationPiggybackPermissionGranted)
         }
     }
 
@@ -80,10 +92,18 @@ class NotificationsPresenter @Inject constructor(
         view?.setUpcomingLessonsNotificationPreferenceChecked(timetableNotificationHelper.canScheduleExactAlarms())
     }
 
+    private fun checkNotificationsPermissionState() {
+        if (preferencesRepository.isNotificationsEnable) {
+            view?.run {
+                setNotificationPreferencesChecked(isNotificationPermissionGranted)
+            }
+        }
+    }
+
     private fun checkNotificationPiggybackState() {
         if (preferencesRepository.isNotificationPiggybackEnabled) {
             view?.run {
-                setNotificationPiggybackPreferenceChecked(isNotificationPermissionGranted)
+                setNotificationPiggybackPreferenceChecked(isNotificationPiggybackPermissionGranted)
             }
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsView.kt
index 2bf8e31f..a391681c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsView.kt
@@ -6,6 +6,8 @@ interface NotificationsView : BaseView {
 
     val isNotificationPermissionGranted: Boolean
 
+    val isNotificationPiggybackPermissionGranted: Boolean
+
     fun initView(showDebugNotificationSwitch: Boolean)
 
     fun showFixSyncDialog()
@@ -14,10 +16,16 @@ interface NotificationsView : BaseView {
 
     fun enableNotification(notificationKey: String, enable: Boolean)
 
-    fun openNotificationPermissionDialog()
+    fun requestNotificationPermissions()
+
+    fun openNotificationsPermissionDialog()
+
+    fun openNotificationPiggyBackPermissionDialog()
 
     fun openNotificationExactAlarmSettings()
 
+    fun setNotificationPreferencesChecked(isChecked: Boolean)
+
     fun setNotificationPiggybackPreferenceChecked(isChecked: Boolean)
 
     fun setUpcomingLessonsNotificationPreferenceChecked(isChecked: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
index 6ff7a39b..598046a2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoFragment.kt
@@ -8,6 +8,7 @@ import android.view.MenuInflater
 import android.view.View
 import android.widget.Toast
 import androidx.core.content.getSystemService
+import androidx.core.os.bundleOf
 import androidx.core.view.get
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -24,6 +25,8 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.nullableSerializable
+import io.github.wulkanowy.utils.serializable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -38,7 +41,9 @@ class StudentInfoFragment :
     lateinit var studentInfoAdapter: StudentInfoAdapter
 
     override val titleStringId: Int
-        get() = when (requireArguments().getSerializable(INFO_TYPE_ARGUMENT_KEY) as? StudentInfoView.Type) {
+        get() = when (
+            requireArguments().nullableSerializable<StudentInfoView.Type>(INFO_TYPE_ARGUMENT_KEY)
+        ) {
             StudentInfoView.Type.PERSONAL -> R.string.account_personal_data
             StudentInfoView.Type.CONTACT -> R.string.account_contact
             StudentInfoView.Type.ADDRESS -> R.string.account_address
@@ -58,10 +63,10 @@ class StudentInfoFragment :
 
         fun newInstance(type: StudentInfoView.Type, studentWithSemesters: StudentWithSemesters) =
             StudentInfoFragment().apply {
-                arguments = Bundle().apply {
-                    putSerializable(INFO_TYPE_ARGUMENT_KEY, type)
-                    putSerializable(STUDENT_ARGUMENT_KEY, studentWithSemesters)
-                }
+                arguments = bundleOf(
+                    INFO_TYPE_ARGUMENT_KEY to type,
+                    STUDENT_ARGUMENT_KEY to studentWithSemesters
+                )
             }
     }
 
@@ -75,9 +80,9 @@ class StudentInfoFragment :
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentStudentInfoBinding.bind(view)
         presenter.onAttachView(
-            this,
-            requireArguments().getSerializable(INFO_TYPE_ARGUMENT_KEY) as StudentInfoView.Type,
-            requireArguments().getSerializable(STUDENT_ARGUMENT_KEY) as StudentWithSemesters
+            view = this,
+            type = requireArguments().serializable(INFO_TYPE_ARGUMENT_KEY),
+            studentWithSemesters = requireArguments().serializable(STUDENT_ARGUMENT_KEY),
         )
     }
 
@@ -154,7 +159,6 @@ class StudentInfoFragment :
         )
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
     override fun showFamilyTypeData(studentInfo: StudentInfo) {
         val items = buildList {
             add(studentInfo.firstGuardian?.let {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index c9243b12..4f5547d2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -8,14 +8,12 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.databinding.DialogTimetableBinding
-import io.github.wulkanowy.utils.capitalise
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
-import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.*
 import java.time.Instant
 
 class TimetableDialog : DialogFragment() {
@@ -28,17 +26,15 @@ class TimetableDialog : DialogFragment() {
 
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: Timetable) = TimetableDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(lesson: Timetable) = TimetableDialog().apply {
+            arguments = bundleOf(ARGUMENT_KEY to lesson)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            lesson = getSerializable(ARGUMENT_KEY) as Timetable
-        }
+        lesson = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index 6fd12632..e95d6f82 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -7,6 +7,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
@@ -39,9 +40,7 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         private const val ARGUMENT_DATE_KEY = "ARGUMENT_DATE"
 
         fun newInstance(date: LocalDate? = null) = TimetableFragment().apply {
-            arguments = Bundle().apply {
-                date?.let { putLong(ARGUMENT_DATE_KEY, it.toEpochDay()) }
-            }
+            arguments = date?.let { bundleOf(ARGUMENT_DATE_KEY to it.toEpochDay()) }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
index 7d32278f..ddd7488e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -4,10 +4,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.databinding.DialogLessonCompletedBinding
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.serializable
 
 class CompletedLessonDialog : DialogFragment() {
 
@@ -19,17 +21,15 @@ class CompletedLessonDialog : DialogFragment() {
 
         private const val ARGUMENT_KEY = "Item"
 
-        fun newInstance(exam: CompletedLesson) = CompletedLessonDialog().apply {
-            arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, exam) }
+        fun newInstance(lesson: CompletedLesson) = CompletedLessonDialog().apply {
+            arguments = bundleOf(ARGUMENT_KEY to lesson)
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            completedLesson = getSerializable(ARGUMENT_KEY) as CompletedLesson
-        }
+        completedLesson = requireArguments().serializable(ARGUMENT_KEY)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
new file mode 100644
index 00000000..d0d47025
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.utils
+
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import java.io.Serializable
+
+inline fun <reified T : Serializable> Bundle.serializable(key: String): T = when {
+    Build.VERSION.SDK_INT >= 33 -> getSerializable(key, T::class.java)!!
+    else -> @Suppress("DEPRECATION") getSerializable(key) as T
+}
+
+inline fun <reified T : Serializable> Bundle.nullableSerializable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= 33 -> getSerializable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializable(key) as T?
+}
+
+@Suppress("DEPRECATION", "UNCHECKED_CAST")
+inline fun <reified T : Serializable> Bundle.parcelableArray(key: String): Array<T>? = when {
+    Build.VERSION.SDK_INT >= 33 -> getParcelableArray(key, T::class.java)
+    else -> getParcelableArray(key) as Array<T>?
+}
+
+inline fun <reified T : Serializable> Intent.serializable(key: String): T = when {
+    Build.VERSION.SDK_INT >= 33 -> getSerializableExtra(key, T::class.java)!!
+    else -> @Suppress("DEPRECATION") getSerializableExtra(key) as T
+}
+
+inline fun <reified T : Serializable> Intent.nullableSerializable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= 33 -> getSerializableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializableExtra(key) as T?
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/IntentUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/IntentUtils.kt
index 1ef03f2e..62b85af4 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/IntentUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/IntentUtils.kt
@@ -1,11 +1,15 @@
 package io.github.wulkanowy.utils
 
+import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.provider.CalendarContract
+import android.provider.Settings
 import io.github.wulkanowy.BuildConfig
+import timber.log.Timber
 import java.time.LocalDateTime
 import java.time.ZoneId
 
@@ -86,6 +90,23 @@ fun Context.openDialer(phone: String) {
     }
 }
 
+fun Activity.openNotificationSettings() {
+    val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
+            putExtra("android.provider.extra.APP_PACKAGE", packageName)
+        }
+    } else {
+        Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            data = Uri.fromParts("package", packageName, null)
+        }
+    }
+    try {
+        startActivity(intent)
+    } catch (e: Exception) {
+        Timber.e(e)
+    }
+}
+
 fun Context.shareText(text: String, subject: String?) {
     val sendIntent: Intent = Intent().apply {
         action = Intent.ACTION_SEND
diff --git a/app/src/main/res/drawable/ic_launcher_foreground_dev_mono.xml b/app/src/main/res/drawable/ic_launcher_foreground_dev_mono.xml
new file mode 100644
index 00000000..b1b01a0b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground_dev_mono.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1926"
+    android:viewportHeight="1926">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M920,1357.7v-184.5h42.7q19.3,0.3 34.3,6.6 15.2,6.2 25.6,17.5 10.6,11.2 16,26.9 5.6,15.6 5.7, 34.6v13.5q-0.1,19 -5.7,34.7 -5.4,15.6 -16,26.9 -10.4,11.2 -25.6,17.5 -15,6.2 -34.3,6.3zM943.8,1192.5v146.1h18.9q15, -0.1 25.8,-5.2 11,-5.2 18,-14 7.3,-9 10.7,-21 3.5,-12 3.6,-26v-13.9q0,-14 -3.6,-26t-10.7,-20.7q-7,-9 -18,-14 -10.9,-5 -25.8,-5.3zM1179.5,1272.5h-77v65.4h89.8v19.9L1079,1357.8v-184.6h112.2v20h-88.7v59.4h77zM1288.9, 1320l43.6,-146.8h25l-58.2,184.6h-20.4l-58.3,-184.6h25z"
+        android:strokeWidth="1"
+        android:strokeColor="#000" />
+    <clip-path android:pathData="M 0 0 L 1926 0 L 1926 1111 L 850 1111 L 850 1926 L 0 1926 z" />
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground_mono.xml b/app/src/main/res/drawable/ic_launcher_foreground_mono.xml
new file mode 100644
index 00000000..e2e74731
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground_mono.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1926"
+    android:viewportHeight="1926">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1082,1260v4l-6,73c0,5 -5,9 -10,9H879c-4,0 -8,-2 -10,-5l-31,-58 -29,-71v-8l48,-94c2,-3 2,-5 1, -8l-24,-65c-1,-2 0,-5 1,-7l39,-84c4,-8 17,-8 20,1l12,38 38,101c1,2 3,5 6,6l80,27c3,1 6,3 7,6l45,135zM852,717c0,-23 15,-43 35,-52l-2,-8c0,-11 13,-20 29,-20h1a38,38 0,0 1,36 -18l3,-2c11,-16 37,-27 68,-27 12,0 23,2 32,4 3,-3 8,-6 14,-6s12,3 14,8c8,-9 22,-16 38,-16 25,0 45,16 45,36l-1,7 3,4c16,6 27,17 27,30 0,14 -15,27 -34,32 -2,0 -3,1 -3,3 0,11 -11,21 -26,22v1c0,22 -41,40 -92,40 -11,0 -21,-1 -31,-3v1c0,9 -12,16 -26,16h-2l2,7c0,14 -18,25 -40,25h-7l-4, 2c-2,7 -8,12 -15,12 -9,0 -16,-7 -16,-16 0,-5 1,-8 4,-11l1,-4c-2,-3 -2,-5 -2,-8 0,-2 -2,-3 -3,-3 -27,-6 -48,-29 -48,-56z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M1336,1346h-125c-3,0 -6,-1 -8,-4l-84,-118 -1,-2 -42,-122 -5,-5 -102,-52 -5,-6 -15,-75 -2,-3 -34,-51c-2,-3 -2,-6 -1,-9l21,-45c2,-4 5,-6 9,-6l39,-2c3,0 5,-1 6,-3l29,-22c5,-4 14,-2 17,4l98,201 1,2 13,81 2,5 197,216c6,6 1,16 -8,16zM801,1302c1,3 1,6 -1,8l-19,31c-2,3 -5,5 -9,5H591c-8,0 -13,-8 -9,-15l116,-171 2,-3 53, -228c1,-3 3,-5 5,-6l72,-40c3,-1 5,-4 5,-7l10,-42c2,-9 15,-11 20,-3l3,6c2,2 2,5 1,8l-66,190v5l16,91v5l-40,88v6l22,72z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
new file mode 100644
index 00000000..8e506e1e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_notifications.xml
@@ -0,0 +1,69 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.notifications.NotificationsFragment">
+
+    <ImageView
+        android:id="@+id/notifications_header_icon"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_marginTop="32dp"
+        android:src="@drawable/ic_settings_notifications"
+        app:layout_constraintBottom_toTopOf="@id/notifications_header_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.4"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/notifications_header_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginVertical="16dp"
+        android:gravity="center_horizontal"
+        android:text="@string/notifications_header_title"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toTopOf="@id/notifications_header_description"
+        app:layout_constraintTop_toBottomOf="@id/notifications_header_icon"
+        app:lineHeight="30sp" />
+
+    <TextView
+        android:id="@+id/notifications_header_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:gravity="center_horizontal"
+        android:text="@string/notifications_header_description"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@id/notifications_skip"
+        app:layout_constraintTop_toBottomOf="@id/notifications_header_title"
+        app:lineHeight="24sp" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/notifications_skip"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:text="@string/notifications_skip"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/notifications_enable"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:text="@string/notifications_enable"
+        app:icon="@drawable/ic_settings_notifications"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index d59ec8e1..da1bca12 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/colorPrimary" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_mono" />
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index d59ec8e1..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 85f6a2c87d16f05dac43a09867994b07f527ed7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4025
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

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index dc6ac682d014b03ff5e5f9c69601f49e8f80af49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2569
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
GGywo!6zTW?

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index dd67b87716351217f708ad5a0ed185d8bd6321e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5740
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^TYj6Gc(Ln>~)jpd984*$ll
zaY{`?G~il`z@!PRBIVIXXJ%fl&tCgB;&z|a+*@JC%Vb{b#2){2-EZ}^s8`prvhS`4
z5*5EAcvLn-KyiUW7x%jrD|Up4y`S^BD8D8}xlx71^nUq175)6(`-{)N*ZF==yz#-w
z*C$u+6Bp!&afk^F<B`2}XwHVeA7-eZFqJ8|-t*(fG!2d{=kv|SH+_C!IbR`rS-Wz?
z&BDUGXAJH4Z9iXm)v$Q3RqNs1TMX3P8k^?7+{SR{_#CGjrt=~=*0;ZE4qOqi<x<Hz
zo$E)A?1>Q&{v5e4YOjX9TAFpu^@b^pG3+~ei>9B--St-IUGwiph7~&Vn9sL9zY<=R
zth?ssz8=#(D}t9RFl0-d;8)nGFjYZizItUC$A1eO@jdd(p3AjeH@YS$*DZIReV>O`
zZt#Mz{gdRSck?vtTw=&q#_M6~|Dl@q%ZI3a8{WEoGY#O1<6hr+{aCd@X??%Who4%Z
zEox?Fj2eq>aJ;B#kbe?+^E0mw<GF>)7g(Ko@Q(2v>-(1zgIOL&ev4fk(zWp5W`-|Z
zvLB)*tj=NGA<DHf>H6ZZz=L<C?<mjLn!R@OGiLt1tLM6{{l_F#>HK-a_TrL<92d@N
zHv5N$2%3M0`#7(6>(a<CRXksBls~w6eL<jl<pJq}&67Dk%linbKfD+Jy!AkyUp}u+
z@X``tj$V&vjPb6%^DQ<TRGqr4)mV_*u+8B9gDsq~vg*>(zw1rn(s@^xl|AU?xG!}s
zX?D-nt3Q9(sXeo=+WXJZm}UNZ<y8?!N>tR+7ByU&aQO#oneq+o2WitY<nHB^7PH31
z_kCESXs(u)$&_0>S-a6P+9&P7vu#-#?Pl!j@;mY$xU6p3k}D{<uZCyVn&;1t9oyDA
z`_!VE_`7p7k6+p#I<+8Tt=$IKg&(qoyc5Llblb+SJ$J<>X-YDu>O!GSp{v%kIweN8
zYc;wuO!>UsChx)P->o`Rwcf^hIhXbK{V*(;7q$0C;R4yss=OghQNG_ar+VsGZOWc^
zz@)}y>93yW1@hJ(etKPCVB5K%rRT*9mfcZ|pT8~m$hgO8*5~wXbFC*Q>+f;!a_dnz
zdbmx{_x-(X{e4^hH7xO5s((w>D2Y#vJE&;KgUIx*&!2afD7rSYPu}D?`NUFI?h{Yv
z*Q-6>_p58pe6!w|$Zb6_KfXm5eg9DyRQg$MXZcT~o!e5mHDBDnf9>A_Hp83iL#C;^
zy0zW7qIp@8^F+Shh2PVyCtud>=~owh`Etp#d$vK*(b*fPtc`NrbkHa#c9%s{$dZ6H
zLKh+>%{1>B`aa8O=l=Pz;4*`}w6|9qzq<JIGm2Ap?hIo*|0Ju<&h!1{b{UofIj{I1
z{1phexNOCWiDny_o&_{qt~q$bOXI6aq~^{A`SC^1F8iOXT`;MQ;rx<c|7wfMKBsMZ
zyz{xoHr}ZRR%EOXsw|2N3Hj}2om#cwbmG*kNy|D9>Ps25+|k$17y0n3sOF^5q*Vbo
zt_d+Lma({>wzFndgWvYdkoWf&2e}^bTwfg6?{!rr(7$eb-jh35R)!VtwOqM!otmnr
zXG&;^$;}LBRRuSxwW1+^G$x)9JlxV2Aox^YyrWQf_NMR8j~|`L-PyV1*E!kSjq#yJ
z123d4PzYf-RTa?0`_dzu)#xTa)84|u)iU{QK58t_i?(W3*T0Pa@3m@O{C3G7`$Iz}
z)V|;EA9i@B<c}KF8;67hw2$QUI~C?m3(#=Zc^)}g+TdOLlSlTm)ckhnotvF*{6YKl
zDG$3Rtl3tjMhx>i*S_E=Sbg+KPHf1P>0v*a!cNav98l3L#y#8W)6P8^6VHllc)fPJ
z57YVSA<`EF5A%F#S`?_LSSNP9Q{uaPz{<FywjKYk{P?(J*QQMe7u;`8Hhgz}p2fr^
z4*gqP7&W9FIN7BZv&<4tIcPfFTO~i@33tWK+1Y(wQ=jmtwm03|dvfcQkaLBzn19Lr
z=$xz_HsSK?>&1NEeq37W!hEj!yY>4CzWaaAJ$m5v<%<iCMLL;^y)rwIqRn_&>}%Tb
zGcFGf$v${c?EA9j^@q&w@1Fem^76^Ki;LR?eSLY^f6Obtud3;l+T5_NzfWovi`b-h
zAsTur9Ia00_BScLT3xa0O?ThF#lcf#e=zlZK5{#M^6&8V*8&f`<req2)vbR^rlQt6
zLqPUphK8rkKjY^;UzeSf?yigB*P2>9XX*FPtfB$6-}P4hduv{_dCQcTTig5Jv>IHE
z@W{-*dBNfM8b%)e!-d&PFU@D&)0wUIQr%CXfcc))lO8S&8H0v7(ObLTNSU6}xck5?
zTPD}}#fe)2Qxj*1$<CEl5vZ88L{aSTn#o>E3mjbM32QL02Xp=Zz&`2v>gjpWW!v*)
z1WFGyzL);}O?9cJ=8}|~Mw_G@HmS=-E@pYgUZy$Kd>Lo!#*U2_m-J{R?2fT>2`-<P
zGFkJ%j}3`SHm&H8nQb%k$%k#q^2?L@+waZeI(75s^!*b)9d7s3wRrM-d)~y@4|nI4
zr1;)sGIX&qK4|s4+eO)@ZE?^4@7h!4pIe`-c)wFK*y7xM`#hQJpEpIOepx#G#M(VJ
zd^tUzS0~8tOSaoyYaMxeY4_c!37x7J3Yqk@{ib>BGkC>b@iFtX&e9^s;Pm}>dduH>
zty>%Io+o4Px9!XO^QKkCUl!$bv=zJ%Ts?DH5mSiAu@e)^%Fj%@BsguwMZx7BOZPJz
z%VYb=pzoSj>ao--JBu}=;raQRPn_l-iiGCq-QSqk-M>8}=0Q%BR3x+Ak$YYnHsl00
zUk<-^I>nmxir{rk?+f~RAOHQkH-S<9WVRA(M%5Pub%jGar%rWUm4E-*wfqOx`wv=j
za*9n=co(}ntzeC<b4YO|)8V4kF>wn%eEj(M6JwpqkyZ2mi*_<8vgnrXU}^}PaDDx{
z$l&E)YJUHz+{Cvjp)R?6-%mC3B^jMU=W=cxarNj6Xxh1nHL0`D!q)27nG*{Z7&O1q
z2tIJ;LcmACt-mHMcD^uqvHR<)J$?#{G~@Q%P*`{T{n2i*tI^U)`x1`7UT^Kf`0SLJ
zj>y>njdeZTJR!4!8npQqHZsY~W_EbLpUWoSprGip+D+rMo^6Q&SxR5m)IXD4d(!z#
zeBQ|(j(|rmuY_ze(>s^wWe~RQ!PS<$8X>uRHx-1ExMpYztyIj}_0)q^<jYIvJXxCz
zhI_q}geKkEtbTpP9sT`Jwmo&QJ0P{I{7r-&%i8TSyj?!^Pet1`4@BH-(oERy6!^2y
z!=pTyE5k5YrK@lYQ&&5m>i*b084Pze%GW=U+RSP6kjvv(!R@1Wcb85)%eJ9S`{qrt
zpG-P|){Ej&R^=QFKd`^Kxmw|xo2Y@Zj?cpkE~~Ex+1YC1SpO*`AK_T1*skvTs4IU?
zuwA*|_1S^}OT@iJ3fK?b?0I-tb`?Y2yaUS@@LQF=NeW_|&(7{{d5beXZpQ_N4WH)7
zY+_uIS(>wE-S^EaRos{PT{ShRKgQGTe$3A?=y?X~h8|1zl~*huZf9aj^3i&bYrkLM
z#0@`79Uj((USEBk8J3e*=g9qeq1-&-^RJ7GcO^+*tI?U)#q@mR_Z^Lzk;?<FEb#Ye
zHu&NyKi}iXu5&SpvpRORIZP_J(AXLA@O^!L$*hNFCpfP?N?G%z<nV=0=VW6uX5QMp
z{ir45sf#~9%T5#jkh;_-thr=Ml$!R3@1I^BuuQB|I(DqlvBqfXsoXv-*D3qH&%4O@
zy_CVuDtfVu|7Yej)>-fOJr*+SPIJw_{p`YoDeD`iez4Ov67m+D!MR)Q#Z;x31m;;S
z<`!M8e1QxX&bQv&?74R0qFa6D_a5Zg2+NohANZyC>R8?1EuE6*9GX2=3Z#2apE^_b
zQsTP?%NFN@$IEx_c^1BNPK~OF8uPJSf$Zjkl~x`Pb~>ufp7H;~Mm_#FmKWkSmaYz5
zP{74`eC~$xvC1N?fx_qVR!>%J?o4h8;qjAA_jr)7_u!E=o6}EDYh;#P&9L*2qgTn7
z=2RoepE^1`>Tjx~WG5_?zANsjvi`Ysg2OU_sz<gAM`kb;gmf2{p8WLG?fcF-Q(Z5$
z^BA6bIeUKXG?7N7cP}*8zq)6;DfxzhyY>Px5r=6WOH*==_q|s*#(9kG*-H)I)%{jw
zJ<S1MX6<zjlzF?#)KOf#?A?<;4Sj7r7Ew#2SbjLUv85Yk>hB3y{->w%P}~Q@tyR+|
zSSB_(i*9Jrdf?u<Bx%F`|Hd5~1GyK>X|ewyAFz_|W;A2!WcArkUcElvH_=x>F_D=o
z?W~cP`mes9W+|7`&GJ-!AMd|zT9<o$-IHrGjZ0+<qh>kF8fr1z7e4yP=75=mp`U@N
z>&N_w6W2amdw1K57nNmmMH%^i{Caj)jnUO$yHmg0^D6&*xq!W!=jY#1u#T(tHTPbW
zaj?lMtYO+=(HC!QQch03l~QnEetX-aj0o$ljUTW3yzRed-+8qD-1f&u);M(}<Yk+v
zIoj}V+4S$_@{<=UKc8_kUH0tXb9J>>%ho=);u6yJPiX0(oyBkSIIl2HK6>DPa#Pbi
z_niA8Tz7r_&s<Vtmt+3>XA%F(ko32%&gvT{MFu7cxjcEP%gh!bbN}_}rDuHfCO%fu
ztav`%_y?z~U+DJqq+>to%Tk_HZe6ZEZK3U>tq=FTyzbD*uvQ^qb<94S^L&$w3m3+w
zCNA{+P;gB8T0>Xwl@6V_7WSRYX_t9A7OP#8NU;2E@I$HkjPju$@(0$t{rdTT!-lO5
znF&k8qCc-+cuQdATc3#;DRSD&Z*{a4EIWMk=V#wbT$kMMeR-+!_v!SVGxi#0Gk)6l
z(~bRDpZ(vHPi`<i<C*zjN3QMSzKiFb7R(Qnwd!&8Is0k99B(DtmOR~it3$+YZPF_#
zIwO&Hbl1*%`*+sY2mSc_o$cY`twlc%Fve<hD`$rD$r{D3+gIXg{wwYDC+2<UJ32J#
zR)uQEta%=(|98Xn1q&4BSP5>>(R!u5g(=$Sl2zNBykj31DZEW^>pt9n%uC?fiMyYQ
z?#^KPR8zb3wY5Oy!lgHox~$*+-RiCQ`>(sl37;dAlCo}gUz%{<+u!!8uJ_ViS6)mI
zvH0s16ttK5Wo3N*SyKjCgDB_4(^MK+6ZsZOFMM^i`;JB7p*M!26Y7`nN~L%|uU@)(
zd%66Pq6Mmd&Q})}w>+@bh*bK?IKOd0W($*-;;W4<L3;0QE|#{^iQBZ~V)h}euI|@g
zGUi+=`hH4u^YIvM4Tb3W_4^8sn!ot#dEvJ`7jJBjM3Bzf>bxTkv!>X-e||lCe^BMl
zg<%c-T`T*meyo<bx!~lt@c6A67xwP^ny9llEjVgISJs&x#e{|i;o9rpUtV5ukKZ!1
za?bX0`y&E7?(bFXej2;v?d`{l?>dXQyVXs;ETH}3O6L@H^=MH$xgQ^#WB>GVMkb4H
zFtpqEE}`=LyeEg=-TmtS>eh~li`TY&snglh%g;Bj`-UfLlUY-nooVU{hlYIz^f!cR
zr|xnJObLx+*wfE{Z9`dW^37{&cd<RZ;`Dds`7q4~*K`+ub}nqKdAhUst9IgHwoU8Y
z`B$^Y?Gx+vzO{R2;-jbHnX2EVBOLSBin91~@yb>+_}sYEdfQ!b&YtRDTdpp6xPWv2
zqRP7G=i1zz4t!sBz{;dhY59U*Izsc+6FpBhO`Tic)up7&#PqLmM(Ov@p9OC`nCYnN
zyyb94Qo#vL57(bxpRiio2-=s_dbJ_3QsMXK^RG>K)-tHyGCRR3E;^GXhqs~XQd70d
z{DwN_&7Xg{?X6=x{yQ_`M%9s1?%gwe=goR5w7fUb+NH9p%y;r>@65KGNnL%sl1^IQ
zUORr;PUHGy>L+_~eb6G&2g#`$wnvrP-Pm99HS4qSjbGoM3Yq0iY@b=YP|4TTZOxMd
zf&MN>UKa58&+C}#r0_xP#)rc1>$KwI|2Q`r6zJu@3)5PC*46b##Y~xwq%tR^DTyn2
z<nxR^Iiz=Z2DOPkKm6DHiug%~rnW$#xZ8Jj7Oc2@<+EzUmCt)!g8ml${<c_9xohg#
z`SV_=ef!4O@co3##0;sHWodsIEwVSshU=Ogw2^V=H`imhCoe5Cr{hLI&zny+nc^Q<
z<>C_JK16<-95H9k($Z5~E7eYktZ0$#Um+B+lQH}6e?DGcM;`&{T_RWW{%?86l{l4O
zHY!+ms>db1q@u;KP01mgJ3~18rGC69F}(fP#HNNlVWFGPpDj0T{FOJ0Y6+}oC=>g=
z+GW#zJJlz)P9;a!?Hx629voYnE8f!Tcr2U$p1GH+M4W3?_3y*G1>Wes6Yo@+d~u@Y
z{0YA~E(kvT6UFt<kzv1dlEcOf&4LH>|LpiMXA{Sg%Ssz7W}h=mE=fsQ>8H1~C5_!i
z|CZyq_6Ye*_T@9XEBvlM{J)_^JV*7@r$hA;hw2x0&(s!LdxLeMZ1t+Dd7ZA=XHN=6
z%sIbkZhc$Jg2PAM`CKk++b(4C@P2fm*NX+Fj$2r+)*n8+e7UQ8_|r>0GZ(Aax|*<C
zMR{tn|CF;oKha~ATeh>W=r&O&$N$UN_VdX)MtqsFK8&*~u(2_JeMgtp*(Fm_&PdI%
z^ndWZ>dEhwN*7liyrts(kS{lfIX749mf>m^4(1x`9lIY-Uid^%PR{?lSm(98<E~{9
zr`WtLoWgsov*&I2^e`e%w{D*P#0mASZOh6^%8v)?T5emr*5Sgnn+Kk2GafcrufX3Q
zP%%BB#zxPg;?VlQK-cPm7%}cri+yWKFY(W5?K9Z2B$&g}eK&{9Tak$?er#=MsJ|o;
z?{xc#>+Kg;>N7h!JE|EhH11zp`*FVK;#wP<sv1c-yXv(*Wt_^YzuuSdzc3cbDm-!d
zV#yH;xoR6f`QzD-6@G0``ndFaQ}gp*J9a+II+n2@)Ud_!Mb2H;voGpj-gLQdcA@yt
z3ey!<zkht0uP36%;u_=9{ovTFt^UF**}PZWTo+(d!0>`!<Au!e^-C6}Cb=9r%J1YX
z?)v+|56kBns$cHiw$OeW;pO>G!jNUx?#0d17I|vd*3SQ}r1NI?lNBqRz6hF3zSg#a
zi}h2!ZqOmGwKfqy3wE3@S|E9&fbU&QfuEb9#*PH0!>2R_1zX><vYr*GuH;=%qI|Ua
z>oqsacV`=mbWY8gXn%3a;X8MgS15(#<>lRVD}VFj`%FQ>?4Tu=j3sxRk)N`WSA0w0
z0u9~F!;Uha9-ri5TX(PQ&UAjW*DpDKooD#Pv+>85_Js?x+t}Ft$-Y}?{q`eAP0RFY
zd3$8$-n2SpzN4^<;lIOT)g@}I4FbaN-rnV(V)!t6qDE$?%cRXFTB~FZJYw4+Xc3cq
zbdAE%mJgf4Hp!%{6#Ec0XTGtk#+jet9v+u2G&FD?eE06}hglW5d)W6(Z)iWT+f;pB
zevgukVfly8A2>c<O}msK>czsgB)h-tE!$p3TM?N@=JM^Wf2|@l&dg8~daBlSR6Whr
zZQg%7qfejsg-(Ww{OP&<!Tb*U_txY|A8&;J{d;`n?Jbfm&zCHCeA#Qs0bRj5CP$9m
zm$vfk4}5=e<oPoF;w-6Rymf+8-1xLcL>7adm<r#^L-I*Qozt&x=E$19Eth@qgY-LW
z`)!+lU#LyiT(13cr_#qe6}+e3-}`b)SI%@*W`|OY=5r;5xCFts1&+qY?s@RPi{cgx
zJ~b)GA@GUK#EbU}<PGJTk3X_xc+0o%R?$ZBy>8xBXOBx&c#AY`72{{&+nh5elVQq5
zxt~&wPr36B-!G8AGrj4p<N1#)AKbKBG>=XVa^vRGioa17E_cI^|HprZQ;iFkY+SLZ
Rj)8%J!PC{xWt~$(69Ab{{bv9G

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index b7d82f5d5998bc0b61e3a8d6314c52bbe2d1198f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8796
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
AB>(^b

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 7ad000eece434268e4e5e443425f4a68f11eb05a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12531
zcmeAS@N?(olHy`uVBq!ia0y~yU^oE69Bd2>3_*8t*cliMc6quuhE&{o8_QlHa#bvD
zLdm7-O`h9QH=o?5qR_M;>1Y?Lp!T95k)vJwBHT(`W@{EKI20T>|I%y^?!Bx`nhhlr
z;+*swxBPxLbEmM{?3-uLyvy12^xXHm`HCmE?fh@~{r`E(?=h`SabFgR?|tE_Uv;q?
z!8|>cTT?{$L&nea@9)A7M%>w1tgYExEw_hlkJ#SDUp{3_V9vO{JyZBV<2By*NB8jW
zVNX}MV)5c?j$ACy3C1-`(~3(vk1o11W&ZlZ|IP9@McsaQ{PoAjy{TcZa}6Hcf0F)o
z#{Pr#+~*sgAIk19<;xQJQq+B&wLklPzCplYg8<W|m6h9bPMxjYbS0~nz4_O1qwZ8b
zxz!(TH2tq<=nt+4c@Ws?&MUXILcu8O<aw==_va+dV?Li6pUk&MZI9V!xgUEU*go9*
zwpQ<-mSg&)xJeG@8;^f0uMS!DVAG#JIXuVMPZbrnKRW*ZVPMzsK&FHz8B@F@diR9!
zR-O-fX1rnk)4CiHwjVv)=Fc`x%HsJ_^x|bMBh!EOfW!jZzP%qZj!8$aRhMPhEcV}*
zm#x6GM`(5+*M4C`ua<e;?3Hh$*x%PrS|hReq4D8#@n3!=sSCpArf>QBWkzv((yWVu
zFWBU|4JP#6{`idH)T&F`2iCPV9_+efx#Rmoo~7@MIi!yi{@`n|Ds6dx?Z)@z)8#uN
zo!FzU2(PZJlr;#rcYHx)_i<H51H%Mu<%Dwc3v*3)47jS<81HB5*0}#zS5v54;{W35
zVw3j&#sZUW81L(`{1U`?;rf+}eEckXBAOrUb7oFHa9?tt^&RHhp^cZ6<(FALcxo1{
zW1hPyN?kxv^TpG>ydRW!7PT$*HoN~*;|})@^*^Ewmz3o@pMBVAtDLs>8dLPcSF0C@
zC-Q7-l6rUcam`wX#qM!_rDZY2zAS9tiz|}4S@+a#HNPZnnHdz@vhv?v&0}9y*qgO@
zc=hh_xl{DNT}6=bU)t;z;m1G!h<@QSbv_)LXne=H?oe-6D*w};ca|Jb7Axydnz(%)
z)BQ^471LK9`(8Bp=qHZ<a>2C^8sp?&WqxQmyP2`hly%?bwt(EtN@tp@eZrafcl<bT
zf7bNrPMhXWubj*(H@_*8FF7Hc<=wuxwrbw*F&TO<t{#coe<Q0lY4X)w$Ju^ddAz${
z%J947JIg!OyQEAEuRs5{S5;r1+5d?ApA~)ftwysgTTb;${bejxG;#k@B>Yr!V}#r>
z^M3+Mt>v7%`3}wr@Oq+l>TsoKhxg;ze|48y&-3j5@T2dv><8uIFOwQS<rvJip7QkB
zw1D;RKdyExTzIlXcd3g}(7a1`?(F+<Y~JIBc(=X#j!z4p5cILwH7wiSt22hhe#t%a
z$hGqW*T1h_&3Gnw<5jCy{;iL+vRM2Y>Ze|mXx@9OWcDptE~EDnSLX<dMCur)z5H5u
zg+rxbzlOT|aqZNG*`9}I$9Z&GEN^`o5a<{dCT7Yccyg`M=AFFz3U_PX|K6)1IMaE{
z!K9m;HPn~O`p&ZCD4rIfWBzz{X-~ucNkMY+FS1TO!qKN|EVcWBfhPZ-m|jb^`tX{`
z=Yl`{-Xl0CKFi4V0ITJnYaA8x_PcJpT4kTf;i_y~C!l!9Wc#86DODbh1`npYIat(l
zzxnxo;e+q?$`S3o35^$T_$CJ5c@h3VKkaw&yu}Z``zvdh%sziU)wJ=y1S9*uuVUVI
z`#9Y-e*C@8@t|<)&6<+5va;&^228Up{`+ZFtTZ?#BC*zJcDetx*SvOf)gL&`J$?4s
zi=ggQSyp@58s&&-lQ$>s@e_YPnYCn3nUwB_>GPa2`DOnwMra&z3rH|I7ck+L;{42m
zhqwzJk33I~tInVGaB1^=!*!AAW{ZEa9iGk=_nkAo>xa$J_q#pS=kYZbWo@~Y;<S15
z=HI_tG@c!Z&oGJWb*!JIowr!nuU*zQfVV24^<u>{|GoPrhf6c6r~JG0Qt5-Z_M$!a
z&pz1sD{IT=nduk)Jv@Bz;CVae>bPp&+}GE5r#^dL9a~YtY}VxJmV8oUsgc{mUf&%a
zz5d*7zan(*2Yv8naJaoK<Mi6?i`IU>+rG{I6UVKKo7HdKTg?9J`8n&ro2J(nY~qu>
z@b39M=im1#*>me(D280yXM5}aLG~Aq=Gm^;wTLM+JZ#adRazmnFNIcF)yvJ*)p4=@
z{Uwp-$n2g3-D}LnJZ+p@O{(iJF+cgxDt1)uvh$Sh-7`Lvy_Gm1|L03^$*u(qu{Soc
zhQ7JmttV^OqbG0QrzdOEq4(}a<GFQ_&3^i^rx<oG+a(qH=3cMgnOUu?^x|AhO-;*=
zKTSS<q0g~7z%y@M_{+wpZpyQ!&Ai#|Ij74)_wwWw{@tbpXO<t`)c^UP$csbFdn$fT
z(bQQX+i>G*;l~q#AtnF+Zt%UB9oE=8gG=|!IXjEE_3h3!Q9NHuY!5^)i+Ut&J26O}
zUASlG&vkWwCHVR8-I@EKo$<<wiX$9bB!atp<EF?nXqntjm~rGZ|CSFwR`^f6daJp7
zhD`7G;syDa*`~%;>)z_J{kT7WZ>yfH#e=d3pO1g*6uxNkCiEaj*IpHShW^tAqO)er
z{5i$lz18B?<_jraM;6?7TgjiF@Q!zZy<sxjDx2bEo{s0`e?L3xY`h_3-lWNoZQUFe
zIejiFDyv&|by=m3sM1^ghF?94Vr5<h%XU1AxwCb(=Ze0?ft^P`Z7h9#;gop%mvvJa
zk~xJ^jCtGMGbG2X7WLOD+}E~!?Zx$r?Pgn*I{j|vP2OYYQZP&S$F|2pajjhKJdT$)
zFg6HQIESp5ah5mcN9gLkf*Z`P1ut@n*(0yB`AE`C$Cdq}xv%fZ#@^X^d9g#jwU*yp
zC+^*)&Xf1H@D=W4+{1O|a76af4^!?iJp8A7JyPfHiVvyB4Ry?B&wke->H2=}aft&V
z`UXsX0{X|ADi+24U*h!O&huwl#d(HaD|rsys~7$H?~R3B=A`4z^2dH{zn{i)AiIYl
znOn;(U6SYZ{Jw7P@DIDXOisI2M4aXgdwu!J@6D+^yQ{vtiEqpMTJd52?fvq9Yk$8j
zWn*aW=F9!^Ae4bg+xvsohy82TOlPQe?mc!O?d!kAy~nQoIGp?8yO;lpt(G=bCc9$d
z-raoAF2wam@;Z-9$FhVCpLq{RhcR_<tWDl}VA=Camlw}W+WD-5tMFd^+>=kf-;;Nm
z+rICQP-yIq2NxgguX!hP%e-7qtK!Q=wgci(oL#mRq6u3X{Jt9{Y&faxH0S&Kr9rI8
z@Aluizw>_?kA^?{|A$XcU)*E;-sSSGErlF)`3sy=UAWI&cx_&y61BiHoN-cT_Rco9
zI*C`ocDb|MoA>Wp#kIEbZ)xCx?`&2_TwBB*oi}e>E0%jR<z`~so&BQU_%{E&`}=?K
z^;o&-FE%~>Q=NX!#d!VRuuY5=MzTz2)*hUn9Tav=spsecwbR@Mcj{+eys`0JLYBSV
zJdqdvPdkO>*#CI>oa7S|Sx}n4|E<Xn+e+1jHwHQL=S-g)`*W?=)uktuoLaJDLsPca
zIe-5Vb+J!<zDsEO`KmdLQ>IT_WI5M*H%pD8@`nwf3#wXAw$xpIUC-pRE0(?BPW`U1
z*=@QX?i=MPZ<d!naBW@e#iMt3+xC4E;gxP%mQZjamEq2ZB~uwTu>WmIOHGxnF*gn6
zzwzevxefuthSdh&Uq!3ebt-(ky=eREb<XKw>%K^Qh_|Ve`TP0r_l&5zeQzFoH?ca>
z>cagY{a4`XTG<UR%?y2<<{L0|=}z0Z<;}xWH@;tsKFjxKRTtNm_v`mxxU_tpkWazS
zRe~Rmd`Rj!E5KU)!p(bo<^M`H<~a{bkKI3-zt?leGpUlQlR}Z)548N|r8wxi<m=71
z?>{GN(cqUb@4r6V-?oQ`FW$MG=N$Yoy-@vwt)YK_o7d9+=g!%gdoA6?Xz)r*%7w*k
zwbSNGgSFqqFED+--+yjh^zm(~g<JjDo2y?MpI@N5w`$>3W;O%E8j00$m8`n2FSF~`
z{VCk?;9j-lL~Bw1y5Pop!Qo5?9tABH{JZ3GFGJ5My|#9tUzZ(M@*IpWE0p|wY|G)<
zXK&P8_FYkPNoARO|K<nw&8%N%U5_ia?wwezs*#sw7{l@1dwu-k?#|8xr$t4V6#D+1
zx%ztjvM<X8^RKLvz4h<I;TJFZ?T!A{xTI$3$GchA{q9|Pac1q`uX&yKei+F<Dq<=&
z<dvE@t7`HalMa>rQESa+$E$u>e(nBZ``*4iHe24m-7Z<sZP@Vj{hr663%;vZx$N@3
z?$mhad(>Nl1FLdai=5ZH)H9h!=on|di9dAhMBZH&(UXjCXO@4z8<)#)*0)_jlkMVy
z`(J;##+Z1BNgcU3KmKc#FXziIZoCdL+EbbryBXG6$+qg9_V&84>E7PGecvi>c`?jr
z@hdXkw26;5NbBsTiwb@Jbk3cuoG|^*qCfF2Q(ttxy!^U6*`kz7Hg@;4l^1XRJFUOs
z!&&o-YhJH&p8WCBTkZ$>=QeS!oB!g^o18C8qwY!@ye`TW2)WLiTK<52o$+k<OCOdW
zVUc|Hbq?E#T_v1rtA3`=XWF%VsxO1t!tOgPYrjPw&`G$ylq+!E2j2b%O5Lf7y!BrG
z6W&S~GQFK`%r43+tF_aHG2^0%&N59|Awz?|j8ZIXgX>P8iD@;wJxjAUL3W4tpZ!<)
zqt^C)s(*fr?Z%FWEc^ezo)&#!+Q#II=j{I_Y}#{$<H$>f6I}j>tsY#x5~7`OT~*d$
zo{YiugcnYH+ni1QMBYCv|MOpUNzp;3FXx^4Z@%5Xf1<=e5yLq7W>%Mvnd_!1$t{pP
zl9&4BxeX&{yHljgS#_<eha2v`(|ge%c7%Z`e1;FR=Kp+)GTZMmtE|fV9{zBjuIKvN
zx^&a;?FK)&r3{%CcsNYeld-+EKrf^6{yq~cl_oYuw}n<EJz>8Y6Q(EZXbt}O|C~-e
z*RegX+)w?NZnNa?mkbVPDF64s(M108w9pD68A(R>_5+vCAJ9G#Z+^Gs+1*m{s7ssG
zZy6`I6)?)kZQ#0K(`X^PLFoSDk5;mCGzEAh%CzJi=3UX!*3*;We(>}PL(U8T-``$b
zS>zhNOK(j?W7?znzK198k@9c3pmO*o!*Bav9CL4OWS(nZ!Vzmx)UxvadW*uQ%!t=3
zW{E8FWaYPiW9+u!VlNwmta9De*Vna`m6AmCBp53GGrTzI$GXAc;cZ^?1zokjU+vPH
z(kIorY(m99o<AB}gx(zfvTWDH&wFHgZ7(lh{4#D0>#QceLZ=EXu|xjLm!vSZ{eJXt
z4Flht6oZ)V_%AZP4L5Vz-d|jNF4?)(?#rEr{+~*0!ansd?D^kX|F3ZE+MhQ!`*d#6
zf5LIcwS7m+4V~tPf2_Tp$~GjXw-j_Q)Cx7I<B6Iv_il4ueU1fR&5uM`gMKkFu4zUL
zvQdmB9IspJ?^i6ocv<Es&kY9SrIOznDt>t#aBWgh{?qDpmEYh`SCFJqC`U1yz@8%+
zHLcrhwlB0dzkg=V{?ixa_i*LN7#^xiVSgcTjV*nH+l1`%>-94jw@>xmFmXXt2TSeR
zFz3{a4Z&;$?SA4cp{3fr$IfT`{XaE0{=nqJ3$OgqJI(!W|NVz5`tPs%Uwb?0|GAl$
zm)w@$yDF!t#c83+BkSI0><0`EZZcucILy_)!D;f#@_O+D6F%I!yWiewb4_LQ=Nf*8
zNv9k;nN>D?(~nT7zP!4X-{!$&){>*2Bp8a9-KgJs>t;h@Q|d>y3v<{0Z&cr^XEa;f
zK)d1Qo9WsNZ{9Vn@~gfrbA9jEX@@&o_wIh~vBl%u#_UfiCZgHgSuBU7pC)!cahaQ^
zdaQtDvf#8${xeoHT-6YnD1GLcQyS|BW#)#m=g}M6b&o5owyC|PSIcO}*Qw(^nJbr*
zUpH2({{Q^s<5IcB@77l`88m#YQ2pV%T-!TDLuf|NhA9CWh7AkEA3X{(i_(eybBtkw
zdu#982@lr_Tzt!`WR#?3v#|THs)5SPUIwnGHL1$IbF>*Zh~AL-+#a`obGAzh-v*td
z3{ewyWL}8&N`2<Gj&+f|#DR0m=Zn?O)1RUvlH{n9<<vO+5TlgRH+Jt=vL%mN&Sx@O
zeq!N?O`n{|F5laKo>j+N@X#Dami|i_XO4=U4y-q5@HM{^Abv~4c)^rJv%0<;oOA2G
zUVU+5Rp_Sg40pdipKrIEHD;;voVdC3riR|rH{Hsduv1+6ns_<`vj@kQ(_g-r{b=?3
z+058*V{eP2uBzhIghM@UZJ*EY{OIPGwdu)8b;-jMzg~D9yj&_};orG@jA4q>HkT7D
zK05^kr61T7%w`a_bQjzH3qOPG4I1j%`Ni&D<y~>+lz4oOK_qLx?J<!ZjQ8U&?%)4_
zPd_7BW4l<x-=p^~d92oaA&}0nnYXQ*Sy(uKVh+QTe&^$vTdya%#y;d{J0O#%D^#$2
zTW<CSZ|+mV-~RsnKK0LmL#<7#83GnIcZ;8%CDEL6XA!&nmzRH!28A&l(AqF<KTn(Y
zdUf^td=c;T6s7MpE$MUKAHI71;Rox#urpi4M`=kF>{j>Bdr-L0hVjs%KmX<x=kE=*
z(7Li&T{+?D6{g$&e#g(hpQ67lr^&d%^5)IZ=1G&@G3k8w_2d-IX3(`{mN+bRAT{2+
z;p|-N>u=u(882YnnL8!@`<0cvi(Fo}@d(cI_%ly^d(On~99K4{*G6%BXwH5h>G1Tx
zFE)j&cn5E%#zSt|CUXsb=>OWq_@?e(<wf4y^Z$P9&$_rSb}#48-QMD5&fRD4zng1&
zJMa6my_?fc)(NS|^cY@s*K&<r=v>N{U=Xrr)|3+UgqZ;fg=`N0EZ%(X>ETn|r`MF2
z{doKRu4hlIH-tU7EdSu=|34p^@A??#REx|y@~Gc_S}f1uZD;o9@4u@b#^~;Lpz}dw
z1Pi~1#}3{NHT_dW8;l$JFI~DdEkZ}V_9jEZ;!`i1m<kn-UtT`*-=A$;?KWuLsP5bQ
zxl&O@>v$y7w&d48KHANcoi<7R0Z&3z*tM7UIy=oh%^J?NFzuZ?E9)p*!Hwyk8KO4?
ztbH)m+`8vq&fTuGvKImQLT0spO`YxE*rwmVv$N@`&<4S{cXJq=FMfOH`uY9N<N3SJ
zbFO8HQOb!5yY_M3$B%OvPRlL{P&mgB=jD0wR>H<NA5)oceEjivk*#5X?7y?^J_X5B
z=ZW*li|K^VxVlo<N=@;zP84^7R{C$tzp1Jk+caBeEV(YfLtk%QZwm7c=Y<U}5jW-r
z21>f7eNKxvYiOQdqojAL=$(w#fn$fB|2yzldhPpz4K2K%op?7aSaMUA{h6b@qJcrZ
zNmK6;h7FJ1_NS%2%ecR*)GT4=W+y?NTMRqS8dMxvzd7RCuQiMbj5S5~YyuZpZOfCr
zeR8ID@w*#=B^ttfn}u&3WR2FmTbh;f^7;JVy<!`dI&Uznv#t9Rxm^3GgdeMpv}l*Z
zN;ZZ?ig~6t1s->^F?{^beS2Fc)0JiG_pQ2qtY&V@;y^_={`PyO8gnb22yT}=Ff(@d
zo?XjVXeX~c8N%G2+H*ZC(b>l)VP-<q6h?<_Yo<<oyH0xhp^QIQ!^>OVzPKqIYggtY
zvf$b6IS)3KKlAaN8MWg2#@>t0kuFPl<|@5;$|`36vE_baz0hu<D`yV&-(PWcGs9t)
z(`#L(I~B-2{E+<S(40B`wWYx}m-ojnVc3=%yf60<%gN>TOu3up8d%7jmwgx@k@Q{r
z$1KJK+W=$7_3rP}Q+n8Wgmt`)8dkqc=%3v)GtYqM%hhcfPtDYKSV(d2E?r%|SaDOZ
z>PL$!SJ&^;(r8;)^yS2<sf+loOg8!_X?`xAcR^WBnwr#vSzNqD$$6c9eJammI?Nl+
zef+o~$L0T`%eHPj2ewNkCo<L)KKHwr5cPZh|0}yMPI$<gsKYuTKv!!=CF?iA2Ui*I
zF~@BVI&!co>Da%YpZ^9jUvYBD=<y5x?c;TdyWwHq8!m;j3_6{i0<2w9%R=r2_?%<=
zw)9$uLW8Vq!u1F~2DAMR6~SD!f|s2+N)Fy~Y!0X_G!(vEew0DM>*?v=EG*#-Z{A2%
z$Sl1$XRp24x3~ia7a1n;EJ$Vlw&LW8b%li!cy7PVp18nv{T?MwpMd-JdvkABnM)h3
zn{;ZH;R0{F-)la09y!L^wxQ?%!?OU}^j0I4m(LQMzZ-Lfd`>SjlUjLE<^(Ty^WOs#
zHFI1xFP(DFLANx=h^NHiQ`Y26LkWkC>rIXyGI_GXMKC%p>K22KK)QX;&fQb4TW-vp
ztg@bmbL}BT=L?;ijCQB9TjVUhvA8|{<NuR4Z(iLm#q(lrPfw}D?w1XTQ(IIb<}w!4
zHhxHc^k~i;`I?tC3>k$SvG<mIdpPs{*6illd_NnqI77G`a(2&mxU%e*S?-L>$qiDS
zYh%{h)XS}{da1hKxPdb=GNYjCSIU7rlkSHO={yP!hgUssSs59*zIdWSyuhLV45brq
ztmXZ&BfyBe>(;rB7m7#Z3;tcdb+CEnrBuz;2Sw&Zw23Y>{ChFtah&{<{|XJ+`%j;7
zIlp{K56c@NbvcEr3_o@@?9jjRYF(-I;Ti{y_iygrUU_4;zzl^|kIy_4<5)QF-p1yY
z>`ew5E>o9CFsD@ZuZes6UHVxrtAR_yz6)8}@}2$lLK{{mXVz%9UU{~|$7}{~>oJ>2
z6B0BxMU?&Q60rMo*8JSu3r4xK9`xR~soHY7y6U{VT~FDcf7Z^CX`Cu&T8^C(kIVS7
zb)oL!_1}229O^eP{A1>Rz;A5yt(=2@zu1P^O9NW0vl+rQZ+ZlXh={B;nfdP<r((~+
zg0!1P%Nw|yZd{vvF5|wOY}6)~eS7ylKWA8Kb6edn#jkBn@nPPw?pq6Fe*bA??#+87
zcu8;HssHuI{?vO^SzTdBWhnDxd7+ig!(b6CV40y)SyuMVBmM&8nVWId-%p8!#eDqp
znJ43J;3<Zs*Pg1XmbL0sl-)l2!-?7I(%;h0XX_6BKc4vSe~{NHivv1k4;t<&tW>;E
zHBq5BCB<aL%k`$S+zo%M-V@9I=GA5P(0Nu*OZ3kj-DAtR;qvPrZM=D_U#z(uQv5|D
z*iy@*nT;o5k!`OO<2CNh>-XP#E}Rgbz4dDU(c|{~GfX#~i!NeW5vSsD{2I&A`{JTg
zcc07oRwY}I@Wf+z_xV?{{w(hDiRX3LYKlV2xN=t|eqxExcWB#r@%n-LlDk4Wu8PN5
zWc_RZ`JX-O>%Ti6KJ+z2rYk#qZ80d&SfiBmasOqp=TCgTKD+edl3DJBPD$fAY>zIQ
zX1`kHw9xdF;Gg>P=K1?q9=rGC{VWsDn#gbG?SCH$T<ydp@#uf^rOV<>|Jlz7{kwlk
z@>j5W%fij;>}+iK?3ewSH1lWGN^$XH2OnNL_o<#EdR^Vqsk>(L-IZIFnv<`g#&7t(
z&${KjLiM-Ei%*3XXwTToxldFwiR*#e>yj1zK|)9V2bZjkKI}FlA)RHzS^>TgS64?B
z4Nj}KVv#z>_e^EWt^VM+{3U-%!t)7bFC3JQ9C`3mPIZ1wP=2_Sxx<5bclJd7kxaf3
z(PjVZM0!ud>i<7I7F$+k$Hasm$lB#3c=qvsKS_tVd>!elUmjQ#(%p0H=RFC&yDg5@
zN$+BoAKd=&F#qcV;T9DeZkH8VO0|ct$+$4B^|V0#;VW*J9IJnPcFt_w{$Bdoq51ZS
zzdpOU9n<Ow)J>S0a4qv+yg$1`^-Gm9PtV`3>+6N1{3@a?zA${NI42iUyK&DRzKQ_B
zDz7JYNjur+ux?mUUH-6croWBi&c`MlznrZ9dhhM|cZKQi%h{7YX(pI-mR?g__n|&o
z_P|r-psHl4kPNfxt1As}%T+MMW~n5qtom&9ZOendPwifL81Zh}-0zU(D<poaRj<_P
z%BkoV=jC&Le(pSX@nSi%Tky>Vz7w?n?02+NXj{9oLHPTX&pd52RpW$slcMCUX8wHI
z=k#csvs1K)hmWcFk3@%ijvc$Nf7K{;n&B)l)sRWQ_g~NT*B2jb*>beypNd5^<1GnZ
zuF&>YRj1ys5?iYdxP5a->i6q9Sh$?s?%$22zR#<d`KR;kZ;+1ra<4k?_JMaHdWX_<
zUf-R)(DU3Ly$e=tag`Un4yf+mcO@(Ed`ruA#@VYjY*1<Ke(1mZVZfv)zf5VVS=$e#
z+<NuWw|HjpeixNanO3{$UtS%(cDLdC^n#AI+lLn3V0i1=tYFUg*L&{LDs{8`Z?kd?
zpZ`t#d^%uiR=<|Y6R87gCnH%;yVk$Ds9<yGvXgUg1KZz~mur2)82e2cjC7*T?~GVh
zkZ@7SWbPbR2BpdMOg_bZpL(UGw`8td?IUY^Z0Yqj-=Fs`1axQD8?klY7oRk_p3z4r
zr|q<7z0`#TN3N}PWMA^NyMKRe@5z!|!kGdoHT;L#O2v<8P5#kjrgr4=xwn^ES6=$U
z!rXA4O}g-n?5Ve2g>qA3Wi&KCv`yml`!jE^rP?#c11fB3i|%|`?r5UnwXoyRdxmMt
zX3v{y${WVWvul;mw~NVEcJX@p<!>MCto{9Jt7&_L^_-KhIoTMP`R<7^vB_Mnig;A!
zuc&;(IN7aPjY00&-_`q$KPpd%y2W%rDZ!{q_b&gW+5fJ1cRjplHBVG(mEy{k{%Z_p
zueQw;y;1YHcM{*8ZPK|1O%^-qpO>?pwd99yNbIFsTbt%S+p#Qm1OI_g<px{MZO0ue
zyS}q4|A<(-uF}A4n|*?z-$IYD6I1?VnP`d~>`GkIDf%mt?Xb`$u8`_OY15UHk9XO<
z_s;4rO#6KL(o(rZ27&$h6<-2(D`@_H#65lU)e8%<PnX}Xys|Sn=Gk}mH-FieE*DSY
zkz(j}`O~(e`Jc%OUZ#Z$c{m%lU7qzYGxNNYdYpd*>o)suGcMnZTexVW>H59b5||d;
zPb)Q6JM`+J!i$Kv3l3hho4EGA^kr%3d-d@f_Er~H{Xf4Y>WZ@B!_or@Ssopi-2Uu3
z%J8Z)@lRfW;w&~Xi`xkiTNlm@Z`9p>x9!~8czx{yW&SfSDZFHvef|7SfvBllU8*jt
zwX^0bO!4>5`2S+X-rv8<@2x!DZnFKm{Q0W?y%N=y4F|6+VcliDx1QPXOvxQCPDbVn
zeBR!#_g_j`mAlR8<sO@olsgulYx$0<weR2x_}9?<B5T$Lkz0DaR;8;PFUQ?}V=yK6
zbl{HihbIKnzDF9XpUOJOVRtnvTfVDbp5?}2iI!*K6W@vK|8}H6Vx!FuhMU2gH*sAn
zUhNR<){+pflfzvS_~oW>llT0(r~n>jg;}>56z=TY6TjcBar5Wz_f<{b7i|$TNar(Y
z7A&|YuVlY|`O>v&_w45;7@V2==z3n7MA_Zr8~%8I&&tX=pK572-FsF9x5Jg^O=p&`
z`+R)c{JJay$q6l!n&WrJ$aeMaV|YF9*a7C>tO{8w$E%r^K6>As=k<=?^uO|zSEpki
zKbpsS=I90yn^Uqg<1Z=(ZgBYXPU`~G{?s(TIPRtyb1q#M;atDi{@;sxYqC8%A0%E+
zs`_N&s**A9>`BvaY$Cf)Ufs*I<@o)wvgJE3Gwf^a<M(=czrpl?%*TI!E~HPEWKeJW
zxw>Inb<Ll*pLyFB3y9@*NiE#V%)Ur#kIrt<6m@^DZ=YH;PA7`5@=4X~u`cU*$*Zzz
zt&)tgRnd|s&bDv1#ogZ{d3NvDYietMN-hhUTHe!D#jqjm@!x1u)gQUei_SzQbsjt@
z^=HP{UboLbi(bs-S3k8QP{8@h^QO(M@j~549vI{-6np05uV5~nken{SEqmy#hDp_i
z1rBD6{Hnsf7xFu9e)!ZH*8NLG-Fg4~H7yGiG^+cQZ*b>iz1LsDs+4^5vBuU!M#gKI
zRe#%@-W1*mRSN7<|70OnR^(p$rnk9UoZEcaq5Hgb*JIciq!X4facw%1J~xL);fc(H
zE7IjteF{|hRbFnj3|ZLVynd@<j*!_V%N_eKXdRfVDRX))Q-r|xs2P)kPX;KOb3EF6
zVWQ)*r7=D#EArfD1bmD<Kkv-6lg|tql3iUdHM;(i^t8=B5Ljt;g_rZCiscIaFTW%g
zUJSV>EzNy)-6oD>Nx4e)XOkFsKQV2Pwx4u&>SWunwg285EpRg8ezZ1r_abf~D}@se
zQ)RziW8r$VPWb-OIZ=<VG+q+0IyQf2)G|?#lB1vzRFlfzyjPnT52Q_h9u)ka#V2vX
zONL}$+3(`gf=xa#J|?rpPxNqeoS47pdVbX5AjQfe=E}+!Pv%(qZvV-`obq?~do!!Z
z35B_Qx(o_sVhI->hn(ZJn~>AIm!s$j$B(ae&6h82b7x`M!tBGknKwU~<Jv5pclu?b
z94cQWI6pc%Cai4x=jplk-??+^ZYTtYWR(B^x58_gu*lI5(E^oDxgIS_I??Jr6V5K~
zvfJ_g_xo7uz`rxoQ|>-t_G8$Vddji3?)a7T9bTm`*S&c0oWWZncxH;fRru$}g7@}2
zF4f@lRc&WyeW@7zeQMO-uS$QGe&7mtoHg^vJ;!DVW`+fh%T2cP{`n=4R1%VVGeLC6
z?>x7dU4J)EWHkJHmFZ~Jq!j`zBKv+cY5pnxS^W5UGowSD3*Rf|qj|MKL3J!ViAR{H
zP2$|<G)wu7W~6}o#?zuT1*i3A&OGhFFS6UK)!_cUCf0(R&*vLI-S<vPK)?NQ_ngiR
zBK3bZM%zo9FJN)<;<z$VBTo6SZR@kWK{9R1ub4U4hfnp=DBZ@?=CSB%a?5%NM;_e}
zA!QEHS2B{7+}D_Yht2lUE1z<^<G9ivtKdKH88Y@;K6rQb%a`V77cN*cS_`iE;Hxr&
z>yybVWtEPfAsVWB8XDZwHeL@3o<BF$ASR~&=cd(F3_S^orcCo+zxy-$V8gxe)!K3%
z9u>R>&Ko8tIoC#M+5E_IXq|D_s<ClH_HmP-rN213leRdv{c$ji<*ecQvt+04tEp4I
zh$g7cdGqBH+pEVNT!w*)4+<LJh#S?f4f<;(Uw<=6rz2MM=oG%n|1%DC-MbYS@x^ZT
zBqLD+p%Y@eS5^kf_b<2W>v}qaMe<?MO@*9enOnQXoKiY`CtcmOODMqV$==@FgTL$7
zUS2r;(xtG3oF`l=dzx$wUn#e8IbKql_41bMmj*4BC4X7wuFEhKmn<^0cX&BrI-gF}
z!i`rCY}vAD%7h7iDo;*+{FgDiWqP<|L%>mu#q3Fuwh3=UBr8w*TiyM()JT$Xsq;Pd
ze;a4cd}06c<?do7rFRTI2{|dBE9y6gRqgWTH;C3qW@1jXp8ay(jT^t!UX}dz>|5Z~
zH?`rC;`)rt6DC`$jBWp3*qRe=E_~3%>R?Csr#i!`hU|^=CQ3+TFde+CthVg;kuztU
zizFFiIc?&;7(J+0R(|a9{Kbpo49piB8`D^4TlgwSaDHo>uslTT$WwMD&m`xgk_VkT
zJNy4Ex+)i?q%6BgyD|Ne9MiwW=B}=`2buSGsaO5{_)m;We&>%xGrT7q6c2M3R<2O6
z+jso@%$dIz=5a9Z*fqtiy+-?%v&Dbu8Q(tG*q_-uE1}W5jP-}q4_Vi?1qVFmo~U9x
zof{$CbNtYZlfpC3nwt1O5U!E0`g!GmWZe4Y%ir%(GZM1c&)R(7>A?Iq+=BAc4=t|9
z5V|3qwA0Gy)3o;{vli{lIkw~4)gHs8&Sz&oWPQ&+J1Q<v%X^cOQeL}d9~Vc1l6kN1
z4&w{g59*7^@hVHpNGL1RT$m&vbm^h=)Kv+~4mMmXmd?tUci=VG?FIGrQ%v{In6=Bs
zN@a=i`On1<`V}QUNPpnYUGz}eajqH%2geEdi4#BGzOqJ#C3K1EmaZ$SkLYbNlw5dm
z!M>F%CnxGvHihdl{9FBp^G{z-!$p?0>m?lD&3^e({{Ot0l@q;Z>|DgX!l2Ch>B^_u
zjP@-L3bmOy<A>!L#WShdt%r_0{!_<aSM7FyGx^1@slpyT3-W_5eU6a%&%G-_*^D8)
zFMVmriM=)QN8Ua7^5yUMBS-i06pNn_+x~PyfVz5x<_}qpWIdNzf=dEY8WRqgUz#N^
zc=4(C)+)>SLYBLw0<2W_UvH24=Wp;-azV(tQ+*vfgrDhjnKCeY78Ne^)4Sz-@cjXf
z9VwER6Pq~Hx%aKC%wM{+cjk)Au?<<5lDd~3yLq+Yl49i^yE#`lPOklKWTf}S%TLbz
zhn;$v@ktrANtR!`1D3~}+~g4?&Sa}lnyBK$;`X7S=FjEDrn7u6f5>9U4fk4mO)EW&
zd6$sI`>zX^Fz&It@{!-i`}QSOwPpNgc+UtvGdBpgGAjSLhew}vf6J!Mgdh=CTZNgA
zXKc_jXxlhN!(2sS!QBmCzRXukYTU!H>3BifMqx|lS?Uv5YWiL;E}S{D=fd0BlRjzB
z>;7h-F7YGGr?N-o%uKImdUuv>Yj28g5@eaUDMHVQ#mVdZOQsJN{YQ>|{pYp%t^w<M
zHf@6miTgK(M7g}2u)}#J<DdNr>-jhSy*}mCBfX0k&mWR0sEI#V#u)ff$#(5YnV=8W
znJj-e0!1E9;!$ndAhliU!NqU9OFyla-*QWN^9L5uO<Pt(o$7LUIidLlpV-a|i-pVb
zcu$_N_*4;eDWm56?T>r*b-Gsyos9XYY%B6dug%jkR^Z@b7lGh&kJhuvE?%^&Zo)*v
zujzaL+2rht_s^IZ;k=-vgVk1l&B>gw|9qF{CTd;%nI0UR{>07o?(xsR0xnH(eb%(t
zM$l%Tzp`!K1=h8mI+mR-5+w($7vJz~ys9AI{UqHkaHZJ)RoBDMskbSVxqi5Ab5KRP
zpZ@^+y#EW`f`3j5+WBSLj2Zh1@*m0_-m4Z9@BU1o^NeTqsqeGfgbEi1{mWXw&&|`q
z;i8w$u~$eqUT$gF`k%h**Uw^aOYrV}Q?l~2x|Iq`jYhQG!iyn$=S<tSEj#AUYMBok
zz1dGCE5^)!|5dq?HFwG<lfV^I_DdDqa_CN1klx}bk<GF}YYU_E0qsMZ<{KMprzQ6~
zI4$4$^~J<q!ylUrwk@>`*u<mgd*Tsa_-gGqFW*?dhWl-cty^9no)@dz|N8S@JKjRG
z$5{+}jHkKC8*%8K>P+fA;H74`-#sSg{lk|pjW<T<waYN&9KLhnGN+GTV>-t^mv*&}
z#@ktbeE2;7Lv2IR(}h}BJD&#yrQJPr?DOYJ8~gq#MlVk6^;P?B)l~KOnJLrl0!?wv
zE_H9?md8e&b}Q03%w1gX{$Cbk`AvIk)$9LXen|<ONeNxC*kg`iLu18iK@$esWfmW7
z58P%x`_pCdO1UW$H@=<u<jMQbA8j`>*6BU`IrB-}vPspaT`O`9&ldS}c8}DJON&_M
z*(LBO_Eeah6FB7TWMwyX%9r^MB_)fGXKrm*OU~!;G!=4lO%2oDZgfS*L@GO1$SLmO
z)8!kO9rxF2L`p2ZxS-s~h|hNZB%|;5e*AEJxHhWvNrQYByZ+3nCm;XhWGZQ|s^#w$
zVVz_UW8p8au~XF1(Zoqb{Y{7AmhQfNzmGn7@=!TsmFpbChJv`(z5m^uy2T`WO@lXx
zKh=^~zserFx#8}$!@?Jg?b~P7bUa~rasTLode4<HUkZ{QwIBQNVVzC>eD3c`J-M#)
z&VK&kCHLX*Nn73}f^zQ{x^8Pbu$Duz<$PM}#@nAiRWwODOuTQWwJQ7nk|hfdU%LFf
zX7R;0KTM53AL7|$b%v=R@$ig8-E$5ozo|ZIpPwKxS*j^iXvgc`H*caU`aNaZw=>!V
zNUu2B-g4DF>uam|<;&$Z^JiH-U)a);`0T@n>dqCZ4f18Gb21e-*7QAI-o;?Yx?fz{
z$wsh9V1L^zQQHoi4-E^MjxFHfdv`}y@7>MoQ%>dEojDO<Atil8JnHSu^BW6VR-CNh
z+0iLcvEgt3m%WK*O~S7Njc=y;WTo8r_jii+;%R%#ngUcCWUF2tP82F=d&klH?2Q0V
z#ha(%-+a8JYNJcO6nh>#XkK)`nb|gMZ6#xPM&G<U%_T+tk2F8j-WQ0PyrWdd^FhIv
zj!037wGE6+TNJcRO!OD*bKG)p!K<3|oSgN?Cr@ho>h1UMZRpaXm(md)eBmok*<Z@g
zt8?UGc2SdHcZodUz_1~}kKuu66t9|KLbD=cJo~Rt#&voPGCQpIsJUd@UCh!yRLy(v
zJ?Hzo?DcFPK1AHG7j3tfp3?f^C2vJ#+q;bm&OfZI?t7*(v0Bjc9WU#?erYE4X*)k?
z)`xmLmS$co&f(j|!}~P5&1PPDuC%O7&0N;cucDKa=hs`<{rjsvdD1bP)ggXt`G4kb
z*|PP9gIQyFUHH;p;?3U=6m0!<f?ewDN5QPppB^?3?#n-zfAIai!}Xud{@pe=HahiS
zr~dM#x(C*qa>i|Tule&q?}u%}ITu#;`18!wcJGS~=gf1@-<0bxKkf0`ods&@d72;o
z9uQc!X|vW5fq%2lL`!aQk&s&Of}5vlp^!wv2B(%dM!EYMJ1(|0Y>BN{9d><bYip@t
zOZ)xg&Ym~Zq$O|K?k{~U7w+!%t)c$#`3L16%s*^ja$}8d|Mus%o96!H`OuNcn{t5h
z!xDqD4tATTJ%2g*WO?_-$8Xm!I`Dn}3c>nN4k3fK3MauJPXA}pESsGeQj@;vZBAu+
zP<#7WYumQoB*t0!$qJL)G%9&3bSr!-a+h6cX5BsWL&dqnpBd--*%b@@<lDA@f78cr
zCaavoTX%&v=JO=BD7gsEJ0t1BwNOY>C2XClh_nBJ421(Ny?@n`6v8ADQyQ*6<A3-3
z&V9j#X7lrk>r)lhuT_7)RQ3H_M>}sW{tp|U7`sn+pTJ%9>g`L_TM|r_vl@*#@>)BT
zw<vW6^n@@SD`D~xWn9^ou5#zZ7Rf*NGfx&@d17jGB751y?;dLJXFAw1KYwU>pm>hm
zgr<3M>!g||I2LHTXe<<c$kGt#5^+o@;h69QHK7AVZHIbAjDFZZ{--z5#(dtMFrCV`
z8lU1GKH2MBDHq4_LFCJqNk=7ec%4pYG;vBeS7^Is&ztD-AxvQ5!M}EMzV9)RJK=ny
znxiomtTfAL@di_#a~4b$ZbB!F#TFj?Fa57L`X-|ltMy)+a|&-H-My`kDY3ko#^>P2
esQ>tD{oc^5j?;1aOBom#7(8A5T-G@yGywpw%<b#|

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71d1767e..874b121f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,6 +74,11 @@
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>
     <string name="login_host_standard">Standard</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
     <!--Main-->
     <string name="main_account_picker">Account manager</string>
     <string name="main_log_in">Log in</string>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000..418b6d4c
--- /dev/null
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+        <exclude domain="root" />
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="file" />
+        <exclude domain="database" />
+        <exclude domain="sharedpref" />
+        <exclude domain="external" />
+        <exclude domain="root" />
+    </device-transfer>
+</data-extraction-rules>
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index e52ec3ae..a31ef517 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -90,14 +90,14 @@ class LoginStudentSelectPresenterTest {
             studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList())))
         } just Runs
 
-        every { loginStudentSelectView.openMainView() } just Runs
+        every { loginStudentSelectView.navigateToNext() } just Runs
 
         presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
         presenter.onSignIn()
 
         verify { loginStudentSelectView.showContent(false) }
         verify { loginStudentSelectView.showProgress(true) }
-        verify { loginStudentSelectView.openMainView() }
+        verify { loginStudentSelectView.navigateToNext() }
     }
 
     @Test

From 5d5dfd4eb4173ed6dfe45b838592858e1ed3ec04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 18:38:59 +0000
Subject: [PATCH 191/429] Bump mockk from 1.13.2 to 1.13.3 (#2067)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index cf7223ba..76306c1b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.4.3"
     chucker = "3.5.2"
-    mockk = "1.13.2"
+    mockk = "1.13.3"
     coroutines = "1.6.4"
 }
 

From 083ca34f1b6f1bb14f95b2444e4ec8a74f9f12e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:32:46 +0000
Subject: [PATCH 192/429] Bump hianalytics from 6.8.0.300 to 6.9.0.300 (#2069)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 76306c1b..0dba0145 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -249,7 +249,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:21.3.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.8.0.300'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.9.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.302'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From b93c0222a29ace3d0d8b9f04ff5a90f6960b56dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 5 Dec 2022 15:44:30 +0100
Subject: [PATCH 193/429] Fix conference details strings (#2070)

---
 app/src/main/res/layout/dialog_conference.xml | 4 ++--
 app/src/main/res/values/strings.xml           | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/dialog_conference.xml b/app/src/main/res/layout/dialog_conference.xml
index d08edf4f..b6e811ae 100644
--- a/app/src/main/res/layout/dialog_conference.xml
+++ b/app/src/main/res/layout/dialog_conference.xml
@@ -40,7 +40,7 @@
             android:layout_marginStart="0dp"
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
-            android:text="@string/all_title"
+            android:text="@string/conference_place"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +71,7 @@
             android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
-            android:text="@string/all_subject"
+            android:text="@string/conference_topic"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 874b121f..26ab51ef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -422,6 +422,8 @@
     </plurals>
     <string name="conferences_present">Present at conference</string>
     <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
     <!--Director information-->
     <string name="school_announcement_title">School announcements</string>
     <string name="school_announcement_no_items">No school announcements</string>

From df5155f1c78d6a59fa3ccae91fbe726f454c4b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 5 Dec 2022 15:45:07 +0100
Subject: [PATCH 194/429] Fix a typo in excuse message subject (#2071)

---
 .../wulkanowy/ui/modules/message/send/SendMessagePresenter.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index 5ab8f8fc..e776e994 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -55,7 +55,7 @@ class SendMessagePresenter @Inject constructor(
                 view.showMessageBackupDialog()
             }
             reason?.let {
-                setSubject("Usprawiedliwenie")
+                setSubject("Usprawiedliwienie")
                 setContent(it)
             }
             message?.let {

From 217ebfc5492d12c46d580494b0226a75452296b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 14 Dec 2022 22:41:57 +0100
Subject: [PATCH 195/429] Fix app name in french (#2072)

---
 app/build.gradle                         |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0dba0145..3f8830dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -237,7 +237,7 @@ dependencies {
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation "io.coil-kt:coil:2.2.2"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
+    implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
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

delta 8722
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7e66b5c..f42e62f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From a735c378f1359919d1d46c28317317b574da2d2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 21:42:21 +0000
Subject: [PATCH 196/429] Bump fragment-ktx from 1.5.4 to 1.5.5 (#2077)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3f8830dc..83fe72f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,7 +197,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.6.1"
     implementation "androidx.appcompat:appcompat:1.5.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.4"
+    implementation "androidx.fragment:fragment-ktx:1.5.5"
     implementation "androidx.annotation:annotation:1.5.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From 4a5991ade476e280e3234ba1d2fb1f4c6286074e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 21:43:04 +0000
Subject: [PATCH 197/429] Bump hianalytics from 6.9.0.300 to 6.9.0.301 (#2080)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 83fe72f1..378b9db9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -249,7 +249,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:21.3.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.9.0.300'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.9.0.301'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.302'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From fba4e8531195b7cc217692d46a2ae50521556eab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 21:52:41 +0000
Subject: [PATCH 198/429] Bump firebase-bom from 31.1.0 to 31.1.1 (#2079)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 378b9db9..a61f0f79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -241,7 +241,7 @@ dependencies {
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.1.0')
+    playImplementation platform('com.google.firebase:firebase-bom:31.1.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From f1479d489b94d87960ad063afdec35d06af158f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Dec 2022 12:28:26 +0000
Subject: [PATCH 199/429] Bump play-services-ads from 21.3.0 to 21.4.0 (#2083)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a61f0f79..8ce6de69 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,7 +247,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:21.3.0'
+    playImplementation 'com.google.android.gms:play-services-ads:21.4.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.9.0.301'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.302'

From 277ffd22be786cfa429ea1d61827e8cb62d1ea56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 14 Dec 2022 22:41:57 +0100
Subject: [PATCH 200/429] Fix app name in french (#2072)

---
 app/build.gradle                         |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f6a82ad2..fdb844ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -237,7 +237,7 @@ dependencies {
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation "io.coil-kt:coil:2.2.2"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
+    implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
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

delta 8722
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7e66b5c..f42e62f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From a26dadb224e04523ce9249a53c9f792473b3c902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 5 Dec 2022 15:45:07 +0100
Subject: [PATCH 201/429] Fix a typo in excuse message subject (#2071)

---
 .../wulkanowy/ui/modules/message/send/SendMessagePresenter.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index 5ab8f8fc..e776e994 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -55,7 +55,7 @@ class SendMessagePresenter @Inject constructor(
                 view.showMessageBackupDialog()
             }
             reason?.let {
-                setSubject("Usprawiedliwenie")
+                setSubject("Usprawiedliwienie")
                 setContent(it)
             }
             message?.let {

From c34c63c128d50e6ef2ffecbf234c125e2f042289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 20 Dec 2022 16:06:55 +0100
Subject: [PATCH 202/429] Add support for new ADFS light instances (#2084)

* Update known symbols

* Update resman host details

* Add adfslight from tomaszowmazowiecki

* Bump sdk to 1.8.2-SNAPSHOT

* Add migration 54 with tests

* Close db in migration tests

* Run tests workflow on every pull request
---
 .github/workflows/test.yml                    |    1 -
 app/build.gradle                              |    2 +-
 .../54.json                                   | 2439 +++++++++++++++++
 .../github/wulkanowy/data/db/AppDatabase.kt   |    3 +-
 .../data/db/migrations/Migration54.kt         |   26 +
 app/src/main/res/values/api_hosts.xml         |    9 +-
 app/src/main/res/values/api_symbols.xml       |  666 ++++-
 .../db/migrations/AbstractMigrationTest.kt    |    7 +-
 .../data/db/migrations/Migration12Test.kt     |    9 +-
 .../data/db/migrations/Migration13Test.kt     |    5 +
 .../data/db/migrations/Migration27Test.kt     |   12 +-
 .../data/db/migrations/Migration35Test.kt     |    4 +-
 .../data/db/migrations/Migration54Test.kt     |  130 +
 build.gradle                                  |    1 +
 14 files changed, 3150 insertions(+), 164 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/54.json
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration54.kt
 create mode 100644 app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3def0895..13875078 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,6 @@ on:
     branches: [ master, develop ]
     tags: [ '*' ]
   pull_request:
-    branches: [ master, develop ]
 
 jobs:
 
diff --git a/app/build.gradle b/app/build.gradle
index fdb844ac..b0865896 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.8.1"
+    implementation "io.github.wulkanowy:sdk:1.8.2-SNAPSHOT"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/54.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/54.json
new file mode 100644
index 00000000..7b41672b
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/54.json
@@ -0,0 +1,2439 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 54,
+    "identityHash": "1dc96a366125ec9f8567da87cdc9c863",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalKey"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1dc96a366125ec9f8567da87cdc9c863')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 792611a8..cfb53485 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -56,7 +56,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 53
+        const val VERSION_SCHEMA = 54
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -107,6 +107,7 @@ abstract class AppDatabase : RoomDatabase() {
             Migration50(),
             Migration51(),
             Migration53(),
+            Migration54(),
         )
 
         fun newInstance(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration54.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration54.kt
new file mode 100644
index 00000000..678bd32f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration54.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration54 : Migration(53, 54) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateResman(database)
+        removeTomaszowMazowieckiStudents(database)
+    }
+
+    private fun migrateResman(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            UPDATE Students SET
+                scrapper_base_url = 'https://vulcan.net.pl',
+                login_type = 'ADFSLightScoped',
+                symbol = 'rzeszowprojekt'
+            WHERE scrapper_base_url = 'https://resman.pl'
+        """.trimIndent())
+    }
+
+    private fun removeTomaszowMazowieckiStudents(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Students WHERE symbol = 'tomaszowmazowiecki'")
+    }
+}
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 8413d68e..a2a08db6 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -6,8 +6,9 @@
         <item>Gdańska Platforma Edukacyjna</item>
         <item>Lubelski Portal Oświatowy</item>
         <item>EduNet Miasta Tarnowa</item>
-        <item>ResMan Rzeszów</item>
         <item>Platforma Edukacyjna Koszalina</item>
+        <item>Gmina-miasto Tomaszów Mazowiecki - System zarządzania oświatą</item>
+        <item>ResMan Rzeszów</item>
         <item>Rawa Mazowiecka - Platforma vEdukacja</item>
         <item>Zduńska Wola - e-Urząd</item>
         <item>Sieradz - Portal oświatowy</item>
@@ -27,7 +28,6 @@
         <item>https://edu.gdansk.pl</item>
         <item>https://edu.lublin.eu</item>
         <item>https://umt.tarnow.pl</item>
-        <item>https://resman.pl</item>
         <item>https://eduportal.koszalin.pl</item>
         <item>https://vulcan.net.pl/?login</item>
         <item>https://vulcan.net.pl/?login</item>
@@ -40,6 +40,8 @@
         <item>https://vulcan.net.pl/?login</item>
         <item>https://vulcan.net.pl/?login</item>
         <item>https://vulcan.net.pl/?login</item>
+        <item>https://vulcan.net.pl/?login</item>
+        <item>https://vulcan.net.pl/?login</item>
         <item>http://fakelog.cf/?email</item>
     </string-array>
     <string-array name="hosts_symbols">
@@ -48,8 +50,9 @@
         <item>gdansk</item>
         <item>lublin</item>
         <item>tarnow</item>
-        <item>rzeszow</item>
         <item>koszalin</item>
+        <item>tomaszowmazowieckiprojekt</item>
+        <item>rzeszowprojekt</item>
         <item>rawamazowiecka</item>
         <item>zdunskawola</item>
         <item>sieradz</item>
diff --git a/app/src/main/res/values/api_symbols.xml b/app/src/main/res/values/api_symbols.xml
index 6f9b1739..4b61db48 100644
--- a/app/src/main/res/values/api_symbols.xml
+++ b/app/src/main/res/values/api_symbols.xml
@@ -4,13 +4,11 @@
         <item>Andrychów</item>
         <item>Augustów</item>
         <item>Baranów Sandomierski</item>
-        <item>Bartoszyce</item>
         <item>Będzin</item>
         <item>Bełchatów</item>
         <item>Bełżyce</item>
         <item>Biała Podlaska</item>
         <item>Biała Rawska</item>
-        <item>Białogard</item>
         <item>Biały Bór</item>
         <item>Białystok</item>
         <item>Biecz</item>
@@ -18,11 +16,9 @@
         <item>Bielsko-Biała</item>
         <item>Bierawa</item>
         <item>Bierutów</item>
-        <item>Biskupice</item>
         <item>Blachownia</item>
         <item>Błaszki</item>
         <item>Błonie</item>
-        <item>Bochnia</item>
         <item>Bogatynia</item>
         <item>Boguchwała</item>
         <item>Boguty-Pianki</item>
@@ -45,6 +41,7 @@
         <item>Chełmża</item>
         <item>Chocianów</item>
         <item>Chodzież</item>
+        <item>Chojnice</item>
         <item>Chojnów</item>
         <item>Chorzów</item>
         <item>Ciechanów</item>
@@ -58,7 +55,9 @@
         <item>Dąbrowa Górnicza</item>
         <item>Dąbrowa Tarnowska</item>
         <item>Dębica</item>
+        <item>Dębno</item>
         <item>Dobrzeń Wielki</item>
+        <item>Dobrzeń Wielki 2</item>
         <item>Dobrzyń Nad Wisłą</item>
         <item>Dolnośląskie</item>
         <item>Duszniki-Zdrój</item>
@@ -76,6 +75,9 @@
         <item>Głogów Małopolski</item>
         <item>Głowno</item>
         <item>Głubczyce</item>
+        <item>Głubczyce 2</item>
+        <item>Głuchołazy</item>
+        <item>Gmina Abramów</item>
         <item>Gmina Adamówka</item>
         <item>Gmina Aleksandrów Kujawski</item>
         <item>Gmina Aleksandrów Łódzki</item>
@@ -87,14 +89,17 @@
         <item>Gmina Bądkowo</item>
         <item>Gmina Bałtów</item>
         <item>Gmina Baranów</item>
-        <item>Gmina Barciany</item>
         <item>Gmina Barcin</item>
+        <item>Gmina Barczewo</item>
         <item>Gmina Baruchowo</item>
+        <item>Gmina Batorz</item>
         <item>Gmina Będzino</item>
         <item>Gmina Bełchatów</item>
+        <item>Gmina Besko</item>
         <item>Gmina Białaczów</item>
         <item>Gmina Białe Błota</item>
-        <item>Gmina Bielsk Podlaski</item>
+        <item>Gmina Białopole</item>
+        <item>Gmina Bielsk</item>
         <item>Gmina Bircza</item>
         <item>Gmina Błażowa</item>
         <item>Gmina Błędów</item>
@@ -104,7 +109,6 @@
         <item>Gmina Bobrowniki</item>
         <item>Gmina Bodzentyn</item>
         <item>Gmina Bogoria</item>
-        <item>Gmina Bojanów</item>
         <item>Gmina Bojanowo</item>
         <item>Gmina Bojszowy</item>
         <item>Gmina Bolesławiec</item>
@@ -113,10 +117,14 @@
         <item>Gmina Borów</item>
         <item>Gmina Borowa</item>
         <item>Gmina Borzęcin</item>
+        <item>Gmina Borzytuchom</item>
+        <item>Gmina Bralin</item>
         <item>Gmina Branice</item>
         <item>Gmina Braniewo</item>
+        <item>Gmina Brańszczyk</item>
         <item>Gmina Brąszewice</item>
         <item>Gmina Brenna</item>
+        <item>Gmina Brok</item>
         <item>Gmina Brzeg Dolny</item>
         <item>Gmina Brzeziny</item>
         <item>Gmina Brzeźnio</item>
@@ -125,13 +133,14 @@
         <item>Gmina Brzuze</item>
         <item>Gmina Brzyska</item>
         <item>Gmina Buczek</item>
-        <item>Gmina Buczkowice</item>
         <item>Gmina Budzów</item>
         <item>Gmina Budzyń</item>
+        <item>Gmina Bukowina Tatrzańska</item>
         <item>Gmina Bukowsko</item>
         <item>Gmina Byczyna</item>
         <item>Gmina Bystra-Sidzina</item>
-        <item>Gmina Bytoń</item>
+        <item>Gmina Cegłów</item>
+        <item>Gmina Cekcyn</item>
         <item>Gmina Ceków-Kolonia</item>
         <item>Gmina Celestynów</item>
         <item>Gmina Cewice</item>
@@ -139,16 +148,25 @@
         <item>Gmina Chełm</item>
         <item>Gmina Chełmiec</item>
         <item>Gmina Chełmno</item>
+        <item>Gmina Chłopice</item>
         <item>Gmina Chmielnik</item>
+        <item>Gmina Chociwel</item>
         <item>Gmina Chocz</item>
         <item>Gmina Chodel</item>
+        <item>Gmina Chodów</item>
         <item>Gmina Chojnice</item>
         <item>Gmina Chojnów</item>
+        <item>Gmina Chotcza</item>
+        <item>Gmina Chrząstowice</item>
         <item>Gmina Chrzypsko Wielkie</item>
         <item>Gmina Chybie</item>
         <item>Gmina Ciasna</item>
+        <item>Gmina Ciechanów</item>
         <item>Gmina Ciechocin</item>
+        <item>Gmina Cielądz</item>
+        <item>Gmina Cieszanów</item>
         <item>Gmina Ciężkowice</item>
+        <item>Gmina Cisek</item>
         <item>Gmina Cisna</item>
         <item>Gmina Cmolas</item>
         <item>Gmina Cyców</item>
@@ -156,19 +174,26 @@
         <item>Gmina Czarna</item>
         <item>Gmina Czarnków</item>
         <item>Gmina Czarny Dunajec</item>
+        <item>Gmina Czastary</item>
         <item>Gmina Czechowice-Dziedzice</item>
         <item>Gmina Czernichów</item>
         <item>Gmina Czerniejewo</item>
+        <item>Gmina Czerniewice</item>
+        <item>Gmina Czernikowo</item>
         <item>Gmina Czerwionka-Leszczyny</item>
-        <item>Gmina Czerwonka</item>
+        <item>Gmina Czerwonak</item>
         <item>Gmina Człuchów</item>
         <item>Gmina Czosnów</item>
+        <item>Gmina Dąbrowa Zielona</item>
+        <item>Gmina Dąbrowice</item>
         <item>Gmina Damasławek</item>
         <item>Gmina Damnica</item>
         <item>Gmina Darłowo</item>
         <item>Gmina Dębe Wielkie</item>
         <item>Gmina Dębica</item>
         <item>Gmina Dębno</item>
+        <item>Gmina Dębowa Kłoda</item>
+        <item>Gmina Debrzno</item>
         <item>Gmina Dłutów</item>
         <item>Gmina Dobczyce</item>
         <item>Gmina Dobra</item>
@@ -176,19 +201,31 @@
         <item>Gmina Dobrodzień</item>
         <item>Gmina Dobroń</item>
         <item>Gmina Dobrzany</item>
+        <item>Gmina Dobrzyca</item>
         <item>Gmina Dobrzyniewo Duże</item>
+        <item>Gmina Dolsk</item>
         <item>Gmina Dominowo</item>
         <item>Gmina Dorohusk</item>
+        <item>Gmina Doruchów</item>
+        <item>Gmina Dragacz</item>
+        <item>Gmina Drawsko</item>
+        <item>Gmina Drużbice</item>
         <item>Gmina Drzewica</item>
         <item>Gmina Dubiecko</item>
+        <item>Gmina Dubienka</item>
         <item>Gmina Dukla</item>
         <item>Gmina Dwikozy</item>
+        <item>Gmina Dydnia</item>
         <item>Gmina Dynów</item>
         <item>Gmina Dziadowa Kłoda</item>
         <item>Gmina Działoszyce</item>
+        <item>Gmina Dziemiany</item>
         <item>Gmina Dzierżoniów</item>
+        <item>Gmina Dzwola</item>
         <item>Gmina Elbląg</item>
-        <item>Gmina Fajsławice</item>
+        <item>Gmina Ełk</item>
+        <item>Gmina Fredropol</item>
+        <item>Gmina Garbatka-Letnisko</item>
         <item>Gmina Garbów</item>
         <item>Gmina Garwolin</item>
         <item>Gmina Gąsawa</item>
@@ -198,29 +235,37 @@
         <item>Gmina Gdów</item>
         <item>Gmina Gielniów</item>
         <item>Gmina Gierałtowice</item>
-        <item>Gmina Glinojeck</item>
         <item>Gmina Głogów</item>
+        <item>Gmina Głogówek</item>
         <item>Gmina Głuchów</item>
+        <item>Gmina Głusk</item>
         <item>Gmina Głuszyca</item>
         <item>Gmina Gniew</item>
+        <item>Gmina Gniewino</item>
         <item>Gmina Gniewoszów</item>
         <item>Gmina Gniezno</item>
         <item>Gmina Goczałkowice-Zdrój</item>
         <item>Gmina Godkowo</item>
         <item>Gmina Godów</item>
         <item>Gmina Godziesze Wielkie</item>
+        <item>Gmina Godziszów</item>
         <item>Gmina Gołańcz</item>
+        <item>Gmina Gołcza</item>
         <item>Gmina Goleszów</item>
         <item>Gmina Golina</item>
         <item>Gmina Golub-Dobrzyń</item>
+        <item>Gmina Gołuchów</item>
+        <item>Gmina Gomunice</item>
         <item>Gmina Goraj</item>
         <item>Gmina Gorlice</item>
         <item>Gmina Górno</item>
+        <item>Gmina Górzyca</item>
         <item>Gmina Gościeradów</item>
         <item>Gmina Gostyń</item>
         <item>Gmina Gostynin</item>
         <item>Gmina Goszczyn</item>
         <item>Gmina Gózd</item>
+        <item>Gmina Grabica</item>
         <item>Gmina Grabów</item>
         <item>Gmina Grabowiec</item>
         <item>Gmina Grabów Nad Pilicą</item>
@@ -239,45 +284,52 @@
         <item>Gmina Grudziądz</item>
         <item>Gmina Gruta</item>
         <item>Gmina Grybów</item>
+        <item>Gmina Gryfice</item>
+        <item>Gmina Grzmiąca</item>
         <item>Gmina Haczów</item>
         <item>Gmina Halinów</item>
         <item>Gmina Hańsk</item>
         <item>Gmina Harasiuki</item>
         <item>Gmina Hażlach</item>
         <item>Gmina Herby</item>
+        <item>Gmina Horodło</item>
         <item>Gmina Hrubieszów</item>
         <item>Gmina Huszlew</item>
         <item>Gmina Hyżne</item>
         <item>Gmina Imielno</item>
         <item>Gmina Inowrocław</item>
+        <item>Gmina Irządze</item>
         <item>Gmina Istebna</item>
+        <item>Gmina Iwanowice</item>
         <item>Gmina Iwierzyce</item>
         <item>Gmina Iwonicz-Zdrój</item>
         <item>Gmina Izabelin</item>
         <item>Gmina Izbica</item>
-        <item>Gmina Jadów</item>
+        <item>Gmina Izbicko</item>
+        <item>Gmina Jabłoń</item>
         <item>Gmina Jaktorów</item>
+        <item>Gmina Jakubów</item>
         <item>Gmina Janikowo</item>
+        <item>Gmina Janów</item>
         <item>Gmina Janowiec</item>
         <item>Gmina Janów Podlaski</item>
-        <item>Gmina Jaraczewo</item>
+        <item>Gmina Jarczów</item>
         <item>Gmina Jarocin</item>
         <item>Gmina Jasienica Rosielna</item>
+        <item>Gmina Jaśliska</item>
         <item>Gmina Jasło</item>
         <item>Gmina Jastków</item>
         <item>Gmina Jastrowie</item>
         <item>Gmina Jastrząb</item>
         <item>Gmina Jedlicze</item>
-        <item>Gmina Jedlińsk</item>
-        <item>Gmina Jedlnia-Letnisko</item>
         <item>Gmina Jejkowice</item>
         <item>Gmina Jemielnica</item>
-        <item>Gmina Jemielno</item>
         <item>Gmina Jerzmanowa</item>
         <item>Gmina Jeżewo</item>
         <item>Gmina Jeziora Wielkie</item>
         <item>Gmina Jeziorzany</item>
         <item>Gmina Jeżowe</item>
+        <item>Gmina Joniec</item>
         <item>Gmina Jordanów</item>
         <item>Gmina Józefów</item>
         <item>Gmina Józefów Nad Wisłą</item>
@@ -285,14 +337,18 @@
         <item>Gmina Kąkolewnica</item>
         <item>Gmina Kamień</item>
         <item>Gmina Kamienica</item>
-        <item>Gmina Kamieniec</item>
+        <item>Gmina Kamiennik</item>
         <item>Gmina Kamionka</item>
         <item>Gmina Karczmiska</item>
         <item>Gmina Kargowa</item>
+        <item>Gmina Karlino</item>
+        <item>Gmina Karniewo</item>
         <item>Gmina Kawęczyn</item>
         <item>Gmina Kazimierz Biskupi</item>
         <item>Gmina Kępice</item>
+        <item>Gmina Kęsowo</item>
         <item>Gmina Kiełczygłów</item>
+        <item>Gmina Kietrz</item>
         <item>Gmina Kikół</item>
         <item>Gmina Kiszkowo</item>
         <item>Gmina Kleczew</item>
@@ -307,22 +363,30 @@
         <item>Gmina Klucze</item>
         <item>Gmina Kluczewsko</item>
         <item>Gmina Kobiele Wielkie</item>
+        <item>Gmina Kobylanka</item>
         <item>Gmina Kochanowice</item>
         <item>Gmina Kock</item>
         <item>Gmina Kodrąb</item>
         <item>Gmina Kołaczyce</item>
         <item>Gmina Kołbaskowo</item>
+        <item>Gmina Kołbiel</item>
         <item>Gmina Kołczygłowy</item>
+        <item>Gmina Kołobrzeg</item>
         <item>Gmina Koluszki</item>
         <item>Gmina Komańcza</item>
+        <item>Gmina Komarówka Podlaska</item>
         <item>Gmina Komorniki</item>
         <item>Gmina Komprachcice</item>
         <item>Gmina Konarzyny</item>
         <item>Gmina Kondratowice</item>
+        <item>Gmina Koneck</item>
         <item>Gmina Koniusza</item>
         <item>Gmina Konopiska</item>
         <item>Gmina Końskowola</item>
+        <item>Gmina Konstantynów</item>
         <item>Gmina Koprzywnica</item>
+        <item>Gmina Korfantów</item>
+        <item>Gmina Kórnik</item>
         <item>Gmina Korsze</item>
         <item>Gmina Korycin</item>
         <item>Gmina Korzenna</item>
@@ -332,10 +396,14 @@
         <item>Gmina Kościerzyna</item>
         <item>Gmina Kosów Lacki</item>
         <item>Gmina Kostrzyn</item>
-        <item>Gmina Koszyce</item>
+        <item>Gmina Koszęcin</item>
         <item>Gmina Kotla</item>
         <item>Gmina Kotuń</item>
+        <item>Gmina Kowiesy</item>
+        <item>Gmina Koziegłowy</item>
         <item>Gmina Kozłów</item>
+        <item>Gmina Kramsk</item>
+        <item>Gmina Kraśniczyn</item>
         <item>Gmina Kraśnik</item>
         <item>Gmina Krasnobród</item>
         <item>Gmina Krasnystaw</item>
@@ -345,12 +413,16 @@
         <item>Gmina Krośnice</item>
         <item>Gmina Krupski Młyn</item>
         <item>Gmina Kruszwica</item>
+        <item>Gmina Krynice</item>
         <item>Gmina Krynki</item>
         <item>Gmina Krzanowice</item>
         <item>Gmina Krzemieniewo</item>
+        <item>Gmina Krzeszów</item>
         <item>Gmina Krzymów</item>
+        <item>Gmina Krzywcza</item>
         <item>Gmina Krzywiń</item>
         <item>Gmina Krzyżanowice</item>
+        <item>Gmina Ksawerów</item>
         <item>Gmina Książ Wielki</item>
         <item>Gmina Kunice</item>
         <item>Gmina Kunów</item>
@@ -360,15 +432,19 @@
         <item>Gmina Kwilcz</item>
         <item>Gmina Łabowa</item>
         <item>Gmina Łabunie</item>
+        <item>Gmina Łączna</item>
+        <item>Gmina Lądek</item>
         <item>Gmina Łambinowice</item>
         <item>Gmina Lanckorona</item>
+        <item>Gmina Łańcut</item>
+        <item>Gmina Łapanów</item>
         <item>Gmina Łapsze Niżne</item>
         <item>Gmina Łasin</item>
         <item>Gmina Łaskarzew</item>
         <item>Gmina Lasowice Wielkie</item>
         <item>Gmina Łaszczów</item>
-        <item>Gmina Laszki</item>
         <item>Gmina Latowicz</item>
+        <item>Gmina Łaziska</item>
         <item>Gmina Łazy</item>
         <item>Gmina Łęczyca</item>
         <item>Gmina Łęczyce</item>
@@ -378,11 +454,14 @@
         <item>Gmina Lelów</item>
         <item>Gmina Leśna</item>
         <item>Gmina Leśna Podlaska</item>
+        <item>Gmina Leśniowice</item>
         <item>Gmina Lesznowola</item>
         <item>Gmina Leżajsk</item>
         <item>Gmina Lichnowy</item>
         <item>Gmina Limanowa</item>
         <item>Gmina Linia</item>
+        <item>Gmina Liniewo</item>
+        <item>Gmina Lipiany</item>
         <item>Gmina Lipinki</item>
         <item>Gmina Lipnik</item>
         <item>Gmina Lipowa</item>
@@ -390,43 +469,51 @@
         <item>Gmina Liszki</item>
         <item>Gmina Liw</item>
         <item>Gmina Łobez</item>
+        <item>Gmina Łochów</item>
         <item>Gmina Łodygowice</item>
         <item>Gmina Łomazy</item>
+        <item>Gmina Łomianki</item>
+        <item>Gmina Łoniów</item>
         <item>Gmina Łopiennik Górny</item>
         <item>Gmina Łopuszno</item>
+        <item>Gmina Łosice</item>
         <item>Gmina Lubań</item>
         <item>Gmina Lubartów</item>
         <item>Gmina Lubasz</item>
+        <item>Gmina Lubawka</item>
         <item>Gmina Lubenia</item>
         <item>Gmina Łubianka</item>
         <item>Gmina Lubicz</item>
+        <item>Gmina Lubień</item>
         <item>Gmina Lubiewo</item>
         <item>Gmina Lubin</item>
         <item>Gmina Łubniany</item>
         <item>Gmina Lubochnia</item>
-        <item>Gmina Lubomia</item>
         <item>Gmina Luboń</item>
+        <item>Gmina Lubsza</item>
+        <item>Gmina Lubycza Królewska</item>
         <item>Gmina Łuków</item>
         <item>Gmina Łukowica</item>
         <item>Gmina Lutowiska</item>
+        <item>Gmina Lututów</item>
         <item>Gmina Luzino</item>
         <item>Gmina Łużna</item>
         <item>Gmina Łysomice</item>
+        <item>Gmina Maciejowice</item>
         <item>Gmina Magnuszew</item>
+        <item>Gmina Majdan Królewski</item>
         <item>Gmina Maków Podhalański</item>
-        <item>Gmina Mała Wieś</item>
         <item>Gmina Malbork</item>
         <item>Gmina Małdyty</item>
         <item>Gmina Małkinia Górna</item>
         <item>Gmina Marcinowice</item>
         <item>Gmina Margonin</item>
         <item>Gmina Marianowo</item>
-        <item>Gmina Markusy</item>
-        <item>Gmina Masłów</item>
+        <item>Gmina Markuszów</item>
+        <item>Gmina Męcinka</item>
         <item>Gmina Medyka</item>
         <item>Gmina Mełgiew</item>
         <item>Gmina Michałów</item>
-        <item>Gmina Michałowo</item>
         <item>Gmina Miedziana Góra</item>
         <item>Gmina Miedźna</item>
         <item>Gmina Miedźno</item>
@@ -435,7 +522,10 @@
         <item>Gmina Międzyrzec Podlaski</item>
         <item>Gmina Międzyzdroje</item>
         <item>Gmina Miejsce Piastowe</item>
+        <item>Gmina Miękinia</item>
         <item>Gmina Mielec</item>
+        <item>Gmina Mielno</item>
+        <item>Gmina Mieszkowice</item>
         <item>Gmina Milanów</item>
         <item>Gmina Milejów</item>
         <item>Gmina Milicz</item>
@@ -444,21 +534,26 @@
         <item>Gmina Miłosław</item>
         <item>Gmina Milówka</item>
         <item>Gmina Mińsk Mazowiecki</item>
+        <item>Gmina Mirów</item>
         <item>Gmina Mirsk</item>
         <item>Gmina Młynary</item>
+        <item>Gmina Modliborzyce</item>
         <item>Gmina Mogielnica</item>
         <item>Gmina Mogilany</item>
+        <item>Gmina Mogilno</item>
+        <item>Gmina Morawica</item>
         <item>Gmina Mordy</item>
         <item>Gmina Moryń</item>
         <item>Gmina Mrocza</item>
         <item>Gmina Mrozy</item>
+        <item>Gmina Mściwojów</item>
+        <item>Gmina Mstów</item>
         <item>Gmina Mszana</item>
         <item>Gmina Mszana Dolna</item>
         <item>Gmina Murów</item>
         <item>Gmina Mycielin</item>
-        <item>Gmina Mysłakowice</item>
+        <item>Gmina Mykanów</item>
         <item>Gmina Myślibórz</item>
-        <item>Gmina Nadarzyn</item>
         <item>Gmina Namysłów</item>
         <item>Gmina Nasielsk</item>
         <item>Gmina Nawojowa</item>
@@ -469,23 +564,25 @@
         <item>Gmina Niedrzwica Duża</item>
         <item>Gmina Niedźwiada</item>
         <item>Gmina Niedźwiedź</item>
-        <item>Gmina Niegosławice</item>
-        <item>Gmina Niwiska</item>
+        <item>Gmina Nowa Karczma</item>
         <item>Gmina Nowa Ruda</item>
         <item>Gmina Nowa Wieś Lęborska</item>
+        <item>Gmina Nowe</item>
         <item>Gmina Nowe Miasto</item>
         <item>Gmina Nowe Miasto Nad Wartą</item>
-        <item>Gmina Nowogród Bobrzański</item>
+        <item>Gmina Nowogród</item>
         <item>Gmina Nowosolna</item>
         <item>Gmina Nowy Kawęczyn</item>
+        <item>Gmina Nowy Korczyn</item>
         <item>Gmina Nowy Staw</item>
         <item>Gmina Nowy Targ</item>
         <item>Gmina Nowy Tomyśl</item>
+        <item>Gmina Nozdrzec</item>
         <item>Gmina Nur</item>
         <item>Gmina Obrazów</item>
         <item>Gmina Ochotnica Dolna</item>
         <item>Gmina Ogrodzieniec</item>
-        <item>Gmina Olecko</item>
+        <item>Gmina Olszanica</item>
         <item>Gmina Olsztynek</item>
         <item>Gmina Olszyna</item>
         <item>Gmina Opatowiec</item>
@@ -495,11 +592,15 @@
         <item>Gmina Osiek Jasielski</item>
         <item>Gmina Osiek Mały</item>
         <item>Gmina Osielsko</item>
+        <item>Gmina Osina</item>
+        <item>Gmina Osjaków</item>
+        <item>Gmina Ostroróg</item>
         <item>Gmina Ostrów</item>
         <item>Gmina Ostrówek</item>
         <item>Gmina Ostrów Lubelski</item>
         <item>Gmina Ostrów Mazowiecka</item>
         <item>Gmina Ostrów Wielkopolski</item>
+        <item>Gmina Otmuchów</item>
         <item>Gmina Otyń</item>
         <item>Gmina Ożarów</item>
         <item>Gmina Ożarowice</item>
@@ -507,27 +608,32 @@
         <item>Gmina Ozorków</item>
         <item>Gmina Pabianice</item>
         <item>Gmina Pacanów</item>
+        <item>Gmina Pacyna</item>
         <item>Gmina Paczków</item>
         <item>Gmina Padew Narodowa</item>
-        <item>Gmina Pajęczno</item>
         <item>Gmina Pakosław</item>
         <item>Gmina Pakosławice</item>
         <item>Gmina Pałecznica</item>
         <item>Gmina Panki</item>
         <item>Gmina Parchowo</item>
         <item>Gmina Parczew</item>
-        <item>Gmina Pawłosiów</item>
+        <item>Gmina Pasłęk</item>
+        <item>Gmina Pątnów</item>
         <item>Gmina Pawłowice</item>
         <item>Gmina Pawłowiczki</item>
+        <item>Gmina Pawonków</item>
         <item>Gmina Pęcław</item>
         <item>Gmina Pelplin</item>
+        <item>Gmina Pępowo</item>
         <item>Gmina Piaski</item>
         <item>Gmina Piątnica</item>
-        <item>Gmina Piecki</item>
         <item>Gmina Piekoszów</item>
+        <item>Gmina Pieniężno</item>
         <item>Gmina Pilchowice</item>
+        <item>Gmina Pińczów</item>
         <item>Gmina Pionki</item>
-        <item>Gmina Piotrków Trybunalski</item>
+        <item>Gmina Płaska</item>
+        <item>Gmina Platerówka</item>
         <item>Gmina Pleśna</item>
         <item>Gmina Pleszew</item>
         <item>Gmina Płońsk</item>
@@ -535,6 +641,7 @@
         <item>Gmina Poczesna</item>
         <item>Gmina Podedwórze</item>
         <item>Gmina Podegrodzie</item>
+        <item>Gmina Podgórzyn</item>
         <item>Gmina Pokój</item>
         <item>Gmina Połajewo</item>
         <item>Gmina Połaniec</item>
@@ -543,16 +650,18 @@
         <item>Gmina Police</item>
         <item>Gmina Polkowice</item>
         <item>Gmina Pomiechówek</item>
+        <item>Gmina Poniatowa</item>
         <item>Gmina Popielów</item>
         <item>Gmina Popów</item>
-        <item>Gmina Poraj</item>
         <item>Gmina Potęgowo</item>
+        <item>Gmina Potok Wielki</item>
         <item>Gmina Praszka</item>
-        <item>Gmina Prażmów</item>
         <item>Gmina Prochowice</item>
         <item>Gmina Promna</item>
         <item>Gmina Prószków</item>
+        <item>Gmina Prusice</item>
         <item>Gmina Pruszcz Gdański</item>
+        <item>Gmina Przechlewo</item>
         <item>Gmina Przecław</item>
         <item>Gmina Przedecz</item>
         <item>Gmina Przemęt</item>
@@ -562,7 +671,9 @@
         <item>Gmina Przodkowo</item>
         <item>Gmina Przykona</item>
         <item>Gmina Przyłęk</item>
+        <item>Gmina Przyrów</item>
         <item>Gmina Przystajń</item>
+        <item>Gmina Przytoczna</item>
         <item>Gmina Puchaczów</item>
         <item>Gmina Puck</item>
         <item>Gmina Puławy</item>
@@ -570,10 +681,10 @@
         <item>Gmina Puszcza Mariańska</item>
         <item>Gmina Pysznica</item>
         <item>Gmina Pyzdry</item>
+        <item>Gmina Raba Wyżna</item>
         <item>Gmina Rachanie</item>
         <item>Gmina Raciechowice</item>
-        <item>Gmina Racławice</item>
-        <item>Gmina Radecznica</item>
+        <item>Gmina Radgoszcz</item>
         <item>Gmina Radków</item>
         <item>Gmina Radłów</item>
         <item>Gmina Radomin</item>
@@ -581,16 +692,29 @@
         <item>Gmina Radomyśl Nad Sanem</item>
         <item>Gmina Radoszyce</item>
         <item>Gmina Radwanice</item>
+        <item>Gmina Radymno</item>
+        <item>Gmina Radziejów</item>
         <item>Gmina Radziłów</item>
+        <item>Gmina Rajgród</item>
+        <item>Gmina Raków</item>
+        <item>Gmina Rakszawa</item>
         <item>Gmina Rawa Mazowiecka</item>
+        <item>Gmina Regnów</item>
         <item>Gmina Reńska Wieś</item>
+        <item>Gmina Rogóźno</item>
+        <item>Gmina Rokitno</item>
+        <item>Gmina Ropa</item>
         <item>Gmina Rossosz</item>
         <item>Gmina Rozprza</item>
         <item>Gmina Ruciane-Nida</item>
         <item>Gmina Ruda-Huta</item>
         <item>Gmina Rudna</item>
         <item>Gmina Rudniki</item>
+        <item>Gmina Rudnik Nad Sanem</item>
+        <item>Gmina Rudziniec</item>
         <item>Gmina Rusiec</item>
+        <item>Gmina Rusinów</item>
+        <item>Gmina Rybczewice</item>
         <item>Gmina Rychliki</item>
         <item>Gmina Rychtal</item>
         <item>Gmina Ryczywół</item>
@@ -598,32 +722,39 @@
         <item>Gmina Rypin</item>
         <item>Gmina Rytro</item>
         <item>Gmina Rytwiany</item>
-        <item>Gmina Rząśnia</item>
         <item>Gmina Rzeczyca</item>
         <item>Gmina Rzepiennik Strzyżewski</item>
         <item>Gmina Rzepin</item>
+        <item>Gmina Rzezawa</item>
         <item>Gmina Rzgów</item>
         <item>Gmina Sadki</item>
         <item>Gmina Sadowne</item>
         <item>Gmina Samborzec</item>
         <item>Gmina Sanok</item>
+        <item>Gmina Sawin</item>
         <item>Gmina Ścinawa</item>
         <item>Gmina Sędziejowice</item>
+        <item>Gmina Sejny</item>
+        <item>Gmina Sękowa</item>
         <item>Gmina Sępopol</item>
         <item>Gmina Serokomla</item>
         <item>Gmina Sianów</item>
         <item>Gmina Sicienko</item>
         <item>Gmina Sieciechów</item>
         <item>Gmina Siedlce</item>
+        <item>Gmina Siedliszcze</item>
         <item>Gmina Siemiatycze</item>
+        <item>Gmina Siemień</item>
         <item>Gmina Siemyśl</item>
         <item>Gmina Siennica</item>
         <item>Gmina Siennica Różana</item>
         <item>Gmina Sienno</item>
         <item>Gmina Siepraw</item>
         <item>Gmina Sieradz</item>
+        <item>Gmina Sieraków</item>
         <item>Gmina Sierakowice</item>
         <item>Gmina Siewierz</item>
+        <item>Gmina Sitkówka-Nowiny</item>
         <item>Gmina Sitno</item>
         <item>Gmina Skarżysko Kościelne</item>
         <item>Gmina Skępe</item>
@@ -631,16 +762,22 @@
         <item>Gmina Skoczów</item>
         <item>Gmina Skoki</item>
         <item>Gmina Skołyszyn</item>
+        <item>Gmina Skrwilno</item>
         <item>Gmina Skrzyszów</item>
         <item>Gmina Skulsk</item>
+        <item>Gmina Skwierzyna</item>
         <item>Gmina Sława</item>
+        <item>Gmina Śliwice</item>
         <item>Gmina Słopnice</item>
+        <item>Gmina Słubice</item>
         <item>Gmina Słupca</item>
         <item>Gmina Słupia</item>
+        <item>Gmina Słupia (Konecka)</item>
+        <item>Gmina Śmigiel</item>
         <item>Gmina Sobienie-Jeziory</item>
+        <item>Gmina Sobolew</item>
         <item>Gmina Sobótka</item>
         <item>Gmina Sokółka</item>
-        <item>Gmina Sokoły</item>
         <item>Gmina Solina</item>
         <item>Gmina Sośnicowice</item>
         <item>Gmina Sośnie</item>
@@ -655,11 +792,16 @@
         <item>Gmina Stare Miasto</item>
         <item>Gmina Stare Pole</item>
         <item>Gmina Starogard Gdański</item>
+        <item>Gmina Stary Brus</item>
+        <item>Gmina Stary Dzierzgoń</item>
+        <item>Gmina Stary Targ</item>
         <item>Gmina Stawiszyn</item>
+        <item>Gmina Stepnica</item>
         <item>Gmina Stoczek Łukowski</item>
         <item>Gmina Stopnica</item>
         <item>Gmina Strawczyn</item>
         <item>Gmina Stryków</item>
+        <item>Gmina Stryszawa</item>
         <item>Gmina Stryszów</item>
         <item>Gmina Strzałkowo</item>
         <item>Gmina Strzelce Opolskie</item>
@@ -668,38 +810,43 @@
         <item>Gmina Strzyżewice</item>
         <item>Gmina Stupsk</item>
         <item>Gmina Subkowy</item>
+        <item>Gmina Suchań</item>
         <item>Gmina Suchedniów</item>
         <item>Gmina Suchożebry</item>
         <item>Gmina Suchy Las</item>
         <item>Gmina Sulechów</item>
         <item>Gmina Sulęcin</item>
+        <item>Gmina Sulejów</item>
         <item>Gmina Sulików</item>
         <item>Gmina Sulmierzyce</item>
         <item>Gmina Sułów</item>
         <item>Gmina Susiec</item>
-        <item>Gmina Świerklaniec</item>
+        <item>Gmina Świercze</item>
+        <item>Gmina Świerczów</item>
+        <item>Gmina Świerklany</item>
         <item>Gmina Świerzawa</item>
         <item>Gmina Świeszyno</item>
         <item>Gmina Świlcza</item>
         <item>Gmina Szadek</item>
         <item>Gmina Szaflary</item>
         <item>Gmina Szastarka</item>
+        <item>Gmina Szczawin Kościelny</item>
         <item>Gmina Szczebrzeszyn</item>
         <item>Gmina Szczekociny</item>
         <item>Gmina Szczerców</item>
-        <item>Gmina Szczutowo</item>
         <item>Gmina Szczytna</item>
         <item>Gmina Szczytniki</item>
-        <item>Gmina Szemud</item>
+        <item>Gmina Szczytno</item>
         <item>Gmina Szerzyny</item>
         <item>Gmina Szlichtyngowa</item>
+        <item>Gmina Szreńsk</item>
+        <item>Gmina Szudziałowo</item>
         <item>Gmina Szydłów</item>
         <item>Gmina Tarłów</item>
         <item>Gmina Tarnów</item>
         <item>Gmina Tarnowiec</item>
         <item>Gmina Tarnów Opolski</item>
         <item>Gmina Teresin</item>
-        <item>Gmina Terespol</item>
         <item>Gmina Tereszpol</item>
         <item>Gmina Tłuchowo</item>
         <item>Gmina Tłuszcz</item>
@@ -709,12 +856,15 @@
         <item>Gmina Toszek</item>
         <item>Gmina Trąbki Wielkie</item>
         <item>Gmina Trzebiatów</item>
+        <item>Gmina Trzebielino</item>
         <item>Gmina Trzebinia</item>
-        <item>Gmina Trzeszczany</item>
         <item>Gmina Trzyciąż</item>
+        <item>Gmina Trzydnik Duży</item>
         <item>Gmina Tuchów</item>
+        <item>Gmina Tułowice</item>
         <item>Gmina Turośń Kościelna</item>
         <item>Gmina Tuszów Narodowy</item>
+        <item>Gmina Tworóg</item>
         <item>Gmina Tyczyn</item>
         <item>Gmina Tymbark</item>
         <item>Gmina Tyrawa Wołoska</item>
@@ -723,15 +873,21 @@
         <item>Gmina Ulan-Majorat</item>
         <item>Gmina Ulanów</item>
         <item>Gmina Ułęż</item>
+        <item>Gmina Ulhówek</item>
         <item>Gmina Urszulin</item>
         <item>Gmina Urzędów</item>
+        <item>Gmina Uście Gorlickie</item>
         <item>Gmina Uścimów</item>
         <item>Gmina Wąchock</item>
+        <item>Gmina Wądroże Wielkie</item>
         <item>Gmina Wągrowiec</item>
+        <item>Gmina Walce</item>
         <item>Gmina Wąpielsk</item>
         <item>Gmina Wasilków</item>
+        <item>Gmina Wąsosz</item>
         <item>Gmina Wąwolnica</item>
         <item>Gmina Wejherowo</item>
+        <item>Gmina Werbkowice</item>
         <item>Gmina Wiązów</item>
         <item>Gmina Wiązowna</item>
         <item>Gmina Wicko</item>
@@ -739,16 +895,21 @@
         <item>Gmina Wielbark</item>
         <item>Gmina Wieleń</item>
         <item>Gmina Wielgie</item>
+        <item>Gmina Wielgomłyny</item>
         <item>Gmina Wieliszew</item>
         <item>Gmina Wielka Nieszawka</item>
         <item>Gmina Wieniawa</item>
         <item>Gmina Wieprz</item>
         <item>Gmina Wieruszów</item>
+        <item>Gmina Wierzbinek</item>
         <item>Gmina Wierzbno</item>
+        <item>Gmina Wierzchlas</item>
         <item>Gmina Wierzchosławice</item>
         <item>Gmina Wietrzychowice</item>
         <item>Gmina Wijewo</item>
+        <item>Gmina Wilczyce</item>
         <item>Gmina Wilczyn</item>
+        <item>Gmina Wilkołaz</item>
         <item>Gmina Wilków</item>
         <item>Gmina Wilkowice</item>
         <item>Gmina Winnica</item>
@@ -759,12 +920,14 @@
         <item>Gmina Witkowo</item>
         <item>Gmina Władysławów</item>
         <item>Gmina Wleń</item>
+        <item>Gmina Włocławek</item>
         <item>Gmina Włodawa</item>
         <item>Gmina Włoszczowa</item>
         <item>Gmina Wodzierady</item>
         <item>Gmina Wodzisław</item>
         <item>Gmina Wojcieszków</item>
         <item>Gmina Wojnicz</item>
+        <item>Gmina Wojsławice</item>
         <item>Gmina Wola Krzysztoporska</item>
         <item>Gmina Wolanów</item>
         <item>Gmina Wolbrom</item>
@@ -775,15 +938,18 @@
         <item>Gmina Wręczyca Wielka</item>
         <item>Gmina Wronki</item>
         <item>Gmina Wyrzysk</item>
-        <item>Gmina Zabierzów</item>
+        <item>Gmina Wysokie</item>
         <item>Gmina Żabno</item>
         <item>Gmina Żagań</item>
-        <item>Gmina Zagórz</item>
+        <item>Gmina Zagórów</item>
         <item>Gmina Zaklików</item>
         <item>Gmina Zakroczym</item>
         <item>Gmina Zakrzówek</item>
+        <item>Gmina Zalesie</item>
         <item>Gmina Zaleszany</item>
+        <item>Gmina Załuski</item>
         <item>Gmina Zamość</item>
+        <item>Gmina Żarnów</item>
         <item>Gmina Żarnowiec</item>
         <item>Gmina Żarów</item>
         <item>Gmina Zarszyn</item>
@@ -795,20 +961,26 @@
         <item>Gmina Zbójno</item>
         <item>Gmina Zbrosławice</item>
         <item>Gmina Zduńska Wola</item>
-        <item>Gmina Zduny</item>
         <item>Gmina Zdzieszowice</item>
+        <item>Gmina Zębowice</item>
         <item>Gmina Zebrzydowice</item>
+        <item>Gmina Żegocina</item>
         <item>Gmina Żelazków</item>
+        <item>Gmina Zembrzyce</item>
         <item>Gmina Zgierz</item>
         <item>Gmina Zgorzelec</item>
         <item>Gmina Ziębice</item>
         <item>Gmina Zielonki</item>
         <item>Gmina Zławieś Wielka</item>
+        <item>Gmina Złota</item>
+        <item>Gmina Złotniki Kujawskie</item>
         <item>Gmina Żmudź</item>
         <item>Gmina Żnin</item>
         <item>Gmina Żółkiewka</item>
         <item>Gmina Żołynia</item>
         <item>Gmina Żukowice</item>
+        <item>Gmina Żurawica</item>
+        <item>Gmina Żyraków</item>
         <item>Gmina Żyrzyn</item>
         <item>Gmina Żytno</item>
         <item>Gniezno</item>
@@ -817,19 +989,19 @@
         <item>Góra</item>
         <item>Góra Kalwaria</item>
         <item>Gorlice</item>
+        <item>Górzno</item>
         <item>Gorzów Śląski</item>
         <item>Gorzów Wielkopolski</item>
         <item>Gostynin</item>
         <item>Grajewo</item>
         <item>Grodzisk Mazowiecki</item>
-        <item>Gronowo Elbląskie</item>
         <item>Grudziądz</item>
+        <item>Grybów</item>
         <item>Gryfino</item>
         <item>Gryfów Śląski</item>
         <item>Hel</item>
         <item>Hrubieszów</item>
         <item>Inowrocław</item>
-        <item>Iwanowice</item>
         <item>Izbica Kujawska</item>
         <item>Jabłonowo Pomorskie</item>
         <item>Janowiec Wielkopolski</item>
@@ -839,7 +1011,6 @@
         <item>Jasło</item>
         <item>Jastrzębie-Zdrój</item>
         <item>Jawor</item>
-        <item>Jaworzno</item>
         <item>Jedlina-Zdrój</item>
         <item>Jelcz-Laskowice</item>
         <item>Jelenia Góra</item>
@@ -860,9 +1031,9 @@
         <item>Kępno</item>
         <item>Kętrzyn</item>
         <item>Kielce</item>
-        <item>Kiełczygłów</item>
         <item>Kłodawa</item>
         <item>Kłodzko</item>
+        <item>Kluczbork</item>
         <item>Knurów</item>
         <item>Kobyłka</item>
         <item>Koło</item>
@@ -892,11 +1063,13 @@
         <item>Krzeszowice</item>
         <item>Krzyż Wielkopolski</item>
         <item>Książ Wielkopolski</item>
-        <item>Kudowa-Zdrój</item>
         <item>Kujawsko-Pomorskie</item>
+        <item>Kutno</item>
         <item>Kuźnia Raciborska</item>
+        <item>Kwidzyn</item>
         <item>Łabiszyn</item>
         <item>Lądek-Zdrój</item>
+        <item>Łańcut</item>
         <item>Łapy</item>
         <item>Łask</item>
         <item>Łaskarzew</item>
@@ -908,10 +1081,10 @@
         <item>Legnica</item>
         <item>Leszno</item>
         <item>Lewin Brzeski</item>
+        <item>Lewin Brzeski 2</item>
         <item>Leżajsk</item>
         <item>Limanowa</item>
         <item>Lipno</item>
-        <item>Lipsko</item>
         <item>Łódź</item>
         <item>Łódzkie</item>
         <item>Łowicz</item>
@@ -928,11 +1101,8 @@
         <item>Lwówek Śląski</item>
         <item>Malbork</item>
         <item>Małopolskie</item>
-        <item>Marciszów</item>
         <item>Marki</item>
-        <item>Masłowice</item>
         <item>Mazowieckie</item>
-        <item>Miastko</item>
         <item>Michałowice</item>
         <item>Miechów</item>
         <item>Międzyrzec Podlaski</item>
@@ -940,6 +1110,7 @@
         <item>Mielec</item>
         <item>Milanówek</item>
         <item>Mińsk Mazowiecki</item>
+        <item>Mniszków</item>
         <item>Mosina</item>
         <item>Mrągowo</item>
         <item>Mrągowski</item>
@@ -949,18 +1120,17 @@
         <item>Mysłowice</item>
         <item>Myszków</item>
         <item>Nakło Nad Notecią</item>
-        <item>Nasielsk</item>
         <item>Niemodlin</item>
         <item>Niepołomice</item>
         <item>Nisko</item>
         <item>Nowa Dęba</item>
         <item>Nowa Sarzyna</item>
+        <item>Nowa Sól</item>
         <item>Nowe Miasteczko</item>
         <item>Nowe Skalmierzyce</item>
         <item>Nowogard</item>
         <item>Nowogród Bobrzański</item>
         <item>Nowogrodziec</item>
-        <item>Nowosolna</item>
         <item>Nowy Dwór Mazowiecki</item>
         <item>Nowy Sącz</item>
         <item>Nowy Targ</item>
@@ -974,6 +1144,8 @@
         <item>Opoczno</item>
         <item>Opole</item>
         <item>Opole Lubelskie</item>
+        <item>Opolskie</item>
+        <item>Orzesze</item>
         <item>Osieczna</item>
         <item>Osiecznica</item>
         <item>Ostróda</item>
@@ -991,13 +1163,16 @@
         <item>Piekary Śląskie</item>
         <item>Pieńsk</item>
         <item>Piła</item>
+        <item>Pilzno</item>
         <item>Piotrków Trybunalski</item>
         <item>Pisz</item>
         <item>Płock</item>
         <item>Płońsk</item>
         <item>Pniewy</item>
+        <item>Pobiedziska</item>
         <item>Podkarpackie</item>
         <item>Podkowa Leśna</item>
+        <item>Podlaskie</item>
         <item>Połczyn-Zdrój</item>
         <item>Pomorskie</item>
         <item>Poniec</item>
@@ -1006,7 +1181,7 @@
         <item>Powiat augustowski</item>
         <item>Powiat będziński</item>
         <item>Powiat bełchatowski</item>
-        <item>Powiat białobrzeski</item>
+        <item>Powiat białostocki</item>
         <item>Powiat bialski</item>
         <item>Powiat bielski</item>
         <item>Powiat bieszczadzki</item>
@@ -1032,6 +1207,7 @@
         <item>Powiat człuchowski</item>
         <item>Powiat dąbrowski</item>
         <item>Powiat dębicki</item>
+        <item>Powiat drawski</item>
         <item>Powiat działdowski</item>
         <item>Powiat dzierżoniowski</item>
         <item>Powiat elbląski</item>
@@ -1046,10 +1222,11 @@
         <item>Powiat goleniowski</item>
         <item>Powiat golubsko-dobrzyński</item>
         <item>Powiat gorlicki</item>
+        <item>Powiat górowski</item>
         <item>Powiat gorzowski</item>
         <item>Powiat gostyński</item>
+        <item>Powiat grajewski</item>
         <item>Powiat grójecki</item>
-        <item>Powiat grudziądzki</item>
         <item>Powiat gryficki</item>
         <item>Powiat gryfiński</item>
         <item>Powiat hajnowski</item>
@@ -1064,6 +1241,7 @@
         <item>Powiat jędrzejowski</item>
         <item>Powiat jeleniogórski</item>
         <item>Powiat kaliski</item>
+        <item>Powiat kamiennogórski</item>
         <item>Powiat kamieński</item>
         <item>Powiat kartuski</item>
         <item>Powiat kazimierski</item>
@@ -1088,6 +1266,7 @@
         <item>Powiat krośnieński</item>
         <item>Powiat krotoszyński</item>
         <item>Powiat kutnowski</item>
+        <item>Powiat łańcucki</item>
         <item>Powiat łaski</item>
         <item>Powiat lęborski</item>
         <item>Powiat łęczycki</item>
@@ -1102,6 +1281,7 @@
         <item>Powiat lipski</item>
         <item>Powiat łobeski</item>
         <item>Powiat łódzki wschodni</item>
+        <item>Powiat łosicki</item>
         <item>Powiat łowicki</item>
         <item>Powiat lubaczowski</item>
         <item>Powiat lubański</item>
@@ -1122,9 +1302,11 @@
         <item>Powiat myślenicki</item>
         <item>Powiat myszkowski</item>
         <item>Powiat nakielski</item>
+        <item>Powiat namysłowski</item>
         <item>Powiat nidzicki</item>
         <item>Powiat niżański</item>
         <item>Powiat nowodworski</item>
+        <item>Powiat nowomiejski</item>
         <item>Powiat nowosądecki</item>
         <item>Powiat nowosolski</item>
         <item>Powiat nowotarski</item>
@@ -1160,7 +1342,6 @@
         <item>Powiat proszowicki</item>
         <item>Powiat prudnicki</item>
         <item>Powiat pruszkowski</item>
-        <item>Powiat przasnyski</item>
         <item>Powiat przemyski</item>
         <item>Powiat przeworski</item>
         <item>Powiat przysuski</item>
@@ -1183,6 +1364,7 @@
         <item>Powiat rzeszowski</item>
         <item>Powiat sandomierski</item>
         <item>Powiat sanocki</item>
+        <item>Powiat sejneński</item>
         <item>Powiat sępoleński</item>
         <item>Powiat siedlecki</item>
         <item>Powiat siemiatycki</item>
@@ -1210,6 +1392,7 @@
         <item>Powiat świdnicki</item>
         <item>Powiat świdwiński</item>
         <item>Powiat świebodziński</item>
+        <item>Powiat świecki</item>
         <item>Powiat szamotulski</item>
         <item>Powiat szczycieński</item>
         <item>Powiat sztumski</item>
@@ -1228,6 +1411,7 @@
         <item>Powiat wągrowiecki</item>
         <item>Powiat wałecki</item>
         <item>Powiat warszawski zachodni</item>
+        <item>Powiat węgorzewski</item>
         <item>Powiat węgrowski</item>
         <item>Powiat wejherowski</item>
         <item>Powiat wielicki</item>
@@ -1247,7 +1431,6 @@
         <item>Powiat wyszkowski</item>
         <item>Powiat ząbkowicki</item>
         <item>Powiat żagański</item>
-        <item>Powiat zambrowski</item>
         <item>Powiat zamojski</item>
         <item>Powiat żarski</item>
         <item>Powiat zawierciański</item>
@@ -1258,34 +1441,33 @@
         <item>Powiat złotoryjski</item>
         <item>Powiat złotowski</item>
         <item>Powiat żniński</item>
-        <item>Powiat żuromiński</item>
         <item>Powiat żyrardowski</item>
         <item>Powiat żywiecki</item>
         <item>Poznań</item>
-        <item>Prostki</item>
         <item>Proszowice</item>
         <item>Prudnik</item>
+        <item>Pruszcz Gdański</item>
         <item>Pruszków</item>
         <item>Przasnysz</item>
         <item>Przemyśl</item>
         <item>Przeworsk</item>
         <item>Przysucha</item>
         <item>Pszczyna</item>
-        <item>Pszów</item>
         <item>Puck</item>
         <item>Puławy</item>
+        <item>Pułtusk</item>
+        <item>Puszczykowo</item>
         <item>Pyskowice</item>
         <item>Rabka-Zdrój</item>
         <item>Raciąż</item>
         <item>Racibórz</item>
-        <item>Raciechowice</item>
         <item>Radom</item>
         <item>Radomsko</item>
+        <item>Radomyśl Wielki</item>
         <item>Radymno</item>
         <item>Radziejów</item>
         <item>Radzionków</item>
         <item>Radzyń Podlaski</item>
-        <item>Raków</item>
         <item>Rawa Mazowiecka</item>
         <item>Rawicz</item>
         <item>Reda</item>
@@ -1299,6 +1481,7 @@
         <item>Rymanów</item>
         <item>Rypin</item>
         <item>Rzeszów</item>
+        <item>Rzeszów projekt</item>
         <item>Sandomierz</item>
         <item>Sanok</item>
         <item>Sędziszów Małopolski</item>
@@ -1306,7 +1489,6 @@
         <item>Siedlce</item>
         <item>Siemianowice Śląskie</item>
         <item>Siemiatycze</item>
-        <item>Sieniawa</item>
         <item>Sieradz</item>
         <item>Skarżysko-Kamienna</item>
         <item>Skawina</item>
@@ -1325,17 +1507,15 @@
         <item>Środa Śląska</item>
         <item>Środa Wielkopolska</item>
         <item>Starachowice</item>
+        <item>Stargard</item>
         <item>Starogard Gdański</item>
         <item>Stary Sącz</item>
         <item>Staszów</item>
         <item>Stronie Śląskie</item>
-        <item>Strzegom</item>
         <item>Strzyżów</item>
-        <item>Suchy Las</item>
         <item>Sulejówek</item>
         <item>Sułkowice</item>
         <item>Sulmierzyce</item>
-        <item>Suwalski</item>
         <item>Swarzędz</item>
         <item>Świdnica</item>
         <item>Świdnik</item>
@@ -1358,8 +1538,10 @@
         <item>Terespol</item>
         <item>Tomaszów Lubelski</item>
         <item>Tomaszów Mazowiecki</item>
+        <item>Tomaszów Mazowiecki projekt</item>
         <item>Toruń</item>
         <item>Trzcianka</item>
+        <item>Trzcińsko-Zdrój</item>
         <item>Trzebnica</item>
         <item>Trzemeszno</item>
         <item>Tuliszków</item>
@@ -1372,7 +1554,7 @@
         <item>Ustrzyki Dolne</item>
         <item>Wadowice</item>
         <item>Wągrowiec</item>
-        <item>Wałbrzych</item>
+        <item>Wałcz</item>
         <item>Warmińsko-Mazurskie</item>
         <item>Warszawa</item>
         <item>Wąsosz</item>
@@ -1381,7 +1563,7 @@
         <item>Więcbork</item>
         <item>Wieliczka</item>
         <item>Wielkopolskie</item>
-        <item>Wizna</item>
+        <item>Wieluń</item>
         <item>Władysławowo</item>
         <item>Włocławek</item>
         <item>Włodawa</item>
@@ -1410,6 +1592,7 @@
         <item>Zielona Góra</item>
         <item>Zielonka</item>
         <item>Złotoryja</item>
+        <item>Złotów</item>
         <item>Żory</item>
         <item>Zwoleń</item>
         <item>Żyrardów</item>
@@ -1418,13 +1601,11 @@
         <item>andrychow</item>
         <item>augustow</item>
         <item>baranowsandomierski</item>
-        <item>bartoszyce</item>
         <item>bedzin</item>
         <item>belchatow</item>
         <item>belzyce</item>
         <item>bialapodlaska</item>
         <item>bialarawska</item>
-        <item>bialogard</item>
         <item>bialybor</item>
         <item>bialystok</item>
         <item>biecz</item>
@@ -1432,11 +1613,9 @@
         <item>bielskobiala</item>
         <item>bierawa</item>
         <item>bierutow</item>
-        <item>biskupice</item>
         <item>blachownia</item>
         <item>blaszki</item>
         <item>blonie</item>
-        <item>bochnia</item>
         <item>bogatynia</item>
         <item>boguchwala</item>
         <item>bogutypianki</item>
@@ -1459,6 +1638,7 @@
         <item>chelmza</item>
         <item>chocianow</item>
         <item>chodziez</item>
+        <item>chojnice</item>
         <item>chojnow</item>
         <item>chorzow</item>
         <item>ciechanow</item>
@@ -1472,7 +1652,9 @@
         <item>dabrowagornicza</item>
         <item>dabrowatarnowska</item>
         <item>debica</item>
+        <item>debno</item>
         <item>dobrzenwielki</item>
+        <item>dobrzenwielki2</item>
         <item>dobrzynnadwisla</item>
         <item>dolnoslaskie</item>
         <item>dusznikizdroj</item>
@@ -1490,6 +1672,9 @@
         <item>glogowmalopolski</item>
         <item>glowno</item>
         <item>glubczyce</item>
+        <item>glubczyce2</item>
+        <item>glucholazy</item>
+        <item>gminaabramow</item>
         <item>gminaadamowka</item>
         <item>gminaaleksandrowkujawski</item>
         <item>gminaaleksandrowlodzki</item>
@@ -1501,14 +1686,17 @@
         <item>gminabadkowo</item>
         <item>gminabaltow</item>
         <item>gminabaranow</item>
-        <item>gminabarciany</item>
         <item>gminabarcin</item>
+        <item>gminabarczewo</item>
         <item>gminabaruchowo</item>
+        <item>gminabatorz</item>
         <item>gminabedzino</item>
         <item>gminabelchatow</item>
+        <item>gminabesko</item>
         <item>gminabialaczow</item>
         <item>gminabialeblota</item>
-        <item>gminabielskpodlaski</item>
+        <item>gminabialopole</item>
+        <item>gminabielsk</item>
         <item>gminabircza</item>
         <item>gminablazowa</item>
         <item>gminabledow</item>
@@ -1518,7 +1706,6 @@
         <item>gminabobrowniki</item>
         <item>gminabodzentyn</item>
         <item>gminabogoria</item>
-        <item>gminabojanow</item>
         <item>gminabojanowo</item>
         <item>gminabojszowy</item>
         <item>gminaboleslawiec</item>
@@ -1527,10 +1714,14 @@
         <item>gminaborow</item>
         <item>gminaborowa</item>
         <item>gminaborzecin</item>
+        <item>gminaborzytuchom</item>
+        <item>gminabralin</item>
         <item>gminabranice</item>
         <item>gminabraniewo</item>
+        <item>gminabranszczyk</item>
         <item>gminabraszewice</item>
         <item>gminabrenna</item>
+        <item>gminabrok</item>
         <item>gminabrzegdolny</item>
         <item>gminabrzeziny</item>
         <item>gminabrzeznio</item>
@@ -1539,13 +1730,14 @@
         <item>gminabrzuze</item>
         <item>gminabrzyska</item>
         <item>gminabuczek</item>
-        <item>gminabuczkowice</item>
         <item>gminabudzow</item>
         <item>gminabudzyn</item>
+        <item>gminabukowinatatrzanska</item>
         <item>gminabukowsko</item>
         <item>gminabyczyna</item>
         <item>gminabystrasidzina</item>
-        <item>gminabyton</item>
+        <item>gminaceglow</item>
+        <item>gminacekcyn</item>
         <item>gminacekowkolonia</item>
         <item>gminacelestynow</item>
         <item>gminacewice</item>
@@ -1553,16 +1745,25 @@
         <item>gminachelm</item>
         <item>gminachelmiec</item>
         <item>gminachelmno</item>
+        <item>gminachlopice</item>
         <item>gminachmielnik</item>
+        <item>gminachociwel</item>
         <item>gminachocz</item>
         <item>gminachodel</item>
+        <item>gminachodow</item>
         <item>gminachojnice</item>
         <item>gminachojnow</item>
+        <item>gminachotcza</item>
+        <item>gminachrzastowice</item>
         <item>gminachrzypskowielkie</item>
         <item>gminachybie</item>
         <item>gminaciasna</item>
+        <item>gminaciechanow</item>
         <item>gminaciechocin</item>
+        <item>gminacieladz</item>
+        <item>gminacieszanow</item>
         <item>gminaciezkowice</item>
+        <item>gminacisek</item>
         <item>gminacisna</item>
         <item>gminacmolas</item>
         <item>gminacycow</item>
@@ -1570,19 +1771,26 @@
         <item>gminaczarna</item>
         <item>gminaczarnkow</item>
         <item>gminaczarnydunajec</item>
+        <item>gminaczastary</item>
         <item>gminaczechowicedziedzice</item>
         <item>gminaczernichow</item>
         <item>gminaczerniejewo</item>
+        <item>gminaczerniewice</item>
+        <item>gminaczernikowo</item>
         <item>gminaczerwionkaleszczyny</item>
-        <item>gminaczerwonka</item>
+        <item>gminaczerwonak</item>
         <item>gminaczluchow</item>
         <item>gminaczosnow</item>
+        <item>gminadabrowazielona</item>
+        <item>gminadabrowice</item>
         <item>gminadamaslawek</item>
         <item>gminadamnica</item>
         <item>gminadarlowo</item>
         <item>gminadebewielkie</item>
         <item>gminadebica</item>
         <item>gminadebno</item>
+        <item>gminadebowakloda</item>
+        <item>gminadebrzno</item>
         <item>gminadlutow</item>
         <item>gminadobczyce</item>
         <item>gminadobra</item>
@@ -1590,19 +1798,31 @@
         <item>gminadobrodzien</item>
         <item>gminadobron</item>
         <item>gminadobrzany</item>
+        <item>gminadobrzyca</item>
         <item>gminadobrzyniewoduze</item>
+        <item>gminadolsk</item>
         <item>gminadominowo</item>
         <item>gminadorohusk</item>
+        <item>gminadoruchow</item>
+        <item>gminadragacz</item>
+        <item>gminadrawsko</item>
+        <item>gminadruzbice</item>
         <item>gminadrzewica</item>
         <item>gminadubiecko</item>
+        <item>gminadubienka</item>
         <item>gminadukla</item>
         <item>gminadwikozy</item>
+        <item>gminadydnia</item>
         <item>gminadynow</item>
         <item>gminadziadowakloda</item>
         <item>gminadzialoszyce</item>
+        <item>gminadziemiany</item>
         <item>gminadzierzoniow</item>
+        <item>gminadzwola</item>
         <item>gminaelblag</item>
-        <item>gminafajslawice</item>
+        <item>gminaelk</item>
+        <item>gminafredropol</item>
+        <item>gminagarbatkaletnisko</item>
         <item>gminagarbow</item>
         <item>gminagarwolin</item>
         <item>gminagasawa</item>
@@ -1612,29 +1832,37 @@
         <item>gminagdow</item>
         <item>gminagielniow</item>
         <item>gminagieraltowice</item>
-        <item>gminaglinojeck</item>
         <item>gminaglogow</item>
+        <item>gminaglogowek</item>
         <item>gminagluchow</item>
+        <item>gminaglusk</item>
         <item>gminagluszyca</item>
         <item>gminagniew</item>
+        <item>gminagniewino</item>
         <item>gminagniewoszow</item>
         <item>gminagniezno</item>
         <item>gminagoczalkowicezdroj</item>
         <item>gminagodkowo</item>
         <item>gminagodow</item>
         <item>gminagodzieszewielkie</item>
+        <item>gminagodziszow</item>
         <item>gminagolancz</item>
+        <item>gminagolcza</item>
         <item>gminagoleszow</item>
         <item>gminagolina</item>
         <item>gminagolubdobrzyn</item>
+        <item>gminagoluchow</item>
+        <item>gminagomunice</item>
         <item>gminagoraj</item>
         <item>gminagorlice</item>
         <item>gminagorno</item>
+        <item>gminagorzyca</item>
         <item>gminagoscieradow</item>
         <item>gminagostyn</item>
         <item>gminagostynin</item>
         <item>gminagoszczyn</item>
         <item>gminagozd</item>
+        <item>gminagrabica</item>
         <item>gminagrabow</item>
         <item>gminagrabowiec</item>
         <item>gminagrabownadpilica</item>
@@ -1653,45 +1881,52 @@
         <item>gminagrudziadz</item>
         <item>gminagruta</item>
         <item>gminagrybow</item>
+        <item>gminagryfice</item>
+        <item>gminagrzmiaca</item>
         <item>gminahaczow</item>
         <item>gminahalinow</item>
         <item>gminahansk</item>
         <item>gminaharasiuki</item>
         <item>gminahazlach</item>
         <item>gminaherby</item>
+        <item>gminahorodlo</item>
         <item>gminahrubieszow</item>
         <item>gminahuszlew</item>
         <item>gminahyzne</item>
         <item>gminaimielno</item>
         <item>gminainowroclaw</item>
+        <item>gminairzadze</item>
         <item>gminaistebna</item>
+        <item>gminaiwanowice</item>
         <item>gminaiwierzyce</item>
         <item>gminaiwoniczzdroj</item>
         <item>gminaizabelin</item>
         <item>gminaizbica</item>
-        <item>gminajadow</item>
+        <item>gminaizbicko</item>
+        <item>gminajablon</item>
         <item>gminajaktorow</item>
+        <item>gminajakubow</item>
         <item>gminajanikowo</item>
+        <item>gminajanow</item>
         <item>gminajanowiec</item>
         <item>gminajanowpodlaski</item>
-        <item>gminajaraczewo</item>
+        <item>gminajarczow</item>
         <item>gminajarocin</item>
         <item>gminajasienicarosielna</item>
+        <item>gminajasliska</item>
         <item>gminajaslo</item>
         <item>gminajastkow</item>
         <item>gminajastrowie</item>
         <item>gminajastrzab</item>
         <item>gminajedlicze</item>
-        <item>gminajedlinsk</item>
-        <item>gminajedlnialetnisko</item>
         <item>gminajejkowice</item>
         <item>gminajemielnica</item>
-        <item>gminajemielno</item>
         <item>gminajerzmanowa</item>
         <item>gminajezewo</item>
         <item>gminajeziorawielkie</item>
         <item>gminajeziorzany</item>
         <item>gminajezowe</item>
+        <item>gminajoniec</item>
         <item>gminajordanow</item>
         <item>gminajozefow</item>
         <item>gminajozefownadwisla</item>
@@ -1699,14 +1934,18 @@
         <item>gminakakolewnica</item>
         <item>gminakamien</item>
         <item>gminakamienica</item>
-        <item>gminakamieniec</item>
+        <item>gminakamiennik</item>
         <item>gminakamionka</item>
         <item>gminakarczmiska</item>
         <item>gminakargowa</item>
+        <item>gminakarlino</item>
+        <item>gminakarniewo</item>
         <item>gminakaweczyn</item>
         <item>gminakazimierzbiskupi</item>
         <item>gminakepice</item>
+        <item>gminakesowo</item>
         <item>gminakielczyglow</item>
+        <item>gminakietrz</item>
         <item>gminakikol</item>
         <item>gminakiszkowo</item>
         <item>gminakleczew</item>
@@ -1721,22 +1960,30 @@
         <item>gminaklucze</item>
         <item>gminakluczewsko</item>
         <item>gminakobielewielkie</item>
+        <item>gminakobylanka</item>
         <item>gminakochanowice</item>
         <item>gminakock</item>
         <item>gminakodrab</item>
         <item>gminakolaczyce</item>
         <item>gminakolbaskowo</item>
+        <item>gminakolbiel</item>
         <item>gminakolczyglowy</item>
+        <item>gminakolobrzeg</item>
         <item>gminakoluszki</item>
         <item>gminakomancza</item>
+        <item>gminakomarowkapodlaska</item>
         <item>gminakomorniki</item>
         <item>gminakomprachcice</item>
         <item>gminakonarzyny</item>
         <item>gminakondratowice</item>
+        <item>gminakoneck</item>
         <item>gminakoniusza</item>
         <item>gminakonopiska</item>
         <item>gminakonskowola</item>
+        <item>gminakonstantynow</item>
         <item>gminakoprzywnica</item>
+        <item>gminakorfantow</item>
+        <item>gminakornik</item>
         <item>gminakorsze</item>
         <item>gminakorycin</item>
         <item>gminakorzenna</item>
@@ -1746,10 +1993,14 @@
         <item>gminakoscierzyna</item>
         <item>gminakosowlacki</item>
         <item>gminakostrzyn</item>
-        <item>gminakoszyce</item>
+        <item>gminakoszecin</item>
         <item>gminakotla</item>
         <item>gminakotun</item>
+        <item>gminakowiesy</item>
+        <item>gminakozieglowy</item>
         <item>gminakozlow</item>
+        <item>gminakramsk</item>
+        <item>gminakrasniczyn</item>
         <item>gminakrasnik</item>
         <item>gminakrasnobrod</item>
         <item>gminakrasnystaw</item>
@@ -1759,12 +2010,16 @@
         <item>gminakrosnice</item>
         <item>gminakrupskimlyn</item>
         <item>gminakruszwica</item>
+        <item>gminakrynice</item>
         <item>gminakrynki</item>
         <item>gminakrzanowice</item>
         <item>gminakrzemieniewo</item>
+        <item>gminakrzeszow</item>
         <item>gminakrzymow</item>
+        <item>gminakrzywcza</item>
         <item>gminakrzywin</item>
         <item>gminakrzyzanowice</item>
+        <item>gminaksawerow</item>
         <item>gminaksiazwielki</item>
         <item>gminakunice</item>
         <item>gminakunow</item>
@@ -1774,15 +2029,19 @@
         <item>gminakwilcz</item>
         <item>gminalabowa</item>
         <item>gminalabunie</item>
+        <item>gminalaczna</item>
+        <item>gminaladek</item>
         <item>gminalambinowice</item>
         <item>gminalanckorona</item>
+        <item>gminalancut</item>
+        <item>gminalapanow</item>
         <item>gminalapszenizne</item>
         <item>gminalasin</item>
         <item>gminalaskarzew</item>
         <item>gminalasowicewielkie</item>
         <item>gminalaszczow</item>
-        <item>gminalaszki</item>
         <item>gminalatowicz</item>
+        <item>gminalaziska</item>
         <item>gminalazy</item>
         <item>gminaleczyca</item>
         <item>gminaleczyce</item>
@@ -1792,11 +2051,14 @@
         <item>gminalelow</item>
         <item>gminalesna</item>
         <item>gminalesnapodlaska</item>
+        <item>gminalesniowice</item>
         <item>gminalesznowola</item>
         <item>gminalezajsk</item>
         <item>gminalichnowy</item>
         <item>gminalimanowa</item>
         <item>gminalinia</item>
+        <item>gminaliniewo</item>
+        <item>gminalipiany</item>
         <item>gminalipinki</item>
         <item>gminalipnik</item>
         <item>gminalipowa</item>
@@ -1804,43 +2066,51 @@
         <item>gminaliszki</item>
         <item>gminaliw</item>
         <item>gminalobez</item>
+        <item>gminalochow</item>
         <item>gminalodygowice</item>
         <item>gminalomazy</item>
+        <item>gminalomianki</item>
+        <item>gminaloniow</item>
         <item>gminalopiennikgorny</item>
         <item>gminalopuszno</item>
+        <item>gminalosice</item>
         <item>gminaluban</item>
         <item>gminalubartow</item>
         <item>gminalubasz</item>
+        <item>gminalubawka</item>
         <item>gminalubenia</item>
         <item>gminalubianka</item>
         <item>gminalubicz</item>
+        <item>gminalubien</item>
         <item>gminalubiewo</item>
         <item>gminalubin</item>
         <item>gminalubniany</item>
         <item>gminalubochnia</item>
-        <item>gminalubomia</item>
         <item>gminalubon</item>
+        <item>gminalubsza</item>
+        <item>gminalubyczakrolewska</item>
         <item>gminalukow</item>
         <item>gminalukowica</item>
         <item>gminalutowiska</item>
+        <item>gminalututow</item>
         <item>gminaluzino</item>
         <item>gminaluzna</item>
         <item>gminalysomice</item>
+        <item>gminamaciejowice</item>
         <item>gminamagnuszew</item>
+        <item>gminamajdankrolewski</item>
         <item>gminamakowpodhalanski</item>
-        <item>gminamalawies</item>
         <item>gminamalbork</item>
         <item>gminamaldyty</item>
         <item>gminamalkiniagorna</item>
         <item>gminamarcinowice</item>
         <item>gminamargonin</item>
         <item>gminamarianowo</item>
-        <item>gminamarkusy</item>
-        <item>gminamaslow</item>
+        <item>gminamarkuszow</item>
+        <item>gminamecinka</item>
         <item>gminamedyka</item>
         <item>gminamelgiew</item>
         <item>gminamichalow</item>
-        <item>gminamichalowo</item>
         <item>gminamiedzianagora</item>
         <item>gminamiedzna</item>
         <item>gminamiedzno</item>
@@ -1849,7 +2119,10 @@
         <item>gminamiedzyrzecpodlaski</item>
         <item>gminamiedzyzdroje</item>
         <item>gminamiejscepiastowe</item>
+        <item>gminamiekinia</item>
         <item>gminamielec</item>
+        <item>gminamielno</item>
+        <item>gminamieszkowice</item>
         <item>gminamilanow</item>
         <item>gminamilejow</item>
         <item>gminamilicz</item>
@@ -1858,21 +2131,26 @@
         <item>gminamiloslaw</item>
         <item>gminamilowka</item>
         <item>gminaminskmazowiecki</item>
+        <item>gminamirow</item>
         <item>gminamirsk</item>
         <item>gminamlynary</item>
+        <item>gminamodliborzyce</item>
         <item>gminamogielnica</item>
         <item>gminamogilany</item>
+        <item>gminamogilno</item>
+        <item>gminamorawica</item>
         <item>gminamordy</item>
         <item>gminamoryn</item>
         <item>gminamrocza</item>
         <item>gminamrozy</item>
+        <item>gminamsciwojow</item>
+        <item>gminamstow</item>
         <item>gminamszana</item>
         <item>gminamszanadolna</item>
         <item>gminamurow</item>
         <item>gminamycielin</item>
-        <item>gminamyslakowice</item>
+        <item>gminamykanow</item>
         <item>gminamysliborz</item>
-        <item>gminanadarzyn</item>
         <item>gminanamyslow</item>
         <item>gminanasielsk</item>
         <item>gminanawojowa</item>
@@ -1883,23 +2161,25 @@
         <item>gminaniedrzwicaduza</item>
         <item>gminaniedzwiada</item>
         <item>gminaniedzwiedz</item>
-        <item>gminaniegoslawice</item>
-        <item>gminaniwiska</item>
+        <item>gminanowakarczma</item>
         <item>gminanowaruda</item>
         <item>gminanowawiesleborska</item>
+        <item>gminanowe</item>
         <item>gminanowemiasto</item>
         <item>gminanowemiastonadwarta</item>
-        <item>gminanowogrodbobrzanski</item>
+        <item>gminanowogrod</item>
         <item>gminanowosolna</item>
         <item>gminanowykaweczyn</item>
+        <item>gminanowykorczyn</item>
         <item>gminanowystaw</item>
         <item>gminanowytarg</item>
         <item>gminanowytomysl</item>
+        <item>gminanozdrzec</item>
         <item>gminanur</item>
         <item>gminaobrazow</item>
         <item>gminaochotnicadolna</item>
         <item>gminaogrodzieniec</item>
-        <item>gminaolecko</item>
+        <item>gminaolszanica</item>
         <item>gminaolsztynek</item>
         <item>gminaolszyna</item>
         <item>gminaopatowiec</item>
@@ -1909,11 +2189,15 @@
         <item>gminaosiekjasielski</item>
         <item>gminaosiekmaly</item>
         <item>gminaosielsko</item>
+        <item>gminaosina</item>
+        <item>gminaosjakow</item>
+        <item>gminaostrorog</item>
         <item>gminaostrow</item>
         <item>gminaostrowek</item>
         <item>gminaostrowlubelski</item>
         <item>gminaostrowmazowiecka</item>
         <item>gminaostrowwielkopolski</item>
+        <item>gminaotmuchow</item>
         <item>gminaotyn</item>
         <item>gminaozarow</item>
         <item>gminaozarowice</item>
@@ -1921,27 +2205,32 @@
         <item>gminaozorkow</item>
         <item>gminapabianice</item>
         <item>gminapacanow</item>
+        <item>gminapacyna</item>
         <item>gminapaczkow</item>
         <item>gminapadewnarodowa</item>
-        <item>gminapajeczno</item>
         <item>gminapakoslaw</item>
         <item>gminapakoslawice</item>
         <item>gminapalecznica</item>
         <item>gminapanki</item>
         <item>gminaparchowo</item>
         <item>gminaparczew</item>
-        <item>gminapawlosiow</item>
+        <item>gminapaslek</item>
+        <item>gminapatnow</item>
         <item>gminapawlowice</item>
         <item>gminapawlowiczki</item>
+        <item>gminapawonkow</item>
         <item>gminapeclaw</item>
         <item>gminapelplin</item>
+        <item>gminapepowo</item>
         <item>gminapiaski</item>
         <item>gminapiatnica</item>
-        <item>gminapiecki</item>
         <item>gminapiekoszow</item>
+        <item>gminapieniezno</item>
         <item>gminapilchowice</item>
+        <item>gminapinczow</item>
         <item>gminapionki</item>
-        <item>gminapiotrkowtrybunalski</item>
+        <item>gminaplaska</item>
+        <item>gminaplaterowka</item>
         <item>gminaplesna</item>
         <item>gminapleszew</item>
         <item>gminaplonsk</item>
@@ -1949,6 +2238,7 @@
         <item>gminapoczesna</item>
         <item>gminapodedworze</item>
         <item>gminapodegrodzie</item>
+        <item>gminapodgorzyn</item>
         <item>gminapokoj</item>
         <item>gminapolajewo</item>
         <item>gminapolaniec</item>
@@ -1957,16 +2247,18 @@
         <item>gminapolice</item>
         <item>gminapolkowice</item>
         <item>gminapomiechowek</item>
+        <item>gminaponiatowa</item>
         <item>gminapopielow</item>
         <item>gminapopow</item>
-        <item>gminaporaj</item>
         <item>gminapotegowo</item>
+        <item>gminapotokwielki</item>
         <item>gminapraszka</item>
-        <item>gminaprazmow</item>
         <item>gminaprochowice</item>
         <item>gminapromna</item>
         <item>gminaproszkow</item>
+        <item>gminaprusice</item>
         <item>gminapruszczgdanski</item>
+        <item>gminaprzechlewo</item>
         <item>gminaprzeclaw</item>
         <item>gminaprzedecz</item>
         <item>gminaprzemet</item>
@@ -1976,7 +2268,9 @@
         <item>gminaprzodkowo</item>
         <item>gminaprzykona</item>
         <item>gminaprzylek</item>
+        <item>gminaprzyrow</item>
         <item>gminaprzystajn</item>
+        <item>gminaprzytoczna</item>
         <item>gminapuchaczow</item>
         <item>gminapuck</item>
         <item>gminapulawy</item>
@@ -1984,10 +2278,10 @@
         <item>gminapuszczamarianska</item>
         <item>gminapysznica</item>
         <item>gminapyzdry</item>
+        <item>gminarabawyzna</item>
         <item>gminarachanie</item>
         <item>gminaraciechowice</item>
-        <item>gminaraclawice</item>
-        <item>gminaradecznica</item>
+        <item>gminaradgoszcz</item>
         <item>gminaradkow</item>
         <item>gminaradlow</item>
         <item>gminaradomin</item>
@@ -1995,16 +2289,29 @@
         <item>gminaradomyslnadsanem</item>
         <item>gminaradoszyce</item>
         <item>gminaradwanice</item>
+        <item>gminaradymno</item>
+        <item>gminaradziejow</item>
         <item>gminaradzilow</item>
+        <item>gminarajgrod</item>
+        <item>gminarakow</item>
+        <item>gminarakszawa</item>
         <item>gminarawamazowiecka</item>
+        <item>gminaregnow</item>
         <item>gminarenskawies</item>
+        <item>gminarogozno</item>
+        <item>gminarokitno</item>
+        <item>gminaropa</item>
         <item>gminarossosz</item>
         <item>gminarozprza</item>
         <item>gminarucianenida</item>
         <item>gminarudahuta</item>
         <item>gminarudna</item>
         <item>gminarudniki</item>
+        <item>gminarudniknadsanem</item>
+        <item>gminarudziniec</item>
         <item>gminarusiec</item>
+        <item>gminarusinow</item>
+        <item>gminarybczewice</item>
         <item>gminarychliki</item>
         <item>gminarychtal</item>
         <item>gminaryczywol</item>
@@ -2012,32 +2319,39 @@
         <item>gminarypin</item>
         <item>gminarytro</item>
         <item>gminarytwiany</item>
-        <item>gminarzasnia</item>
         <item>gminarzeczyca</item>
         <item>gminarzepiennikstrzyzewski</item>
         <item>gminarzepin</item>
+        <item>gminarzezawa</item>
         <item>gminarzgow</item>
         <item>gminasadki</item>
         <item>gminasadowne</item>
         <item>gminasamborzec</item>
         <item>gminasanok</item>
+        <item>gminasawin</item>
         <item>gminascinawa</item>
         <item>gminasedziejowice</item>
+        <item>gminasejny</item>
+        <item>gminasekowa</item>
         <item>gminasepopol</item>
         <item>gminaserokomla</item>
         <item>gminasianow</item>
         <item>gminasicienko</item>
         <item>gminasieciechow</item>
         <item>gminasiedlce</item>
+        <item>gminasiedliszcze</item>
         <item>gminasiemiatycze</item>
+        <item>gminasiemien</item>
         <item>gminasiemysl</item>
         <item>gminasiennica</item>
         <item>gminasiennicarozana</item>
         <item>gminasienno</item>
         <item>gminasiepraw</item>
         <item>gminasieradz</item>
+        <item>gminasierakow</item>
         <item>gminasierakowice</item>
         <item>gminasiewierz</item>
+        <item>gminasitkowkanowiny</item>
         <item>gminasitno</item>
         <item>gminaskarzyskokoscielne</item>
         <item>gminaskepe</item>
@@ -2045,16 +2359,22 @@
         <item>gminaskoczow</item>
         <item>gminaskoki</item>
         <item>gminaskolyszyn</item>
+        <item>gminaskrwilno</item>
         <item>gminaskrzyszow</item>
         <item>gminaskulsk</item>
+        <item>gminaskwierzyna</item>
         <item>gminaslawa</item>
+        <item>gminasliwice</item>
         <item>gminaslopnice</item>
+        <item>gminaslubice</item>
         <item>gminaslupca</item>
         <item>gminaslupia</item>
+        <item>gminaslupiakonecka</item>
+        <item>gminasmigiel</item>
         <item>gminasobieniejeziory</item>
+        <item>gminasobolew</item>
         <item>gminasobotka</item>
         <item>gminasokolka</item>
-        <item>gminasokoly</item>
         <item>gminasolina</item>
         <item>gminasosnicowice</item>
         <item>gminasosnie</item>
@@ -2069,11 +2389,16 @@
         <item>gminastaremiasto</item>
         <item>gminastarepole</item>
         <item>gminastarogardgdanski</item>
+        <item>gminastarybrus</item>
+        <item>gminastarydzierzgon</item>
+        <item>gminastarytarg</item>
         <item>gminastawiszyn</item>
+        <item>gminastepnica</item>
         <item>gminastoczeklukowski</item>
         <item>gminastopnica</item>
         <item>gminastrawczyn</item>
         <item>gminastrykow</item>
+        <item>gminastryszawa</item>
         <item>gminastryszow</item>
         <item>gminastrzalkowo</item>
         <item>gminastrzelceopolskie</item>
@@ -2082,38 +2407,43 @@
         <item>gminastrzyzewice</item>
         <item>gminastupsk</item>
         <item>gminasubkowy</item>
+        <item>gminasuchan</item>
         <item>gminasuchedniow</item>
         <item>gminasuchozebry</item>
         <item>gminasuchylas</item>
         <item>gminasulechow</item>
         <item>gminasulecin</item>
+        <item>gminasulejow</item>
         <item>gminasulikow</item>
         <item>gminasulmierzyce</item>
         <item>gminasulow</item>
         <item>gminasusiec</item>
-        <item>gminaswierklaniec</item>
+        <item>gminaswiercze</item>
+        <item>gminaswierczow</item>
+        <item>gminaswierklany</item>
         <item>gminaswierzawa</item>
         <item>gminaswieszyno</item>
         <item>gminaswilcza</item>
         <item>gminaszadek</item>
         <item>gminaszaflary</item>
         <item>gminaszastarka</item>
+        <item>gminaszczawinkoscielny</item>
         <item>gminaszczebrzeszyn</item>
         <item>gminaszczekociny</item>
         <item>gminaszczercow</item>
-        <item>gminaszczutowo</item>
         <item>gminaszczytna</item>
         <item>gminaszczytniki</item>
-        <item>gminaszemud</item>
+        <item>gminaszczytno</item>
         <item>gminaszerzyny</item>
         <item>gminaszlichtyngowa</item>
+        <item>gminaszrensk</item>
+        <item>gminaszudzialowo</item>
         <item>gminaszydlow</item>
         <item>gminatarlow</item>
         <item>gminatarnow</item>
         <item>gminatarnowiec</item>
         <item>gminatarnowopolski</item>
         <item>gminateresin</item>
-        <item>gminaterespol</item>
         <item>gminatereszpol</item>
         <item>gminatluchowo</item>
         <item>gminatluszcz</item>
@@ -2123,12 +2453,15 @@
         <item>gminatoszek</item>
         <item>gminatrabkiwielkie</item>
         <item>gminatrzebiatow</item>
+        <item>gminatrzebielino</item>
         <item>gminatrzebinia</item>
-        <item>gminatrzeszczany</item>
         <item>gminatrzyciaz</item>
+        <item>gminatrzydnikduzy</item>
         <item>gminatuchow</item>
+        <item>gminatulowice</item>
         <item>gminaturosnkoscielna</item>
         <item>gminatuszownarodowy</item>
+        <item>gminatworog</item>
         <item>gminatyczyn</item>
         <item>gminatymbark</item>
         <item>gminatyrawawoloska</item>
@@ -2137,15 +2470,21 @@
         <item>gminaulanmajorat</item>
         <item>gminaulanow</item>
         <item>gminaulez</item>
+        <item>gminaulhowek</item>
         <item>gminaurszulin</item>
         <item>gminaurzedow</item>
+        <item>gminausciegorlickie</item>
         <item>gminauscimow</item>
         <item>gminawachock</item>
+        <item>gminawadrozewielkie</item>
         <item>gminawagrowiec</item>
+        <item>gminawalce</item>
         <item>gminawapielsk</item>
         <item>gminawasilkow</item>
+        <item>gminawasosz</item>
         <item>gminawawolnica</item>
         <item>gminawejherowo</item>
+        <item>gminawerbkowice</item>
         <item>gminawiazow</item>
         <item>gminawiazowna</item>
         <item>gminawicko</item>
@@ -2153,16 +2492,21 @@
         <item>gminawielbark</item>
         <item>gminawielen</item>
         <item>gminawielgie</item>
+        <item>gminawielgomlyny</item>
         <item>gminawieliszew</item>
         <item>gminawielkanieszawka</item>
         <item>gminawieniawa</item>
         <item>gminawieprz</item>
         <item>gminawieruszow</item>
+        <item>gminawierzbinek</item>
         <item>gminawierzbno</item>
+        <item>gminawierzchlas</item>
         <item>gminawierzchoslawice</item>
         <item>gminawietrzychowice</item>
         <item>gminawijewo</item>
+        <item>gminawilczyce</item>
         <item>gminawilczyn</item>
+        <item>gminawilkolaz</item>
         <item>gminawilkow</item>
         <item>gminawilkowice</item>
         <item>gminawinnica</item>
@@ -2173,12 +2517,14 @@
         <item>gminawitkowo</item>
         <item>gminawladyslawow</item>
         <item>gminawlen</item>
+        <item>gminawloclawek</item>
         <item>gminawlodawa</item>
         <item>gminawloszczowa</item>
         <item>gminawodzierady</item>
         <item>gminawodzislaw</item>
         <item>gminawojcieszkow</item>
         <item>gminawojnicz</item>
+        <item>gminawojslawice</item>
         <item>gminawolakrzysztoporska</item>
         <item>gminawolanow</item>
         <item>gminawolbrom</item>
@@ -2189,15 +2535,18 @@
         <item>gminawreczycawielka</item>
         <item>gminawronki</item>
         <item>gminawyrzysk</item>
-        <item>gminazabierzow</item>
+        <item>gminawysokie</item>
         <item>gminazabno</item>
         <item>gminazagan</item>
-        <item>gminazagorz</item>
+        <item>gminazagorow</item>
         <item>gminazaklikow</item>
         <item>gminazakroczym</item>
         <item>gminazakrzowek</item>
+        <item>gminazalesie</item>
         <item>gminazaleszany</item>
+        <item>gminazaluski</item>
         <item>gminazamosc</item>
+        <item>gminazarnow</item>
         <item>gminazarnowiec</item>
         <item>gminazarow</item>
         <item>gminazarszyn</item>
@@ -2209,20 +2558,26 @@
         <item>gminazbojno</item>
         <item>gminazbroslawice</item>
         <item>gminazdunskawola</item>
-        <item>gminazduny</item>
         <item>gminazdzieszowice</item>
+        <item>gminazebowice</item>
         <item>gminazebrzydowice</item>
+        <item>gminazegocina</item>
         <item>gminazelazkow</item>
+        <item>gminazembrzyce</item>
         <item>gminazgierz</item>
         <item>gminazgorzelec</item>
         <item>gminaziebice</item>
         <item>gminazielonki</item>
         <item>gminazlawieswielka</item>
+        <item>gminazlota</item>
+        <item>gminazlotnikikujawskie</item>
         <item>gminazmudz</item>
         <item>gminaznin</item>
         <item>gminazolkiewka</item>
         <item>gminazolynia</item>
         <item>gminazukowice</item>
+        <item>gminazurawica</item>
+        <item>gminazyrakow</item>
         <item>gminazyrzyn</item>
         <item>gminazytno</item>
         <item>gniezno</item>
@@ -2231,19 +2586,19 @@
         <item>gora</item>
         <item>gorakalwaria</item>
         <item>gorlice</item>
+        <item>gorzno</item>
         <item>gorzowslaski</item>
         <item>gorzowwielkopolski</item>
         <item>gostynin</item>
         <item>grajewo</item>
         <item>grodziskmazowiecki</item>
-        <item>gronowoelblaskie</item>
         <item>grudziadz</item>
+        <item>grybow</item>
         <item>gryfino</item>
         <item>gryfowslaski</item>
         <item>hel</item>
         <item>hrubieszow</item>
         <item>inowroclaw</item>
-        <item>iwanowice</item>
         <item>izbicakujawska</item>
         <item>jablonowopomorskie</item>
         <item>janowiecwielkopolski</item>
@@ -2253,7 +2608,6 @@
         <item>jaslo</item>
         <item>jastrzebiezdroj</item>
         <item>jawor</item>
-        <item>jaworzno</item>
         <item>jedlinazdroj</item>
         <item>jelczlaskowice</item>
         <item>jeleniagora</item>
@@ -2274,9 +2628,9 @@
         <item>kepno</item>
         <item>ketrzyn</item>
         <item>kielce</item>
-        <item>kielczyglow</item>
         <item>klodawa</item>
         <item>klodzko</item>
+        <item>kluczbork</item>
         <item>knurow</item>
         <item>kobylka</item>
         <item>kolo</item>
@@ -2306,11 +2660,13 @@
         <item>krzeszowice</item>
         <item>krzyzwielkopolski</item>
         <item>ksiazwielkopolski</item>
-        <item>kudowazdroj</item>
         <item>kujawskopomorskie</item>
+        <item>kutno</item>
         <item>kuzniaraciborska</item>
+        <item>kwidzyn</item>
         <item>labiszyn</item>
         <item>ladekzdroj</item>
+        <item>lancut</item>
         <item>lapy</item>
         <item>lask</item>
         <item>laskarzew</item>
@@ -2322,10 +2678,10 @@
         <item>legnica</item>
         <item>leszno</item>
         <item>lewinbrzeski</item>
+        <item>lewinbrzeski2</item>
         <item>lezajsk</item>
         <item>limanowa</item>
         <item>lipno</item>
-        <item>lipsko</item>
         <item>lodz</item>
         <item>lodzkie</item>
         <item>lowicz</item>
@@ -2342,11 +2698,8 @@
         <item>lwowekslaski</item>
         <item>malbork</item>
         <item>malopolskie</item>
-        <item>marciszow</item>
         <item>marki</item>
-        <item>maslowice</item>
         <item>mazowieckie</item>
-        <item>miastko</item>
         <item>michalowice</item>
         <item>miechow</item>
         <item>miedzyrzecpodlaski</item>
@@ -2354,6 +2707,7 @@
         <item>mielec</item>
         <item>milanowek</item>
         <item>minskmazowiecki</item>
+        <item>mniszkow</item>
         <item>mosina</item>
         <item>mragowo</item>
         <item>mragowski</item>
@@ -2363,18 +2717,17 @@
         <item>myslowice</item>
         <item>myszkow</item>
         <item>naklonadnotecia</item>
-        <item>nasielsk</item>
         <item>niemodlin</item>
         <item>niepolomice</item>
         <item>nisko</item>
         <item>nowadeba</item>
         <item>nowasarzyna</item>
+        <item>nowasol</item>
         <item>nowemiasteczko</item>
         <item>noweskalmierzyce</item>
         <item>nowogard</item>
         <item>nowogrodbobrzanski</item>
         <item>nowogrodziec</item>
-        <item>nowosolna</item>
         <item>nowydwormazowiecki</item>
         <item>nowysacz</item>
         <item>nowytarg</item>
@@ -2388,6 +2741,8 @@
         <item>opoczno</item>
         <item>opole</item>
         <item>opolelubelskie</item>
+        <item>opolskie</item>
+        <item>orzesze</item>
         <item>osieczna</item>
         <item>osiecznica</item>
         <item>ostroda</item>
@@ -2405,13 +2760,16 @@
         <item>piekaryslaskie</item>
         <item>piensk</item>
         <item>pila</item>
+        <item>pilzno</item>
         <item>piotrkowtrybunalski</item>
         <item>pisz</item>
         <item>plock</item>
         <item>plonsk</item>
         <item>pniewy</item>
+        <item>pobiedziska</item>
         <item>podkarpackie</item>
         <item>podkowalesna</item>
+        <item>podlaskie</item>
         <item>polczynzdroj</item>
         <item>pomorskie</item>
         <item>poniec</item>
@@ -2420,7 +2778,7 @@
         <item>powiataugustowski</item>
         <item>powiatbedzinski</item>
         <item>powiatbelchatowski</item>
-        <item>powiatbialobrzeski</item>
+        <item>powiatbialostocki</item>
         <item>powiatbialski</item>
         <item>powiatbielski</item>
         <item>powiatbieszczadzki</item>
@@ -2446,6 +2804,7 @@
         <item>powiatczluchowski</item>
         <item>powiatdabrowski</item>
         <item>powiatdebicki</item>
+        <item>powiatdrawski</item>
         <item>powiatdzialdowski</item>
         <item>powiatdzierzoniowski</item>
         <item>powiatelblaski</item>
@@ -2460,10 +2819,11 @@
         <item>powiatgoleniowski</item>
         <item>powiatgolubskodobrzynski</item>
         <item>powiatgorlicki</item>
+        <item>powiatgorowski</item>
         <item>powiatgorzowski</item>
         <item>powiatgostynski</item>
+        <item>powiatgrajewski</item>
         <item>powiatgrojecki</item>
-        <item>powiatgrudziadzki</item>
         <item>powiatgryficki</item>
         <item>powiatgryfinski</item>
         <item>powiathajnowski</item>
@@ -2478,6 +2838,7 @@
         <item>powiatjedrzejowski</item>
         <item>powiatjeleniogorski</item>
         <item>powiatkaliski</item>
+        <item>powiatkamiennogorski</item>
         <item>powiatkamienski</item>
         <item>powiatkartuski</item>
         <item>powiatkazimierski</item>
@@ -2502,6 +2863,7 @@
         <item>powiatkrosnienski</item>
         <item>powiatkrotoszynski</item>
         <item>powiatkutnowski</item>
+        <item>powiatlancucki</item>
         <item>powiatlaski</item>
         <item>powiatleborski</item>
         <item>powiatleczycki</item>
@@ -2516,6 +2878,7 @@
         <item>powiatlipski</item>
         <item>powiatlobeski</item>
         <item>powiatlodzkiwschodni</item>
+        <item>powiatlosicki</item>
         <item>powiatlowicki</item>
         <item>powiatlubaczowski</item>
         <item>powiatlubanski</item>
@@ -2536,9 +2899,11 @@
         <item>powiatmyslenicki</item>
         <item>powiatmyszkowski</item>
         <item>powiatnakielski</item>
+        <item>powiatnamyslowski</item>
         <item>powiatnidzicki</item>
         <item>powiatnizanski</item>
         <item>powiatnowodworski</item>
+        <item>powiatnowomiejski</item>
         <item>powiatnowosadecki</item>
         <item>powiatnowosolski</item>
         <item>powiatnowotarski</item>
@@ -2574,7 +2939,6 @@
         <item>powiatproszowicki</item>
         <item>powiatprudnicki</item>
         <item>powiatpruszkowski</item>
-        <item>powiatprzasnyski</item>
         <item>powiatprzemyski</item>
         <item>powiatprzeworski</item>
         <item>powiatprzysuski</item>
@@ -2597,6 +2961,7 @@
         <item>powiatrzeszowski</item>
         <item>powiatsandomierski</item>
         <item>powiatsanocki</item>
+        <item>powiatsejnenski</item>
         <item>powiatsepolenski</item>
         <item>powiatsiedlecki</item>
         <item>powiatsiemiatycki</item>
@@ -2624,6 +2989,7 @@
         <item>powiatswidnicki</item>
         <item>powiatswidwinski</item>
         <item>powiatswiebodzinski</item>
+        <item>powiatswiecki</item>
         <item>powiatszamotulski</item>
         <item>powiatszczycienski</item>
         <item>powiatsztumski</item>
@@ -2642,6 +3008,7 @@
         <item>powiatwagrowiecki</item>
         <item>powiatwalecki</item>
         <item>powiatwarszawskizachodni</item>
+        <item>powiatwegorzewski</item>
         <item>powiatwegrowski</item>
         <item>powiatwejherowski</item>
         <item>powiatwielicki</item>
@@ -2661,7 +3028,6 @@
         <item>powiatwyszkowski</item>
         <item>powiatzabkowicki</item>
         <item>powiatzaganski</item>
-        <item>powiatzambrowski</item>
         <item>powiatzamojski</item>
         <item>powiatzarski</item>
         <item>powiatzawiercianski</item>
@@ -2672,34 +3038,33 @@
         <item>powiatzlotoryjski</item>
         <item>powiatzlotowski</item>
         <item>powiatzninski</item>
-        <item>powiatzurominski</item>
         <item>powiatzyrardowski</item>
         <item>powiatzywiecki</item>
         <item>poznan</item>
-        <item>prostki</item>
         <item>proszowice</item>
         <item>prudnik</item>
+        <item>pruszczgdanski</item>
         <item>pruszkow</item>
         <item>przasnysz</item>
         <item>przemysl</item>
         <item>przeworsk</item>
         <item>przysucha</item>
         <item>pszczyna</item>
-        <item>pszow</item>
         <item>puck</item>
         <item>pulawy</item>
+        <item>pultusk</item>
+        <item>puszczykowo</item>
         <item>pyskowice</item>
         <item>rabkazdroj</item>
         <item>raciaz</item>
         <item>raciborz</item>
-        <item>raciechowice</item>
         <item>radom</item>
         <item>radomsko</item>
+        <item>radomyslwielki</item>
         <item>radymno</item>
         <item>radziejow</item>
         <item>radzionkow</item>
         <item>radzynpodlaski</item>
-        <item>rakow</item>
         <item>rawamazowiecka</item>
         <item>rawicz</item>
         <item>reda</item>
@@ -2713,6 +3078,7 @@
         <item>rymanow</item>
         <item>rypin</item>
         <item>rzeszow</item>
+        <item>rzeszowprojekt</item>
         <item>sandomierz</item>
         <item>sanok</item>
         <item>sedziszowmalopolski</item>
@@ -2720,7 +3086,6 @@
         <item>siedlce</item>
         <item>siemianowiceslaskie</item>
         <item>siemiatycze</item>
-        <item>sieniawa</item>
         <item>sieradz</item>
         <item>skarzyskokamienna</item>
         <item>skawina</item>
@@ -2739,17 +3104,15 @@
         <item>srodaslaska</item>
         <item>srodawielkopolska</item>
         <item>starachowice</item>
+        <item>stargard</item>
         <item>starogardgdanski</item>
         <item>starysacz</item>
         <item>staszow</item>
         <item>stronieslaskie</item>
-        <item>strzegom</item>
         <item>strzyzow</item>
-        <item>suchylas</item>
         <item>sulejowek</item>
         <item>sulkowice</item>
         <item>sulmierzyce</item>
-        <item>suwalski</item>
         <item>swarzedz</item>
         <item>swidnica</item>
         <item>swidnik</item>
@@ -2772,8 +3135,10 @@
         <item>terespol</item>
         <item>tomaszowlubelski</item>
         <item>tomaszowmazowiecki</item>
+        <item>tomaszowmazowieckiprojekt</item>
         <item>torun</item>
         <item>trzcianka</item>
+        <item>trzcinskozdroj</item>
         <item>trzebnica</item>
         <item>trzemeszno</item>
         <item>tuliszkow</item>
@@ -2786,7 +3151,7 @@
         <item>ustrzykidolne</item>
         <item>wadowice</item>
         <item>wagrowiec</item>
-        <item>walbrzych</item>
+        <item>walcz</item>
         <item>warminskomazurskie</item>
         <item>warszawa</item>
         <item>wasosz</item>
@@ -2795,7 +3160,7 @@
         <item>wiecbork</item>
         <item>wieliczka</item>
         <item>wielkopolskie</item>
-        <item>wizna</item>
+        <item>wielun</item>
         <item>wladyslawowo</item>
         <item>wloclawek</item>
         <item>wlodawa</item>
@@ -2824,6 +3189,7 @@
         <item>zielonagora</item>
         <item>zielonka</item>
         <item>zlotoryja</item>
+        <item>zlotow</item>
         <item>zory</item>
         <item>zwolen</item>
         <item>zyrardow</item>
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
index cc31d893..18249ba8 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.migrations
 import android.content.Context
 import androidx.preference.PreferenceManager
 import androidx.room.Room
+import androidx.room.migration.Migration
 import androidx.room.testing.MigrationTestHelper
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import androidx.test.core.app.ApplicationProvider
@@ -16,7 +17,7 @@ abstract class AbstractMigrationTest {
 
     val dbName = "migration-test"
 
-    val context: Context get() = ApplicationProvider.getApplicationContext()
+    private val context: Context get() = ApplicationProvider.getApplicationContext()
 
     @get:Rule
     val helper: MigrationTestHelper = MigrationTestHelper(
@@ -25,6 +26,10 @@ abstract class AbstractMigrationTest {
         FrameworkSQLiteOpenHelperFactory()
     )
 
+    fun runMigrationsAndValidate(migration: Migration) {
+        helper.runMigrationsAndValidate(dbName, migration.endVersion, true, migration).close()
+    }
+
     fun getMigratedRoomDatabase(): AppDatabase {
         val database = Room.databaseBuilder(
             ApplicationProvider.getApplicationContext(),
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
index a0290473..f614c8ca 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@@ -33,7 +33,7 @@ class Migration12Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+        runMigrationsAndValidate(Migration12())
 
         val db = getMigratedRoomDatabase()
         val students = runBlocking { db.studentDao.loadAll() }
@@ -49,6 +49,7 @@ class Migration12Test : AbstractMigrationTest() {
             assertEquals(2, studentId)
             assertEquals(6, classId)
         }
+        db.close()
     }
 
     @Test
@@ -62,7 +63,7 @@ class Migration12Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+        runMigrationsAndValidate(Migration12())
 
         val db = getMigratedRoomDatabase()
         val students = runBlocking { db.studentDao.loadAll() }
@@ -73,6 +74,7 @@ class Migration12Test : AbstractMigrationTest() {
             assertEquals(2, studentId)
             assertEquals(1, classId)
         }
+        db.close()
     }
 
     @Test
@@ -88,7 +90,7 @@ class Migration12Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
+        runMigrationsAndValidate(Migration12())
 
         val db = getMigratedRoomDatabase()
         val students = runBlocking { db.studentDao.loadAll() }
@@ -107,6 +109,7 @@ class Migration12Test : AbstractMigrationTest() {
             assertEquals(studentId, 3)
             assertEquals(true, isCurrent)
         }
+        db.close()
     }
 
     private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean) {
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index bdfb4137..b0c03fb1 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -57,6 +57,8 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals("C", className)
             assertEquals("Publiczna szkoła Wulkanowego-fejka nr 2 w fakelog.cf", schoolName)
         }
+
+        db.close()
     }
 
     @Test
@@ -85,6 +87,8 @@ class Migration13Test : AbstractMigrationTest() {
             assertEquals("", className)
             assertEquals("Publiczna szkoła Wulkanowego-fejka nr 1 w fakelog.cf", schoolName)
         }
+
+        db.close()
     }
 
     @Test
@@ -148,6 +152,7 @@ class Migration13Test : AbstractMigrationTest() {
             assertFalse(semesters[2].second)
             assertTrue(semesters[3].second)
         }
+        db.close()
     }
 
     private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
index 8e744f27..19eda9ba 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
@@ -27,7 +27,7 @@ class Migration27Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
+        runMigrationsAndValidate(Migration27())
 
         val db = getMigratedRoomDatabase()
         val students = runBlocking { db.studentDao.loadAll() }
@@ -39,6 +39,8 @@ class Migration27Test : AbstractMigrationTest() {
             assertEquals(123, userLoginId)
             assertEquals("Student Jan", userName)
         }
+
+        db.close()
     }
 
     @Test
@@ -49,7 +51,7 @@ class Migration27Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
+        runMigrationsAndValidate(Migration27())
 
         val db = getMigratedRoomDatabase()
         val students = runBlocking { db.studentDao.loadAll() }
@@ -61,6 +63,8 @@ class Migration27Test : AbstractMigrationTest() {
             assertEquals(2, userLoginId)
             assertEquals("Unit Jan", userName)
         }
+
+        db.close()
     }
 
     @Test
@@ -73,7 +77,7 @@ class Migration27Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
+        runMigrationsAndValidate(Migration27())
 
         val db = getMigratedRoomDatabase()
         val students = runBlocking { db.studentDao.loadAll() }
@@ -90,6 +94,8 @@ class Migration27Test : AbstractMigrationTest() {
             assertEquals(333, userLoginId)
             assertEquals("Unit Tomasz", userName)
         }
+
+        db.close()
     }
 
     private fun createStudent(db: SupportSQLiteDatabase, id: Long, userLoginId: Int, studentName: String) {
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration35Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration35Test.kt
index 883cdb81..79c24f2e 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration35Test.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration35Test.kt
@@ -29,7 +29,7 @@ class Migration35Test : AbstractMigrationTest() {
             close()
         }
 
-        helper.runMigrationsAndValidate(dbName, 35, true, Migration35(AppInfo()))
+        runMigrationsAndValidate(Migration35(AppInfo()))
 
         val db = getMigratedRoomDatabase()
         val students = runBlocking { db.studentDao.loadAll() }
@@ -38,6 +38,8 @@ class Migration35Test : AbstractMigrationTest() {
 
         assertTrue { students[0].avatarColor in AppInfo().defaultColorsForAvatar }
         assertTrue { students[1].avatarColor in AppInfo().defaultColorsForAvatar }
+
+        db.close()
     }
 
     private fun createStudent(db: SupportSQLiteDatabase, id: Long) {
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt
new file mode 100644
index 00000000..1855e0d5
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration54Test.kt
@@ -0,0 +1,130 @@
+package io.github.wulkanowy.data.db.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
+import android.os.Build
+import androidx.sqlite.db.SupportSQLiteDatabase
+import dagger.hilt.android.testing.HiltAndroidTest
+import dagger.hilt.android.testing.HiltTestApplication
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.Sdk.ScrapperLoginType.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import kotlin.random.Random
+import kotlin.test.assertEquals
+
+@HiltAndroidTest
+@RunWith(RobolectricTestRunner::class)
+@OptIn(ExperimentalCoroutinesApi::class)
+@Config(sdk = [Build.VERSION_CODES.O_MR1], application = HiltTestApplication::class)
+class Migration54Test : AbstractMigrationTest() {
+
+    @Test
+    fun `don't touch unrelated students`() = runTest {
+        with(helper.createDatabase(dbName, 53)) {
+            createStudent(1, STANDARD, "vulcan.net.pl", "rzeszow", "Jan Michniewicz")
+            createStudent(2, ADFSLight, "umt.tarnow.pl", "tarnow", "Joanna Marcinkiewicz")
+            close()
+        }
+
+        runMigrationsAndValidate(Migration54())
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll()
+
+        assertEquals(2, students.size)
+        with(students[0]) {
+            assertEquals(STANDARD.name, loginType)
+            assertEquals("https://vulcan.net.pl", scrapperBaseUrl)
+            assertEquals("rzeszow", symbol)
+        }
+        with(students[1]) {
+            assertEquals(ADFSLight.name, loginType)
+            assertEquals("https://umt.tarnow.pl", scrapperBaseUrl)
+            assertEquals("tarnow", symbol)
+        }
+        db.close()
+    }
+
+    @Test
+    fun `remove tomaszow mazowiecki students`() = runTest {
+        with(helper.createDatabase(dbName, 53)) {
+            createStudent(1, STANDARD, "vulcan.net.pl", "rzeszow", "Jan Michniewicz")
+            createStudent(2, STANDARD, "vulcan.net.pl", "tomaszowmazowiecki", "Joanna Stec")
+            createStudent(3, STANDARD, "vulcan.net.pl", "tomaszowmazowiecki", "Kacper Morawiecki")
+            close()
+        }
+
+        runMigrationsAndValidate(Migration54())
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll()
+        assertEquals(1, students.size)
+        with(students[0]) {
+            assertEquals("rzeszow", symbol)
+        }
+        db.close()
+    }
+
+    @Test
+    fun `migrate resman students`() = runTest {
+        with(helper.createDatabase(dbName, 53)) {
+            createStudent(1, ADFSLight, "resman.pl", "rzeszow", "Joanna Stec")
+            createStudent(2, ADFSLight, "resman.pl", "rzeszow", "Kacper Morawiecki")
+            createStudent(3, STANDARD, "vulcan.net.pl", "rzeszow", "Jan Michniewicz")
+            close()
+        }
+        runMigrationsAndValidate(Migration54())
+        val db = getMigratedRoomDatabase()
+        val students = db.studentDao.loadAll()
+        assertEquals(3, students.size)
+        with(students[0]) {
+            assertEquals(ADFSLightScoped.name, loginType)
+            assertEquals("https://vulcan.net.pl", scrapperBaseUrl)
+            assertEquals("rzeszowprojekt", symbol)
+        }
+        with(students[1]) {
+            assertEquals(ADFSLightScoped.name, loginType)
+            assertEquals("https://vulcan.net.pl", scrapperBaseUrl)
+            assertEquals("rzeszowprojekt", symbol)
+        }
+        db.close()
+    }
+
+    private fun SupportSQLiteDatabase.createStudent(
+        id: Long,
+        loginType: Sdk.ScrapperLoginType,
+        host: String,
+        symbol: String,
+        studentName: String,
+    ) {
+        insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("scrapper_base_url", "https://$host")
+            put("mobile_base_url", "")
+            put("login_type", loginType.name)
+            put("login_mode", "SCRAPPER")
+            put("certificate_key", "")
+            put("private_key", "")
+            put("is_parent", false)
+            put("email", "jan@fakelog.cf")
+            put("password", "******")
+            put("symbol", symbol)
+            put("student_id", Random.nextInt())
+            put("user_login_id", id)
+            put("user_name", studentName)
+            put("student_name", studentName)
+            put("school_id", "123")
+            put("school_short", "")
+            put("school_name", "")
+            put("class_name", "")
+            put("class_id", Random.nextInt())
+            put("is_current", false)
+            put("registration_date", "0")
+            put("id", id)
+            put("nick", "")
+            put("avatar_color", "")
+        })
+    }
+}
diff --git a/build.gradle b/build.gradle
index e8e1052b..174a3cb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,6 +31,7 @@ allprojects {
         mavenCentral()
         google()
         maven { url "https://jitpack.io" }
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://developer.huawei.com/repo/" }
     }
 }

From 2fa26c37a95a0fa34765c6de73121eb26dffe094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 20 Dec 2022 21:55:46 +0100
Subject: [PATCH 203/429] Revert "Fix app name in french (#2072)"

This reverts commit 277ffd22be786cfa429ea1d61827e8cb62d1ea56.
---
 app/build.gradle                         |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 59821 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b0865896..6b496d85 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -237,7 +237,7 @@ dependencies {
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation "io.coil-kt:coil:2.2.2"
-    implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
+    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 8722
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

delta 8958
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f42e62f3..d7e66b5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 7588345b6d3260eb9b024b7e2e627a86e79c1f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 20 Dec 2022 23:35:47 +0100
Subject: [PATCH 204/429] Bump sdk

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6b496d85..08e0ed92 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.8.2-SNAPSHOT"
+    implementation "io.github.wulkanowy:sdk:c74512daa7"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 

From 61240777cf3d70989e0e944f953c87dc594bd564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 21 Dec 2022 00:00:03 +0100
Subject: [PATCH 205/429] Version 1.8.2

---
 .github/workflows/test.yml                        |  5 ++++-
 README.cs.md                                      |  2 +-
 README.de.md                                      |  2 +-
 README.en.md                                      |  2 +-
 README.md                                         |  2 +-
 README.sk.md                                      |  2 +-
 app/build.gradle                                  |  8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 10 ++++------
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 13875078..7f8591bb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,10 @@ name: Tests
 
 on:
   push:
-    branches: [ master, develop ]
+    branches:
+      - master
+      - develop
+      - 'hotfix/**'
     tags: [ '*' ]
   pull_request:
 
diff --git a/README.cs.md b/README.cs.md
index d3d4e255..8171b27d 100644
--- a/README.cs.md
+++ b/README.cs.md
@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
diff --git a/README.de.md b/README.de.md
index 853abd13..972f66ba 100644
--- a/README.de.md
+++ b/README.de.md
@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
diff --git a/README.en.md b/README.en.md
index 7877bf37..6e4da463 100644
--- a/README.en.md
+++ b/README.en.md
@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
diff --git a/README.md b/README.md
index 09480e7d..f3d2e29a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
diff --git a/README.sk.md b/README.sk.md
index 64786556..ff0c6e3c 100644
--- a/README.sk.md
+++ b/README.sk.md
@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/wulkanowy/wulkanowy/test.yml?branch=develop&style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
diff --git a/app/build.gradle b/app/build.gradle
index 08e0ed92..a61d0a1d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 116
-        versionName "1.8.1"
+        versionCode 117
+        versionName "1.8.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -162,7 +162,7 @@ play {
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
     userFraction = 0.10d
-    updatePriority = 4
+    updatePriority = 5
     enabled.set(false)
 }
 
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:c74512daa7"
+    implementation "io.github.wulkanowy:sdk:1.8.2"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 7b2fda86..c4f4c6cf 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,9 +1,7 @@
-Wersja 1.8.1
+Wersja 1.8.2
 
-- naprawiliśmy liczenie średniej ucznia w ocenach klasy dla wykresu "Wszystkie"
-- zmieniliśmy kolejność przycisków akcji w podglądzie wiadomości
-- ulepszyliśmy oznaczenie nieodczytanych wiadomości
-- naprawiliśmy pokazywanie informacji o odczytanej wiadomości w wysłanych
-- dodaliśmy opcję ręcznego wybierania skrzynki pocztowej
+- naprawiliśmy logowanie dla użytkowników systemu Resman Rzeszów
+- dodaliśmy wsparcie dla nowej platformy z Tomaszowa Mazowieckiego
+- naprawiliśmy literówkę w tytule wiadomości z szablonem usprawiedliwienia
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From ede5914d709a5ac1af1d6056b301eba5d8c7e9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 21 Dec 2022 00:31:29 +0100
Subject: [PATCH 206/429] Automatically show current student mailbox only when
 there is only one mailbox available (#2085)

* Automatically show current student mailbox only when there is only one mailbox for this student available

* Fallback to 'unknown' mailbox key if there is no matching mailbox to message
---
 .../wulkanowy/data/mappers/MessageMapper.kt   |  6 ++++-
 .../messages/GetMailboxByStudentUseCase.kt    |  5 +++-
 .../domain/GetMailboxByStudentUseCaseTest.kt  | 26 +++++++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 120eb183..2ede5aa1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.mappers
 
 import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.sdk.pojo.MailboxType
+import timber.log.Timber
 import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -16,7 +17,10 @@ fun List<SdkMessage>.mapToEntities(
         mailboxKey = mailbox?.globalKey ?: allMailboxes.find { box ->
             box.fullName == it.mailbox
         }?.globalKey.let { mailboxKey ->
-            requireNotNull(mailboxKey) { "Can't find ${it.mailbox} in $allMailboxes" }
+            if (mailboxKey == null) {
+                Timber.e("Can't find ${it.mailbox} in $allMailboxes")
+                "unknown"
+            } else mailboxKey
         },
         email = student.email,
         messageId = it.id,
diff --git a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
index a696d9b2..669514aa 100644
--- a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
+++ b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
@@ -17,8 +17,11 @@ class GetMailboxByStudentUseCase @Inject constructor(
     private fun List<Mailbox>.filterByStudent(student: Student): Mailbox? {
         val normalizedStudentName = student.studentName.normalizeStudentName()
 
-        return find {
+        return singleOrNull {
             it.studentName.normalizeStudentName() == normalizedStudentName
+        } ?: singleOrNull {
+            it.studentName.normalizeStudentName() == normalizedStudentName
+                && it.schoolNameShort == student.schoolShortName
         } ?: singleOrNull {
             it.studentName.getFirstAndLastPart() == normalizedStudentName.getFirstAndLastPart()
         } ?: singleOrNull {
diff --git a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
index 02980026..6db16d2f 100644
--- a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
@@ -160,8 +160,29 @@ class GetMailboxByStudentUseCaseTest {
         assertEquals(expectedMailbox, systemUnderTest(student))
     }
 
+    @Test
+    fun `get mailbox for student with mailboxes from two different schools`() = runTest {
+        val student = getStudentEntity(
+            userName = "Kamil Bednarek",
+            studentName = "Kamil Bednarek",
+            schoolShortName = "CKZiU",
+        )
+        val mailbox1 = getMailboxEntity(
+            studentName = "Kamil Bednarek",
+            schoolShortName = "ZSTiO",
+        )
+        val mailbox2 = getMailboxEntity(
+            studentName = "Kamil Bednarek",
+            schoolShortName = "CKZiU",
+        )
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(mailbox1, mailbox2)
+
+        assertEquals(mailbox2, systemUnderTest(student))
+    }
+
     private fun getMailboxEntity(
         studentName: String,
+        schoolShortName: String = "test",
     ) = Mailbox(
         globalKey = "",
         fullName = "",
@@ -170,13 +191,14 @@ class GetMailboxByStudentUseCaseTest {
         schoolId = "",
         symbol = "",
         studentName = studentName,
-        schoolNameShort = "",
+        schoolNameShort = schoolShortName,
         type = MailboxType.STUDENT,
     )
 
     private fun getStudentEntity(
         studentName: String,
         userName: String,
+        schoolShortName: String = "test",
     ) = Student(
         scrapperBaseUrl = "http://fakelog.cf",
         email = "jan@fakelog.cf",
@@ -192,7 +214,7 @@ class GetMailboxByStudentUseCaseTest {
         privateKey = "",
         registrationDate = Instant.now(),
         schoolName = "",
-        schoolShortName = "test",
+        schoolShortName = schoolShortName,
         schoolSymbol = "",
         studentId = 1,
         studentName = studentName,

From aa3d7e37fcf7acadeb5dfd1f1b2f76ac31b8b496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 21 Dec 2022 00:31:29 +0100
Subject: [PATCH 207/429] Automatically show current student mailbox only when
 there is only one mailbox available (#2085)

* Automatically show current student mailbox only when there is only one mailbox for this student available

* Fallback to 'unknown' mailbox key if there is no matching mailbox to message
---
 .../wulkanowy/data/mappers/MessageMapper.kt   |  6 ++++-
 .../messages/GetMailboxByStudentUseCase.kt    |  5 +++-
 .../domain/GetMailboxByStudentUseCaseTest.kt  | 26 +++++++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 120eb183..2ede5aa1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.mappers
 
 import io.github.wulkanowy.data.db.entities.*
 import io.github.wulkanowy.sdk.pojo.MailboxType
+import timber.log.Timber
 import io.github.wulkanowy.sdk.pojo.Message as SdkMessage
 import io.github.wulkanowy.sdk.pojo.MessageAttachment as SdkMessageAttachment
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -16,7 +17,10 @@ fun List<SdkMessage>.mapToEntities(
         mailboxKey = mailbox?.globalKey ?: allMailboxes.find { box ->
             box.fullName == it.mailbox
         }?.globalKey.let { mailboxKey ->
-            requireNotNull(mailboxKey) { "Can't find ${it.mailbox} in $allMailboxes" }
+            if (mailboxKey == null) {
+                Timber.e("Can't find ${it.mailbox} in $allMailboxes")
+                "unknown"
+            } else mailboxKey
         },
         email = student.email,
         messageId = it.id,
diff --git a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
index a696d9b2..669514aa 100644
--- a/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
+++ b/app/src/main/java/io/github/wulkanowy/domain/messages/GetMailboxByStudentUseCase.kt
@@ -17,8 +17,11 @@ class GetMailboxByStudentUseCase @Inject constructor(
     private fun List<Mailbox>.filterByStudent(student: Student): Mailbox? {
         val normalizedStudentName = student.studentName.normalizeStudentName()
 
-        return find {
+        return singleOrNull {
             it.studentName.normalizeStudentName() == normalizedStudentName
+        } ?: singleOrNull {
+            it.studentName.normalizeStudentName() == normalizedStudentName
+                && it.schoolNameShort == student.schoolShortName
         } ?: singleOrNull {
             it.studentName.getFirstAndLastPart() == normalizedStudentName.getFirstAndLastPart()
         } ?: singleOrNull {
diff --git a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
index 02980026..6db16d2f 100644
--- a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
@@ -160,8 +160,29 @@ class GetMailboxByStudentUseCaseTest {
         assertEquals(expectedMailbox, systemUnderTest(student))
     }
 
+    @Test
+    fun `get mailbox for student with mailboxes from two different schools`() = runTest {
+        val student = getStudentEntity(
+            userName = "Kamil Bednarek",
+            studentName = "Kamil Bednarek",
+            schoolShortName = "CKZiU",
+        )
+        val mailbox1 = getMailboxEntity(
+            studentName = "Kamil Bednarek",
+            schoolShortName = "ZSTiO",
+        )
+        val mailbox2 = getMailboxEntity(
+            studentName = "Kamil Bednarek",
+            schoolShortName = "CKZiU",
+        )
+        coEvery { mailboxDao.loadAll(any()) } returns listOf(mailbox1, mailbox2)
+
+        assertEquals(mailbox2, systemUnderTest(student))
+    }
+
     private fun getMailboxEntity(
         studentName: String,
+        schoolShortName: String = "test",
     ) = Mailbox(
         globalKey = "",
         fullName = "",
@@ -170,13 +191,14 @@ class GetMailboxByStudentUseCaseTest {
         schoolId = "",
         symbol = "",
         studentName = studentName,
-        schoolNameShort = "",
+        schoolNameShort = schoolShortName,
         type = MailboxType.STUDENT,
     )
 
     private fun getStudentEntity(
         studentName: String,
         userName: String,
+        schoolShortName: String = "test",
     ) = Student(
         scrapperBaseUrl = "http://fakelog.cf",
         email = "jan@fakelog.cf",
@@ -192,7 +214,7 @@ class GetMailboxByStudentUseCaseTest {
         privateKey = "",
         registrationDate = Instant.now(),
         schoolName = "",
-        schoolShortName = "test",
+        schoolShortName = schoolShortName,
         schoolSymbol = "",
         studentId = 1,
         studentName = studentName,

From 67875b1a9a230d0a9950718569391d2d39149116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 21 Dec 2022 13:29:32 +0100
Subject: [PATCH 208/429] Version 1.8.3

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a61d0a1d..4cde3c29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 117
-        versionName "1.8.2"
+        versionCode 118
+        versionName "1.8.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.8.2"
+    implementation "io.github.wulkanowy:sdk:1.8.3"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index c4f4c6cf..5a47ddc7 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,7 +1,8 @@
-Wersja 1.8.2
+Wersja 1.8.3
 
 - naprawiliśmy logowanie dla użytkowników systemu Resman Rzeszów
 - dodaliśmy wsparcie dla nowej platformy z Tomaszowa Mazowieckiego
+- poprawiliśmy dopasowywanie skrzynek pocztowych do uczniów
 - naprawiliśmy literówkę w tytule wiadomości z szablonem usprawiedliwienia
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 510e2d5b88f269663efb68e43262860ffacce028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 25 Dec 2022 04:40:58 +0100
Subject: [PATCH 209/429] Fix html entities parsing in school announcements
 (#2086)

---
 app/build.gradle                                       |  1 +
 .../schoolannouncement/SchoolAnnouncementAdapter.kt    |  4 ++--
 .../schoolannouncement/SchoolAnnouncementDialog.kt     |  4 ++--
 .../java/io/github/wulkanowy/utils/StringExtension.kt  | 10 +++++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e2e6dae4..8409574e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -240,6 +240,7 @@ dependencies {
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
+    implementation 'org.apache.commons:commons-text:1.10.0'
 
     playImplementation platform('com.google.firebase:firebase-bom:31.1.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
index 62f6251e..46999599 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
@@ -2,10 +2,10 @@ package io.github.wulkanowy.ui.modules.schoolannouncement
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.text.parseAsHtml
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.databinding.ItemSchoolAnnouncementBinding
+import io.github.wulkanowy.utils.parseUonetHtml
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
 
@@ -28,7 +28,7 @@ class SchoolAnnouncementAdapter @Inject constructor() :
         with(holder.binding) {
             schoolAnnouncementItemDate.text = item.date.toFormattedString()
             schoolAnnouncementItemType.text = item.subject
-            schoolAnnouncementItemContent.text = item.content.parseAsHtml()
+            schoolAnnouncementItemContent.text = item.content.parseUonetHtml()
 
             root.setOnClickListener { onItemClickListener(item) }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
index 0a71afef..e33a48f0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
@@ -5,11 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.databinding.DialogSchoolAnnouncementBinding
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.parseUonetHtml
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
@@ -46,7 +46,7 @@ class SchoolAnnouncementDialog : DialogFragment() {
         with(binding) {
             announcementDialogSubjectValue.text = announcement.subject
             announcementDialogDateValue.text = announcement.date.toFormattedString()
-            announcementDialogDescriptionValue.text = announcement.content.parseAsHtml()
+            announcementDialogDescriptionValue.text = announcement.content.parseUonetHtml()
 
             announcementDialogClose.setOnClickListener { dismiss() }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
index bddd7df4..8043e365 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
@@ -1,7 +1,15 @@
 package io.github.wulkanowy.utils
 
+import androidx.core.text.parseAsHtml
+import org.apache.commons.text.StringEscapeUtils
+
 inline fun String?.ifNullOrBlank(defaultValue: () -> String) =
     if (isNullOrBlank()) defaultValue() else this
 
 fun String.capitalise() =
-    replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
\ No newline at end of file
+    replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+
+fun String.parseUonetHtml() = this
+    .let(StringEscapeUtils::unescapeHtml4)
+    .replace("\n", "<br/>")
+    .parseAsHtml()

From 9cedab979c18deb67d2e5612c063deec7ecd2419 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 20:07:25 +0000
Subject: [PATCH 210/429] Bump robolectric from 4.9 to 4.9.1 (#2088)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8409574e..81a8f672 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -264,7 +264,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.9'
+    testImplementation 'org.robolectric:robolectric:4.9.1'
     testImplementation "androidx.test:runner:1.5.1"
     testImplementation "androidx.test.ext:junit:1.1.4"
     testImplementation "androidx.test:core:1.5.0"

From 7efd10665828a5bff27938dada267b08e078d82f Mon Sep 17 00:00:00 2001
From: Patryk <43276401+Zaptyp@users.noreply.github.com>
Date: Sun, 1 Jan 2023 12:16:09 +0100
Subject: [PATCH 211/429] Update date in LICENSE file (#2089)

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index c97032f7..a1fc3705 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Wulkanowy
+   Copyright 2023 Wulkanowy
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From 83974b6550877195d48bbe22bc5b9b263767de2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 1 Jan 2023 20:21:28 +0100
Subject: [PATCH 212/429] Fix NPE when trying to remove a message from mailbox
 that doesn't match any student (#2090)

---
 .../io/github/wulkanowy/data/repositories/MessageRepository.kt  | 2 +-
 .../ui/modules/message/preview/MessagePreviewPresenter.kt       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index f95b8dbe..6dfc3ab7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -178,7 +178,7 @@ class MessageRepository @Inject constructor(
         ).first()
     }
 
-    suspend fun deleteMessage(student: Student, mailbox: Mailbox, message: Message) {
+    suspend fun deleteMessage(student: Student, mailbox: Mailbox?, message: Message) {
         deleteMessages(student, mailbox, listOf(message))
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index fd75f6f3..56f23b6f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -186,7 +186,7 @@ class MessagePreviewPresenter @Inject constructor(
             runCatching {
                 val student = studentRepository.getCurrentStudent(decryptPass = true)
                 val mailbox = messageRepository.getMailboxByStudent(student)
-                messageRepository.deleteMessage(student, mailbox!!, message!!)
+                messageRepository.deleteMessage(student, mailbox, message!!)
             }
                 .onFailure {
                     retryCallback = { onMessageDelete() }

From 897eac050a4869b4441ffef69ad8ad310e41f4be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 1 Jan 2023 20:26:32 +0100
Subject: [PATCH 213/429] Refactor student selection screen (#2087)

---
 app/build.gradle                              |   2 +-
 .../data/mappers/RegisterUserMapper.kt        |  87 +++++++
 .../wulkanowy/data/pojos/RegisterUser.kt      |  43 ++++
 .../data/repositories/StudentRepository.kt    |  10 +
 .../ui/modules/login/LoginActivity.kt         |   9 +-
 .../wulkanowy/ui/modules/login/LoginData.kt   |   1 +
 .../login/advanced/LoginAdvancedFragment.kt   |   6 +-
 .../login/advanced/LoginAdvancedPresenter.kt  |  88 ++++++-
 .../login/advanced/LoginAdvancedView.kt       |   3 +-
 .../modules/login/form/LoginFormFragment.kt   |   6 +-
 .../modules/login/form/LoginFormPresenter.kt  |  11 +-
 .../ui/modules/login/form/LoginFormView.kt    |   4 +-
 .../LoginStudentSelectAdapter.kt              | 199 +++++++++++---
 .../LoginStudentSelectFragment.kt             |  72 +++---
 .../studentselect/LoginStudentSelectItem.kt   |  50 ++++
 .../LoginStudentSelectPresenter.kt            | 243 +++++++++++++++---
 .../studentselect/LoginStudentSelectView.kt   |  10 +-
 .../login/symbol/LoginSymbolFragment.kt       |  18 +-
 .../login/symbol/LoginSymbolPresenter.kt      |  37 ++-
 .../modules/login/symbol/LoginSymbolView.kt   |   9 +-
 .../layout/fragment_login_student_select.xml  | 102 ++------
 ...gin_student_select_empty_symbol_header.xml |  38 +++
 ...tem_login_student_select_header_school.xml |  38 +++
 ...tem_login_student_select_header_symbol.xml |  38 +++
 .../layout/item_login_student_select_help.xml |  61 +++++
 ... => item_login_student_select_student.xml} |  27 +-
 app/src/main/res/values/strings.xml           |   5 +-
 .../login/form/LoginFormPresenterTest.kt      |  60 ++---
 .../LoginStudentSelectPresenterTest.kt        | 124 ++++++---
 29 files changed, 1052 insertions(+), 349 deletions(-)
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
 create mode 100644 app/src/main/res/layout/item_login_student_select_empty_symbol_header.xml
 create mode 100644 app/src/main/res/layout/item_login_student_select_header_school.xml
 create mode 100644 app/src/main/res/layout/item_login_student_select_header_symbol.xml
 create mode 100644 app/src/main/res/layout/item_login_student_select_help.xml
 rename app/src/main/res/layout/{item_login_student_select.xml => item_login_student_select_student.xml} (71%)

diff --git a/app/build.gradle b/app/build.gradle
index 81a8f672..b13f8da3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.8.3"
+    implementation "io.github.wulkanowy:sdk:a3b97edd48"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
new file mode 100644
index 00000000..2dfd7e06
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
@@ -0,0 +1,87 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.*
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.mapper.mapSemesters
+import java.time.Instant
+import io.github.wulkanowy.sdk.scrapper.register.RegisterStudent as SdkRegisterStudent
+import io.github.wulkanowy.sdk.scrapper.register.RegisterUser as SdkRegisterUser
+
+fun SdkRegisterUser.mapToPojo(password: String) = RegisterUser(
+    email = email,
+    login = login,
+    password = password,
+    baseUrl = baseUrl,
+    loginType = loginType,
+    symbols = symbols.map { registerSymbol ->
+        RegisterSymbol(
+            symbol = registerSymbol.symbol,
+            error = registerSymbol.error,
+            userName = registerSymbol.userName,
+            schools = registerSymbol.schools.map {
+                RegisterUnit(
+                    userLoginId = it.userLoginId,
+                    schoolId = it.schoolId,
+                    schoolName = it.schoolName,
+                    schoolShortName = it.schoolShortName,
+                    parentIds = it.parentIds,
+                    studentIds = it.studentIds,
+                    employeeIds = it.employeeIds,
+                    error = it.error,
+                    students = it.subjects
+                        .filterIsInstance<SdkRegisterStudent>()
+                        .map { registerSubject ->
+                            RegisterStudent(
+                                studentId = registerSubject.studentId,
+                                studentName = registerSubject.studentName,
+                                studentSecondName = registerSubject.studentSecondName,
+                                studentSurname = registerSubject.studentSurname,
+                                className = registerSubject.className,
+                                classId = registerSubject.classId,
+                                isParent = registerSubject.isParent,
+                                semesters = registerSubject.semesters
+                                    .mapSemesters()
+                                    .mapToEntities(registerSubject.studentId),
+                            )
+                        },
+                )
+            }
+        )
+    }
+)
+
+fun RegisterStudent.mapToStudentWithSemesters(
+    user: RegisterUser,
+    symbol: RegisterSymbol,
+    unit: RegisterUnit,
+    colors: List<Long>,
+): StudentWithSemesters = StudentWithSemesters(
+    semesters = semesters,
+    student = Student(
+        email = user.login, // for compatibility
+        userName = symbol.userName,
+        userLoginId = unit.userLoginId,
+        isParent = isParent,
+        className = className,
+        classId = classId,
+        studentId = studentId,
+        symbol = symbol.symbol,
+        loginType = user.loginType.name,
+        schoolName = unit.schoolName,
+        schoolShortName = unit.schoolShortName,
+        schoolSymbol = unit.schoolId,
+        studentName = "$studentName $studentSurname",
+        loginMode = Sdk.Mode.SCRAPPER.name,
+        scrapperBaseUrl = user.baseUrl,
+        mobileBaseUrl = "",
+        certificateKey = "",
+        privateKey = "",
+        password = user.password,
+        isCurrent = false,
+        registrationDate = Instant.now(),
+    ).apply {
+        avatarColor = colors.random()
+    },
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
new file mode 100644
index 00000000..4aea3377
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
@@ -0,0 +1,43 @@
+package io.github.wulkanowy.data.pojos
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.scrapper.Scrapper
+
+data class RegisterUser(
+    val email: String,
+    val password: String,
+    val login: String, // may be the same as email
+    val baseUrl: String,
+    val loginType: Scrapper.LoginType,
+    val symbols: List<RegisterSymbol>,
+) : java.io.Serializable
+
+data class RegisterSymbol(
+    val symbol: String,
+    val error: Throwable?,
+    val userName: String,
+    val schools: List<RegisterUnit>,
+) : java.io.Serializable
+
+data class RegisterUnit(
+    val userLoginId: Int,
+    val schoolId: String,
+    val schoolName: String,
+    val schoolShortName: String,
+    val parentIds: List<Int>,
+    val studentIds: List<Int>,
+    val employeeIds: List<Int>,
+    val error: Throwable?,
+    val students: List<RegisterStudent>,
+) : java.io.Serializable
+
+data class RegisterStudent(
+    val studentId: Int,
+    val studentName: String,
+    val studentSecondName: String,
+    val studentSurname: String,
+    val className: String,
+    val classId: Int,
+    val isParent: Boolean,
+    val semesters: List<Semester>,
+) : java.io.Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
index f006b7d2..b1d1ba83 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@@ -11,6 +11,8 @@ import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.mappers.mapToPojo
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.DispatchersProvider
@@ -52,6 +54,14 @@ class StudentRepository @Inject constructor(
         sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol)
             .mapToEntities(password, appInfo.defaultColorsForAvatar)
 
+    suspend fun getUserSubjectsFromScrapper(
+        email: String,
+        password: String,
+        scrapperBaseUrl: String,
+        symbol: String
+    ): RegisterUser = sdk.getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, symbol)
+        .mapToPojo(password)
+
     suspend fun getStudentsHybrid(
         email: String,
         password: String,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index 8f237e53..c17c92ef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -8,10 +8,11 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE
 import androidx.fragment.app.commit
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.databinding.ActivityLoginBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
@@ -76,8 +77,8 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
         openFragment(LoginSymbolFragment.newInstance(loginData))
     }
 
-    fun navigateToStudentSelect(studentsWithSemesters: List<StudentWithSemesters>) {
-        openFragment(LoginStudentSelectFragment.newInstance(studentsWithSemesters))
+    fun navigateToStudentSelect(loginData: LoginData, registerUser: RegisterUser) {
+        openFragment(LoginStudentSelectFragment.newInstance(loginData, registerUser))
     }
 
     fun navigateToNotifications() {
@@ -105,6 +106,8 @@ class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), Logi
     }
 
     private fun openFragment(fragment: Fragment, clearBackStack: Boolean = false) {
+        supportFragmentManager.popBackStack(fragment::class.java.name, POP_BACK_STACK_INCLUSIVE)
+
         supportFragmentManager.commit {
             replace(R.id.loginContainer, fragment)
             setReorderingAllowed(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
index 5d474358..ae6c2249 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
@@ -6,4 +6,5 @@ data class LoginData(
     val login: String,
     val password: String,
     val baseUrl: String,
+    val symbol: String?,
 ) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index 37dcb38b..8c90623e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -8,7 +8,7 @@ import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.databinding.FragmentLoginAdvancedBinding
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -327,8 +327,8 @@ class LoginAdvancedFragment :
         (activity as? LoginActivity)?.navigateToSymbolFragment(loginData)
     }
 
-    override fun navigateToStudentSelect(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.navigateToStudentSelect(studentsWithSemesters)
+    override fun navigateToStudentSelect(loginData: LoginData, registerUser: RegisterUser) {
+        (activity as? LoginActivity)?.navigateToStudentSelect(loginData, registerUser)
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index 1b42c6c5..33a76e5f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -4,9 +4,15 @@ import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.logResourceStatus
 import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.pojos.RegisterStudent
+import io.github.wulkanowy.data.pojos.RegisterSymbol
+import io.github.wulkanowy.data.pojos.RegisterUnit
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.scrapper.Scrapper
+import io.github.wulkanowy.sdk.scrapper.getNormalizedSymbol
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -142,19 +148,23 @@ class LoginAdvancedPresenter @Inject constructor(
                     is Resource.Success -> {
                         analytics.logEvent(
                             "registration_form",
-                        "success" to true,
-                        "students" to it.data.size,
-                        "error" to "No error"
-                    )
-                    val loginData = LoginData(
-                        login = view?.formUsernameValue.orEmpty().trim(),
-                        password = view?.formPassValue.orEmpty().trim(),
-                        baseUrl = view?.formHostValue.orEmpty().trim()
-                    )
-                    when (it.data.size) {
-                        0 -> view?.navigateToSymbol(loginData)
-                        else -> view?.navigateToStudentSelect(it.data)
-                    }
+                            "success" to true,
+                            "students" to it.data.size,
+                            "error" to "No error"
+                        )
+                        val loginData = LoginData(
+                            login = view?.formUsernameValue.orEmpty().trim(),
+                            password = view?.formPassValue.orEmpty().trim(),
+                            baseUrl = view?.formHostValue.orEmpty().trim(),
+                            symbol = view?.formSymbolValue.orEmpty().trim().getNormalizedSymbol(),
+                        )
+                        when (it.data.size) {
+                            0 -> view?.navigateToSymbol(loginData)
+                            else -> view?.navigateToStudentSelect(
+                                loginData = loginData,
+                                registerUser = it.data.toRegisterUser(loginData),
+                            )
+                        }
                     }
                     is Resource.Error -> {
                         analytics.logEvent(
@@ -173,6 +183,58 @@ class LoginAdvancedPresenter @Inject constructor(
             }.launch("login")
     }
 
+    private fun List<StudentWithSemesters>.toRegisterUser(loginData: LoginData) = RegisterUser(
+        email = loginData.login,
+        password = loginData.password,
+        login = loginData.login,
+        baseUrl = loginData.baseUrl,
+        loginType = firstOrNull()?.student?.loginType?.let(
+            Scrapper.LoginType::valueOf
+        ) ?: Scrapper.LoginType.AUTO,
+        symbols = this
+            .groupBy { students -> students.student.symbol }
+            .map { (symbol, students) ->
+                RegisterSymbol(
+                    symbol = symbol,
+                    error = null,
+                    userName = "",
+                    schools = students
+                        .groupBy { student ->
+                            Triple(
+                                first = student.student.schoolSymbol,
+                                second = student.student.userLoginId,
+                                third = student.student.schoolShortName
+                            )
+                        }
+                        .map { (groupKey, students) ->
+                            val (schoolId, loginId, schoolName) = groupKey
+                            RegisterUnit(
+                                students = students.map {
+                                    RegisterStudent(
+                                        studentId = it.student.studentId,
+                                        studentName = it.student.studentName,
+                                        studentSecondName = it.student.studentName,
+                                        studentSurname = it.student.studentName,
+                                        className = it.student.className,
+                                        classId = it.student.classId,
+                                        isParent = it.student.isParent,
+                                        semesters = it.semesters,
+                                    )
+                                },
+                                userLoginId = loginId,
+                                schoolId = schoolId,
+                                schoolName = schoolName,
+                                schoolShortName = schoolName,
+                                parentIds = listOf(),
+                                studentIds = listOf(),
+                                employeeIds = listOf(),
+                                error = null
+                            )
+                        }
+                )
+            },
+    )
+
     private suspend fun getStudentsAppropriatesToLoginType(): List<StudentWithSemesters> {
         val email = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index f9b84f1a..824fa028 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
 
@@ -72,7 +73,7 @@ interface LoginAdvancedView : BaseView {
 
     fun navigateToSymbol(loginData: LoginData)
 
-    fun navigateToStudentSelect(studentsWithSemesters: List<StudentWithSemesters>)
+    fun navigateToStudentSelect(loginData: LoginData, registerUser: RegisterUser)
 
     fun setErrorPinRequired()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 463e192d..a0e7608d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -9,7 +9,7 @@ import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -226,8 +226,8 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         (activity as? LoginActivity)?.navigateToSymbolFragment(loginData)
     }
 
-    override fun navigateToStudentSelect(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.navigateToStudentSelect(studentsWithSemesters)
+    override fun navigateToStudentSelect(loginData: LoginData, registerUser: RegisterUser) {
+        (activity as? LoginActivity)?.navigateToStudentSelect(loginData, registerUser)
     }
 
     override fun openAdvancedLogin() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 0acb0ea6..8035ea0a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -93,7 +93,7 @@ class LoginFormPresenter @Inject constructor(
         if (!validateCredentials(email, password, host)) return
 
         resourceFlow {
-            studentRepository.getStudentsScrapper(
+            studentRepository.getUserSubjectsFromScrapper(
                 email = email,
                 password = password,
                 scrapperBaseUrl = host,
@@ -109,14 +109,14 @@ class LoginFormPresenter @Inject constructor(
                 }
             }
             .onResourceSuccess {
-                when (it.size) {
-                    0 -> view?.navigateToSymbol(LoginData(email, password, host))
-                    else -> view?.navigateToStudentSelect(it)
+                val loginData = LoginData(email, password, host, symbol)
+                when (it.symbols.size) {
+                    0 -> view?.navigateToSymbol(loginData)
+                    else -> view?.navigateToStudentSelect(loginData, it)
                 }
                 analytics.logEvent(
                     "registration_form",
                     "success" to true,
-                    "students" to it.size,
                     "scrapperBaseUrl" to host,
                     "error" to "No error"
                 )
@@ -134,7 +134,6 @@ class LoginFormPresenter @Inject constructor(
                 analytics.logEvent(
                     "registration_form",
                     "success" to false,
-                    "students" to -1,
                     "scrapperBaseUrl" to host,
                     "error" to it.message.ifNullOrBlank { "No message" }
                 )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 8003975d..5a816fb3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
 
@@ -60,7 +60,7 @@ interface LoginFormView : BaseView {
 
     fun navigateToSymbol(loginData: LoginData)
 
-    fun navigateToStudentSelect(studentsWithSemesters: List<StudentWithSemesters>)
+    fun navigateToStudentSelect(loginData: LoginData, registerUser: RegisterUser)
 
     fun openPrivacyPolicyPage()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
index c046c2ff..e6d13182 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
@@ -2,65 +2,182 @@ package io.github.wulkanowy.ui.modules.login.studentselect
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DiffUtil.ItemCallback
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import io.github.wulkanowy.databinding.ItemLoginStudentSelectBinding
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.*
 import javax.inject.Inject
 
+@SuppressLint("SetTextI18n")
 class LoginStudentSelectAdapter @Inject constructor() :
-    RecyclerView.Adapter<LoginStudentSelectAdapter.ItemViewHolder>() {
+    ListAdapter<LoginStudentSelectItem, RecyclerView.ViewHolder>(Differ) {
 
-    private val checkedList = mutableMapOf<Int, Boolean>()
+    override fun getItemViewType(position: Int): Int = getItem(position).type.ordinal
 
-    var items = emptyList<Pair<StudentWithSemesters, Boolean>>()
-        set(value) {
-            field = value
-            checkedList.clear()
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (LoginStudentSelectItemType.values()[viewType]) {
+            LoginStudentSelectItemType.EMPTY_SYMBOLS_HEADER -> EmptySymbolsHeaderViewHolder(
+                ItemLoginStudentSelectEmptySymbolHeaderBinding.inflate(inflater, parent, false),
+            )
+            LoginStudentSelectItemType.SYMBOL_HEADER -> SymbolsHeaderViewHolder(
+                ItemLoginStudentSelectHeaderSymbolBinding.inflate(inflater, parent, false)
+            )
+            LoginStudentSelectItemType.SCHOOL_HEADER -> SchoolHeaderViewHolder(
+                ItemLoginStudentSelectHeaderSchoolBinding.inflate(inflater, parent, false)
+            )
+            LoginStudentSelectItemType.STUDENT -> StudentViewHolder(
+                ItemLoginStudentSelectStudentBinding.inflate(inflater, parent, false)
+            )
+            LoginStudentSelectItemType.HELP -> HelpViewHolder(
+                ItemLoginStudentSelectHelpBinding.inflate(inflater, parent, false)
+            )
         }
+    }
 
-    var onClickListener: (StudentWithSemesters, alreadySaved: Boolean) -> Unit = { _, _ -> }
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is EmptySymbolsHeaderViewHolder -> holder.bind(getItem(position) as LoginStudentSelectItem.EmptySymbolsHeader)
+            is SymbolsHeaderViewHolder -> holder.bind(getItem(position) as LoginStudentSelectItem.SymbolHeader)
+            is SchoolHeaderViewHolder -> holder.bind(getItem(position) as LoginStudentSelectItem.SchoolHeader)
+            is StudentViewHolder -> holder.bind(getItem(position) as LoginStudentSelectItem.Student)
+            is HelpViewHolder -> holder.bind(getItem(position) as LoginStudentSelectItem.Help)
+        }
+    }
 
-    override fun getItemCount() = items.size
+    private class EmptySymbolsHeaderViewHolder(
+        private val binding: ItemLoginStudentSelectEmptySymbolHeaderBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemLoginStudentSelectBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
-
-    @SuppressLint("SetTextI18n")
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (studentAndSemesters, alreadySaved) = items[position]
-        val student = studentAndSemesters.student
-        val semesters = studentAndSemesters.semesters
-        val diary = semesters.maxByOrNull { it.semesterId }
-
-        with(holder.binding) {
-            loginItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
-            loginItemSchool.text = student.schoolName
-            loginItemName.isEnabled = !alreadySaved
-            loginItemSchool.isEnabled = !alreadySaved
-            loginItemSignedIn.visibility = if (alreadySaved) View.VISIBLE else View.GONE
-
-            with(loginItemCheck) {
-                isEnabled = !alreadySaved
-                keyListener = null
-                isChecked = checkedList[position] ?: false
+        fun bind(item: LoginStudentSelectItem.EmptySymbolsHeader) {
+            with(binding) {
+                loginStudentSelectEmptySymbolChevron.rotation = if (item.isExpanded) 270f else 90f
+                root.setOnClickListener { item.onClick() }
             }
+        }
+    }
 
-            root.setOnClickListener {
-                onClickListener(studentAndSemesters, alreadySaved)
+    private class SymbolsHeaderViewHolder(
+        private val binding: ItemLoginStudentSelectHeaderSymbolBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: LoginStudentSelectItem.SymbolHeader) {
+            with(binding) {
+                loginStudentSelectHeaderSymbolValue.text = buildString {
+                    append(root.context.getString(R.string.mobile_device_symbol))
+                    append(": ")
+                    append(item.humanReadableName ?: item.symbol.symbol)
+                    if (!item.humanReadableName.isNullOrBlank()) {
+                        append(" (${item.symbol.symbol})")
+                    }
+                }
+                loginStudentSelectHeaderSymbolUsername.text = item.symbol.userName
+                loginStudentSelectHeaderSymbolUsername.isVisible = item.symbol.userName.isNotBlank()
+                loginStudentSelectHeaderSymbolError.text = item.symbol.error?.message
+                loginStudentSelectHeaderSymbolError.isVisible = item.symbol.error != null
+                loginStudentSelectHeaderSymbolError.maxLines = when {
+                    item.isErrorExpanded -> Int.MAX_VALUE
+                    else -> 2
+                }
+
+                if (item.symbol.error != null) {
+                    root.setOnClickListener { item.onClick(item.symbol) }
+                } else root.setOnClickListener(null)
+            }
+        }
+    }
+
+    private class SchoolHeaderViewHolder(
+        private val binding: ItemLoginStudentSelectHeaderSchoolBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: LoginStudentSelectItem.SchoolHeader) {
+            with(binding) {
+                loginStudentSelectHeaderSchoolName.text = buildString {
+                    append(item.unit.schoolName.trim())
+                    append(" (")
+                    append(item.unit.schoolShortName)
+                    append(")")
+                }
+                loginStudentSelectHeaderSchoolDetails.isVisible = item.unit.students.isEmpty()
+                loginStudentSelectHeaderSchoolError.text = item.unit.error?.message
+                loginStudentSelectHeaderSchoolError.isVisible = item.unit.error != null
+                loginStudentSelectHeaderSchoolError.maxLines = when {
+                    item.isErrorExpanded -> Int.MAX_VALUE
+                    else -> 2
+                }
+
+                if (item.unit.error != null) {
+                    root.setOnClickListener { item.onClick(item.unit) }
+                } else root.setOnClickListener(null)
+            }
+        }
+    }
+
+    private class StudentViewHolder(
+        private val binding: ItemLoginStudentSelectStudentBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: LoginStudentSelectItem.Student) {
+            val student = item.student
+            val semesters = student.semesters
+            val diary = semesters.maxByOrNull { it.semesterId }
+
+            with(binding) {
+                loginItemName.text = "${student.studentName} ${student.studentSurname}"
+                loginItemName.isEnabled = item.isEnabled
+                loginItemSignedIn.text = if (!item.isEnabled) {
+                    root.context.getString(R.string.login_signed_in)
+                } else diary?.diaryName
 
                 with(loginItemCheck) {
-                    if (isEnabled) {
-                        isChecked = !isChecked
-                        checkedList[position] = isChecked
-                    }
+                    keyListener = null
+                    isEnabled = item.isEnabled
+                    isChecked = item.isSelected || !item.isEnabled
+                }
+
+                root.isEnabled = item.isEnabled
+                root.setOnClickListener {
+                    item.onClick(item)
                 }
             }
         }
     }
 
-    class ItemViewHolder(val binding: ItemLoginStudentSelectBinding) :
-        RecyclerView.ViewHolder(binding.root)
+    private class HelpViewHolder(
+        private val binding: ItemLoginStudentSelectHelpBinding,
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(item: LoginStudentSelectItem.Help) {
+            with(binding) {
+                loginStudentSelectHelpSymbol.isVisible = item.isSymbolButtonVisible
+                loginStudentSelectHelpSymbol.setOnClickListener { item.onEnterSymbolClick() }
+                loginStudentSelectHelpMail.setOnClickListener { item.onContactUsClick() }
+                loginStudentSelectHelpDiscord.setOnClickListener { item.onDiscordClick() }
+            }
+        }
+    }
+
+    private object Differ : ItemCallback<LoginStudentSelectItem>() {
+
+        override fun areItemsTheSame(
+            oldItem: LoginStudentSelectItem, newItem: LoginStudentSelectItem
+        ): Boolean = when {
+            oldItem is LoginStudentSelectItem.EmptySymbolsHeader && newItem is LoginStudentSelectItem.EmptySymbolsHeader -> true
+            oldItem is LoginStudentSelectItem.SymbolHeader && newItem is LoginStudentSelectItem.SymbolHeader -> {
+                oldItem.symbol == newItem.symbol
+            }
+            oldItem is LoginStudentSelectItem.Student && newItem is LoginStudentSelectItem.Student -> {
+                oldItem.student == newItem.student
+            }
+            else -> oldItem == newItem
+        }
+
+        override fun areContentsTheSame(
+            oldItem: LoginStudentSelectItem, newItem: LoginStudentSelectItem
+        ): Boolean = oldItem == newItem
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index 03aced14..16970215 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -2,17 +2,16 @@ package io.github.wulkanowy.ui.modules.login.studentselect
 
 import android.os.Bundle
 import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import androidx.core.os.bundleOf
-import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.core.view.isVisible
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
@@ -36,12 +35,23 @@ class LoginStudentSelectFragment :
     @Inject
     lateinit var preferencesRepository: PreferencesRepository
 
-    companion object {
-        const val ARG_STUDENTS = "STUDENTS"
+    private lateinit var symbolsNames: Array<String>
+    private lateinit var symbolsValues: Array<String>
 
-        fun newInstance(studentsWithSemesters: List<StudentWithSemesters>) =
+    override val symbols: Map<String, String> by lazy {
+        symbolsValues.zip(symbolsNames).toMap()
+    }
+
+    companion object {
+        private const val ARG_LOGIN = "LOGIN"
+        private const val ARG_STUDENTS = "STUDENTS"
+
+        fun newInstance(loginData: LoginData, registerUser: RegisterUser) =
             LoginStudentSelectFragment().apply {
-                arguments = bundleOf(ARG_STUDENTS to studentsWithSemesters)
+                arguments = bundleOf(
+                    ARG_LOGIN to loginData,
+                    ARG_STUDENTS to registerUser,
+                )
             }
     }
 
@@ -49,34 +59,32 @@ class LoginStudentSelectFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentLoginStudentSelectBinding.bind(view)
+
+        symbolsNames = resources.getStringArray(R.array.symbols)
+        symbolsValues = resources.getStringArray(R.array.symbols_values)
+
         presenter.onAttachView(
             view = this,
-            students = requireArguments().serializable(ARG_STUDENTS),
+            loginData = requireArguments().serializable(ARG_LOGIN),
+            registerUser = requireArguments().serializable(ARG_STUDENTS),
         )
     }
 
     override fun initView() {
         (requireActivity() as LoginActivity).showActionBar(true)
 
-        loginAdapter.onClickListener = presenter::onItemSelected
-
         with(binding) {
             loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
-            loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
-            loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
-
-            with(loginStudentSelectRecycler) {
-                layoutManager = LinearLayoutManager(context)
-                adapter = loginAdapter
-            }
+            loginStudentSelectRecycler.adapter = loginAdapter
         }
     }
 
-    override fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>) {
-        with(loginAdapter) {
-            items = data
-            notifyDataSetChanged()
-        }
+    override fun updateData(data: List<LoginStudentSelectItem>) {
+        loginAdapter.submitList(data)
+    }
+
+    override fun navigateToSymbol(loginData: LoginData) {
+        (requireActivity() as LoginActivity).navigateToSymbolFragment(loginData)
     }
 
     override fun navigateToNext() {
@@ -84,26 +92,17 @@ class LoginStudentSelectFragment :
     }
 
     override fun showProgress(show: Boolean) {
-        binding.loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
+        binding.loginStudentSelectProgress.isVisible = show
     }
 
     override fun showContent(show: Boolean) {
-        binding.loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
+        binding.loginStudentSelectContent.isVisible = show
     }
 
     override fun enableSignIn(enable: Boolean) {
         binding.loginStudentSelectSignIn.isEnabled = enable
     }
 
-    override fun showContact(show: Boolean) {
-        binding.loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
-    }
-
-    override fun onDestroyView() {
-        presenter.onDetachView()
-        super.onDestroyView()
-    }
-
     override fun openDiscordInvite() {
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
@@ -124,4 +123,9 @@ class LoginStudentSelectFragment :
             )
         )
     }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
new file mode 100644
index 00000000..1edc8e7b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
@@ -0,0 +1,50 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import io.github.wulkanowy.data.pojos.RegisterStudent
+import io.github.wulkanowy.data.pojos.RegisterSymbol
+import io.github.wulkanowy.data.pojos.RegisterUnit
+
+sealed class LoginStudentSelectItem(val type: LoginStudentSelectItemType) {
+
+    data class EmptySymbolsHeader(
+        val isExpanded: Boolean,
+        val onClick: () -> Unit,
+    ) : LoginStudentSelectItem(LoginStudentSelectItemType.EMPTY_SYMBOLS_HEADER)
+
+    data class SymbolHeader(
+        val symbol: RegisterSymbol,
+        val humanReadableName: String?,
+        val isErrorExpanded: Boolean,
+        val onClick: (RegisterSymbol) -> Unit,
+    ) : LoginStudentSelectItem(LoginStudentSelectItemType.SYMBOL_HEADER)
+
+    data class SchoolHeader(
+        val unit: RegisterUnit,
+        val isErrorExpanded: Boolean,
+        val onClick: (RegisterUnit) -> Unit,
+    ) : LoginStudentSelectItem(LoginStudentSelectItemType.SCHOOL_HEADER)
+
+    data class Student(
+        val symbol: RegisterSymbol,
+        val unit: RegisterUnit,
+        val student: RegisterStudent,
+        val isEnabled: Boolean,
+        val isSelected: Boolean,
+        val onClick: (Student) -> Unit,
+    ) : LoginStudentSelectItem(LoginStudentSelectItemType.STUDENT)
+
+    data class Help(
+        val onEnterSymbolClick: () -> Unit,
+        val onContactUsClick: () -> Unit,
+        val onDiscordClick: () -> Unit,
+        val isSymbolButtonVisible: Boolean,
+    ) : LoginStudentSelectItem(LoginStudentSelectItemType.HELP)
+}
+
+enum class LoginStudentSelectItemType {
+    EMPTY_SYMBOLS_HEADER,
+    SYMBOL_HEADER,
+    SCHOOL_HEADER,
+    STUDENT,
+    HELP,
+}
diff --git 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
index 5a40a6bc..f94ea7b7 100644
--- 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
@@ -1,15 +1,23 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
 import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.mappers.mapToStudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterStudent
+import io.github.wulkanowy.data.pojos.RegisterSymbol
+import io.github.wulkanowy.data.pojos.RegisterUnit
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
+import io.github.wulkanowy.sdk.scrapper.login.AccountPermissionException
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.ifNullOrBlank
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -19,18 +27,30 @@ class LoginStudentSelectPresenter @Inject constructor(
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val syncManager: SyncManager,
-    private val analytics: AnalyticsHelper
+    private val analytics: AnalyticsHelper,
+    private val appInfo: AppInfo,
 ) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository) {
 
     private var lastError: Throwable? = null
 
-    private val selectedStudents = mutableListOf<StudentWithSemesters>()
+    private lateinit var registerUser: RegisterUser
+    private lateinit var loginData: LoginData
 
-    fun onAttachView(view: LoginStudentSelectView, students: List<StudentWithSemesters>) {
+    private lateinit var students: List<StudentWithSemesters>
+    private var isEmptySymbolsExpanded = false
+    private var expandedSymbolError: RegisterSymbol? = null
+    private var expandedSchoolError: RegisterUnit? = null
+
+    private val selectedStudents = mutableListOf<LoginStudentSelectItem.Student>()
+
+    fun onAttachView(
+        view: LoginStudentSelectView,
+        loginData: LoginData,
+        registerUser: RegisterUser,
+    ) {
         super.onAttachView(view)
         with(view) {
             initView()
-            showContact(false)
             enableSignIn(false)
             loginErrorHandler.onStudentDuplicate = {
                 showMessage(it)
@@ -38,50 +58,171 @@ class LoginStudentSelectPresenter @Inject constructor(
             }
         }
 
-        if (students.size == 1) registerStudents(students)
-        loadData(students)
+        this.loginData = loginData
+        this.registerUser = registerUser
+        loadData()
     }
 
+    private fun loadData() {
+        resetSelectedState()
+
+        resourceFlow { studentRepository.getSavedStudents(false) }.onEach {
+            students = it.dataOrNull.orEmpty()
+            when (it) {
+                is Resource.Loading -> Timber.d("Login student select students load started")
+                is Resource.Success -> refreshItems()
+                is Resource.Error -> {
+                    errorHandler.dispatch(it.error)
+                    lastError = it.error
+                    refreshItems()
+                }
+            }
+        }.launch()
+    }
+
+    private fun createItems(): List<LoginStudentSelectItem> = buildList {
+        val notEmptySymbols = registerUser.symbols.filter { it.schools.isNotEmpty() }
+        val emptySymbols = registerUser.symbols.filter { it.schools.isEmpty() }
+
+        if (emptySymbols.isNotEmpty() && notEmptySymbols.isNotEmpty() && emptySymbols.any { it.symbol == loginData.symbol }) {
+            add(createEmptySymbolItem(emptySymbols.first { it.symbol == loginData.symbol }))
+        }
+
+        addAll(createNotEmptySymbolItems(notEmptySymbols, students))
+        addAll(createEmptySymbolItems(emptySymbols, notEmptySymbols.isNotEmpty()))
+
+        val helpItem = LoginStudentSelectItem.Help(
+            onEnterSymbolClick = ::onEnterSymbol,
+            onContactUsClick = ::onEmailClick,
+            onDiscordClick = ::onDiscordClick,
+            isSymbolButtonVisible = "login" !in loginData.baseUrl,
+        )
+        add(helpItem)
+    }
+
+    private fun createNotEmptySymbolItems(
+        notEmptySymbols: List<RegisterSymbol>,
+        students: List<StudentWithSemesters>,
+    ) = buildList {
+        notEmptySymbols.forEach { registerSymbol ->
+            val symbolHeader = LoginStudentSelectItem.SymbolHeader(
+                symbol = registerSymbol,
+                humanReadableName = view?.symbols?.get(registerSymbol.symbol),
+                isErrorExpanded = expandedSymbolError == registerSymbol,
+                onClick = ::onSymbolItemClick,
+            )
+            add(symbolHeader)
+
+            registerSymbol.schools.forEach { registerUnit ->
+                val schoolHeader = LoginStudentSelectItem.SchoolHeader(
+                    unit = registerUnit,
+                    isErrorExpanded = expandedSchoolError == registerUnit,
+                    onClick = ::onUnitItemClick,
+                )
+                add(schoolHeader)
+
+                registerUnit.students.forEach {
+                    add(createStudentItem(it, registerSymbol, registerUnit, students))
+                }
+            }
+        }
+    }
+
+    private fun createStudentItem(
+        student: RegisterStudent,
+        symbol: RegisterSymbol,
+        school: RegisterUnit,
+        students: List<StudentWithSemesters>,
+    ) = LoginStudentSelectItem.Student(
+        symbol = symbol,
+        unit = school,
+        student = student,
+        onClick = ::onItemSelected,
+        isEnabled = students.none {
+            it.student.email == registerUser.login
+                && it.student.symbol == symbol.symbol
+                && it.student.studentId == student.studentId
+                && it.student.schoolSymbol == school.schoolId
+                && it.student.classId == student.classId
+        },
+        isSelected = selectedStudents
+            .filter { it.symbol.symbol == symbol.symbol }
+            .filter { it.unit.schoolId == school.schoolId }
+            .filter { it.student.studentId == student.studentId }
+            .filter { it.student.classId == student.classId }
+            .size == 1,
+    )
+
+    private fun createEmptySymbolItems(
+        emptySymbols: List<RegisterSymbol>,
+        isNotEmptySymbolsExist: Boolean,
+    ) = buildList {
+        val filteredEmptySymbols = emptySymbols.filter {
+            it.error !is AccountPermissionException
+        }.ifEmpty { emptySymbols.takeIf { !isNotEmptySymbolsExist }.orEmpty() }
+
+        if (filteredEmptySymbols.isNotEmpty() && isNotEmptySymbolsExist) {
+            val emptyHeader = LoginStudentSelectItem.EmptySymbolsHeader(
+                isExpanded = isEmptySymbolsExpanded,
+                onClick = ::onEmptySymbolsToggle,
+            )
+            add(emptyHeader)
+            if (isEmptySymbolsExpanded) {
+                filteredEmptySymbols.forEach {
+                    add(createEmptySymbolItem(it))
+                }
+            }
+        }
+
+        if (filteredEmptySymbols.isNotEmpty() && !isNotEmptySymbolsExist) {
+            filteredEmptySymbols.forEach {
+                add(createEmptySymbolItem(it))
+            }
+        }
+    }
+
+    private fun createEmptySymbolItem(registerSymbol: RegisterSymbol) =
+        LoginStudentSelectItem.SymbolHeader(
+            symbol = registerSymbol,
+            humanReadableName = view?.symbols?.get(registerSymbol.symbol),
+            isErrorExpanded = expandedSymbolError == registerSymbol,
+            onClick = ::onSymbolItemClick,
+        )
+
     fun onSignIn() {
         registerStudents(selectedStudents)
     }
 
-    fun onItemSelected(studentWithSemester: StudentWithSemesters, alreadySaved: Boolean) {
-        if (alreadySaved) return
+    private fun onEmptySymbolsToggle() {
+        isEmptySymbolsExpanded = !isEmptySymbolsExpanded
+
+        refreshItems()
+    }
+
+    private fun onItemSelected(item: LoginStudentSelectItem.Student) {
+        if (!item.isEnabled) return
 
         selectedStudents
-            .removeAll { it == studentWithSemester }
-            .let { if (!it) selectedStudents.add(studentWithSemester) }
+            .removeAll {
+                it.student.studentId == item.student.studentId &&
+                    it.student.classId == item.student.classId &&
+                    it.unit.schoolId == item.unit.schoolId &&
+                    it.symbol.symbol == item.symbol.symbol
+            }
+            .let { if (!it) selectedStudents.add(item) }
 
         view?.enableSignIn(selectedStudents.isNotEmpty())
+        refreshItems()
     }
 
-    private fun compareStudents(a: Student, b: Student): Boolean {
-        return a.email == b.email
-            && a.symbol == b.symbol
-            && a.studentId == b.studentId
-            && a.schoolSymbol == b.schoolSymbol
-            && a.classId == b.classId
+    private fun onSymbolItemClick(symbol: RegisterSymbol) {
+        expandedSymbolError = if (symbol != expandedSymbolError) symbol else null
+        refreshItems()
     }
 
-    private fun loadData(studentsWithSemesters: List<StudentWithSemesters>) {
-        resetSelectedState()
-
-        resourceFlow { studentRepository.getSavedStudents(false) }.onEach {
-            when (it) {
-                is Resource.Loading -> Timber.d("Login student select students load started")
-                is Resource.Success -> view?.updateData(studentsWithSemesters.map { studentWithSemesters ->
-                    studentWithSemesters to it.data.any { item ->
-                        compareStudents(studentWithSemesters.student, item.student)
-                    }
-                })
-                is Resource.Error -> {
-                    errorHandler.dispatch(it.error)
-                    lastError = it.error
-                    view?.updateData(studentsWithSemesters.map { student -> student to false })
-                }
-            }
-        }.launch()
+    private fun onUnitItemClick(unit: RegisterUnit) {
+        expandedSchoolError = if (unit != expandedSchoolError) unit else null
+        refreshItems()
     }
 
     private fun resetSelectedState() {
@@ -89,7 +230,20 @@ class LoginStudentSelectPresenter @Inject constructor(
         view?.enableSignIn(false)
     }
 
-    private fun registerStudents(studentsWithSemesters: List<StudentWithSemesters>) {
+    private fun refreshItems() {
+        view?.updateData(createItems())
+    }
+
+    private fun registerStudents(students: List<LoginStudentSelectItem>) {
+        val studentsWithSemesters = students
+            .filterIsInstance<LoginStudentSelectItem.Student>().map { item ->
+                item.student.mapToStudentWithSemesters(
+                    user = registerUser,
+                    symbol = item.symbol,
+                    unit = item.unit,
+                    colors = appInfo.defaultColorsForAvatar,
+                )
+            }
         resourceFlow { studentRepository.saveStudents(studentsWithSemesters) }
             .logResourceStatus("registration")
             .onEach {
@@ -107,7 +261,6 @@ class LoginStudentSelectPresenter @Inject constructor(
                         view?.apply {
                             showProgress(false)
                             showContent(true)
-                            showContact(true)
                         }
                         lastError = it.error
                         loginErrorHandler.dispatch(it.error)
@@ -117,12 +270,22 @@ class LoginStudentSelectPresenter @Inject constructor(
             }.launch("register")
     }
 
-    fun onDiscordClick() {
+    private fun onEnterSymbol() {
+        view?.navigateToSymbol(loginData)
+    }
+
+    private fun onDiscordClick() {
         view?.openDiscordInvite()
     }
 
-    fun onEmailClick() {
-        view?.openEmail(lastError?.message.ifNullOrBlank { "empty" })
+    private fun onEmailClick() {
+        view?.openEmail(lastError?.message.ifNullOrBlank {
+            registerUser.symbols.flatMap { symbol ->
+                symbol.schools.map { it.error?.message } + symbol.error?.message
+            }.filterNotNull().distinct().joinToString("; ") {
+                it.take(46) + "..."
+            }.ifEmpty { "blank" }
+        })
     }
 
     private fun logRegisterEvent(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index 8d403271..39f312bf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -1,13 +1,17 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.login.LoginData
 
 interface LoginStudentSelectView : BaseView {
 
+    val symbols: Map<String, String>
+
     fun initView()
 
-    fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>)
+    fun updateData(data: List<LoginStudentSelectItem>)
+
+    fun navigateToSymbol(loginData: LoginData)
 
     fun navigateToNext()
 
@@ -17,8 +21,6 @@ interface LoginStudentSelectView : BaseView {
 
     fun enableSignIn(enable: Boolean)
 
-    fun showContact(show: Boolean)
-
     fun openDiscordInvite()
 
     fun openEmail(lastError: String)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index ab27ecf3..67416cb6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -12,7 +12,7 @@ import androidx.core.text.parseAsHtml
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
@@ -42,6 +42,8 @@ class LoginSymbolFragment :
         }
     }
 
+    override val symbolValue: String? get() = binding.loginSymbolName.text?.toString()
+
     override val symbolNameError: CharSequence?
         get() = binding.loginSymbolNameLayout.error
 
@@ -58,7 +60,7 @@ class LoginSymbolFragment :
         (requireActivity() as LoginActivity).showActionBar(true)
 
         with(binding) {
-            loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+            loginSymbolSignIn.setOnClickListener { presenter.attemptLogin() }
             loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
             loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
 
@@ -92,9 +94,13 @@ class LoginSymbolFragment :
     }
 
     override fun setErrorSymbolRequire() {
-        binding.loginSymbolNameLayout.apply {
+        setErrorSymbol(getString(R.string.error_field_required))
+    }
+
+    override fun setErrorSymbol(message: String) {
+        with(binding.loginSymbolNameLayout) {
             requestFocus()
-            error = getString(R.string.error_field_required)
+            error = message
         }
     }
 
@@ -125,8 +131,8 @@ class LoginSymbolFragment :
         binding.loginSymbolContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun navigateToStudentSelect(studentsWithSemesters: List<StudentWithSemesters>) {
-        (activity as? LoginActivity)?.navigateToStudentSelect(studentsWithSemesters)
+    override fun navigateToStudentSelect(loginData: LoginData, registerUser: RegisterUser) {
+        (activity as? LoginActivity)?.navigateToStudentSelect(loginData, registerUser)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index 691cd448..a6ccd7a5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -1,9 +1,12 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
 import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
+import io.github.wulkanowy.sdk.scrapper.getNormalizedSymbol
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -23,9 +26,14 @@ class LoginSymbolPresenter @Inject constructor(
 
     lateinit var loginData: LoginData
 
+    private var registerUser: RegisterUser? = null
+
     fun onAttachView(view: LoginSymbolView, loginData: LoginData) {
         super.onAttachView(view)
         this.loginData = loginData
+        loginErrorHandler.onBadCredentials = {
+            view.setErrorSymbol(it.orEmpty())
+        }
         with(view) {
             initView()
             showContact(false)
@@ -39,20 +47,24 @@ class LoginSymbolPresenter @Inject constructor(
         view?.apply { if (symbolNameError != null) clearSymbolError() }
     }
 
-    fun attemptLogin(symbol: String) {
-        if (symbol.isBlank()) {
+    fun attemptLogin() {
+        if (view?.symbolValue.isNullOrBlank()) {
             view?.setErrorSymbolRequire()
             return
         }
 
+        loginData = loginData.copy(
+            symbol = view?.symbolValue?.getNormalizedSymbol(),
+        )
         resourceFlow {
-            studentRepository.getStudentsScrapper(
+            studentRepository.getUserSubjectsFromScrapper(
                 email = loginData.login,
                 password = loginData.password,
                 scrapperBaseUrl = loginData.baseUrl,
-                symbol = symbol,
+                symbol = view?.symbolValue.orEmpty(),
             )
         }.onEach {
+            registerUser = it.dataOrNull
             when (it) {
                 is Resource.Loading -> view?.run {
                     Timber.i("Login with symbol started")
@@ -61,7 +73,7 @@ class LoginSymbolPresenter @Inject constructor(
                     showContent(false)
                 }
                 is Resource.Success -> {
-                    when (it.data.size) {
+                    when (it.data.symbols.size) {
                         0 -> {
                             Timber.i("Login with symbol result: Empty student list")
                             view?.run {
@@ -71,15 +83,14 @@ class LoginSymbolPresenter @Inject constructor(
                         }
                         else -> {
                             Timber.i("Login with symbol result: Success")
-                            view?.navigateToStudentSelect(requireNotNull(it.data))
+                            view?.navigateToStudentSelect(loginData, requireNotNull(it.data))
                         }
                     }
                     analytics.logEvent(
                         "registration_symbol",
                         "success" to true,
-                        "students" to it.data.size,
                         "scrapperBaseUrl" to loginData.baseUrl,
-                        "symbol" to symbol,
+                        "symbol" to view?.symbolValue,
                         "error" to "No error"
                     )
                 }
@@ -90,7 +101,7 @@ class LoginSymbolPresenter @Inject constructor(
                         "success" to false,
                         "students" to -1,
                         "scrapperBaseUrl" to loginData.baseUrl,
-                        "symbol" to symbol,
+                        "symbol" to view?.symbolValue,
                         "error" to it.error.message.ifNullOrBlank { "No message" }
                     )
                     loginErrorHandler.dispatch(it.error)
@@ -111,6 +122,12 @@ class LoginSymbolPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail(loginData.baseUrl, lastError?.message.ifNullOrBlank { "empty" })
+        view?.openEmail(loginData.baseUrl, lastError?.message.ifNullOrBlank {
+            registerUser?.symbols?.flatMap { symbol ->
+                symbol.schools.map { it.error?.message } + symbol.error?.message
+            }?.filterNotNull()?.distinct()?.joinToString(";") {
+                it.take(46) + "..."
+            } ?: "blank"
+        })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 527895b7..6b62d1f7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -1,10 +1,13 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.login.LoginData
 
 interface LoginSymbolView : BaseView {
 
+    val symbolValue: String?
+
     val symbolNameError: CharSequence?
 
     fun initView()
@@ -15,6 +18,8 @@ interface LoginSymbolView : BaseView {
 
     fun setErrorSymbolRequire()
 
+    fun setErrorSymbol(message: String)
+
     fun clearSymbolError()
 
     fun clearAndFocusSymbol()
@@ -27,7 +32,7 @@ interface LoginSymbolView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun navigateToStudentSelect(studentsWithSemesters: List<StudentWithSemesters>)
+    fun navigateToStudentSelect(loginData: LoginData, registerUser: RegisterUser)
 
     fun showContact(show: Boolean)
 
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index bf543116..c47b9ae3 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -3,92 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/loginStudentSelectProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        android:visibility="gone" />
+    android:orientation="vertical"
+    tools:context=".ui.modules.login.studentselect.LoginStudentSelectFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/loginStudentSelectContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
-            android:id="@+id/loginStudentSelectContact"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible">
-
-            <View
-                android:id="@+id/loginStudentSelectContactTopDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/loginStudentSelectContactHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginRight="32dp"
-                android:layout_marginBottom="16dp"
-                android:gravity="center_horizontal"
-                android:text="@string/login_contact_header"
-                android:textSize="14sp"
-                app:fontFamily="sans-serif-medium" />
-
-            <LinearLayout
-                android:id="@+id/loginStudentSelectContactButtons"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:orientation="horizontal">
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactEmail"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_weight="1"
-                    android:text="@string/login_contact_email"
-                    app:icon="@drawable/ic_more_messages" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/loginStudentSelectContactDiscord"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_weight="1"
-                    android:text="@string/login_contact_discord"
-                    app:icon="@drawable/ic_about_discord" />
-            </LinearLayout>
-
-            <View
-                android:id="@+id/loginStudentSelectContactBottomDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-        </LinearLayout>
-
         <TextView
             android:id="@+id/loginStudentSelectHeader"
             android:layout_width="match_parent"
@@ -106,22 +28,24 @@
             app:layout_constraintBottom_toTopOf="@id/loginStudentSelectRecycler"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/loginStudentSelectContact"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/loginStudentSelectRecycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="144dp"
+            android:fadingEdge="vertical"
+            android:fadingEdgeLength="100dp"
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constrainedHeight="true"
             app:layout_constraintBottom_toTopOf="@id/loginStudentSelectSignIn"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="432dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/loginStudentSelectHeader"
-            tools:itemCount="6"
-            tools:listitem="@layout/item_login_student_select" />
+            tools:itemCount="33"
+            tools:listitem="@layout/item_login_student_select_student" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/loginStudentSelectSignIn"
@@ -136,4 +60,12 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/loginStudentSelectRecycler" />
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/loginStudentSelectProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_login_student_select_empty_symbol_header.xml b/app/src/main/res/layout/item_login_student_select_empty_symbol_header.xml
new file mode 100644
index 00000000..be0fd905
--- /dev/null
+++ b/app/src/main/res/layout/item_login_student_select_empty_symbol_header.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    android:background="?selectableItemBackground"
+    android:paddingHorizontal="16dp">
+
+    <com.google.android.material.divider.MaterialDivider
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/login_student_select_empty_symbol_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="16dp"
+        android:text="@string/login_other_search_locations"
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/login_student_select_empty_symbol_chevron"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginEnd="16dp"
+        android:rotation="90"
+        android:src="@drawable/ic_chevron_right"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?android:textColorPrimary"
+        tools:ignore="ContentDescription" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_login_student_select_header_school.xml b/app/src/main/res/layout/item_login_student_select_header_school.xml
new file mode 100644
index 00000000..30a8bbf0
--- /dev/null
+++ b/app/src/main/res/layout/item_login_student_select_header_school.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="24dp"
+    android:paddingVertical="8dp">
+
+    <TextView
+        android:id="@+id/login_student_select_header_school_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Publiczna szkoła Wulkanowego" />
+
+    <TextView
+        android:id="@+id/login_student_select_header_school_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:text="@string/login_no_active_student"
+        android:textColor="?colorTimetableChange"
+        app:layout_constraintTop_toBottomOf="@id/login_student_select_header_school_name" />
+
+    <TextView
+        android:id="@+id/login_student_select_header_school_error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?colorError"
+        app:layout_constraintTop_toBottomOf="@id/login_student_select_header_school_details"
+        tools:text="@tools:sample/lorem/random" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_login_student_select_header_symbol.xml b/app/src/main/res/layout/item_login_student_select_header_symbol.xml
new file mode 100644
index 00000000..cc1bf709
--- /dev/null
+++ b/app/src/main/res/layout/item_login_student_select_header_symbol.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
+
+    <TextView
+        android:id="@+id/login_student_select_header_symbol_value"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="powiatjaroslawski" />
+
+    <TextView
+        android:id="@+id/login_student_select_header_symbol_username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintTop_toBottomOf="@id/login_student_select_header_symbol_value"
+        tools:text="Jan Kowalski" />
+
+    <TextView
+        android:id="@+id/login_student_select_header_symbol_error"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?colorError"
+        app:layout_constraintTop_toBottomOf="@id/login_student_select_header_symbol_username"
+        tools:text="@tools:sample/lorem/random" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_login_student_select_help.xml b/app/src/main/res/layout/item_login_student_select_help.xml
new file mode 100644
index 00000000..b6d81c7c
--- /dev/null
+++ b/app/src/main/res/layout/item_login_student_select_help.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/login_student_select_help_symbol"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/login_symbol_enter"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/login_student_select_help_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/login_contact_header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/login_student_select_help_mail"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/login_student_select_help_symbol" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/login_student_select_help_mail"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:contentDescription="@string/login_contact_email"
+        app:icon="@drawable/ic_more_messages"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:layout_constraintEnd_toEndOf="@id/login_student_select_help_title"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/login_student_select_help_title"
+        app:layout_constraintTop_toBottomOf="@id/login_student_select_help_symbol" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/login_student_select_help_discord"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:contentDescription="@string/login_contact_discord"
+        app:icon="@drawable/ic_about_discord"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/login_student_select_help_mail"
+        app:layout_constraintTop_toTopOf="@id/login_student_select_help_mail" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select_student.xml
similarity index 71%
rename from app/src/main/res/layout/item_login_student_select.xml
rename to app/src/main/res/layout/item_login_student_select_student.xml
index 1003636f..d071b1bb 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select_student.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    android:minHeight="72dp"
+    android:minHeight="56dp"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
     tools:context=".ui.modules.login.studentselect.LoginStudentSelectAdapter">
@@ -14,9 +14,10 @@
         android:layout_width="32dp"
         android:layout_height="24dp"
         android:layout_centerVertical="true"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="32dp"
         android:layout_marginEnd="28dp"
         android:background="@android:color/transparent"
+        android:clickable="false"
         tools:text=" " />
 
     <TextView
@@ -32,34 +33,18 @@
         tools:text="@tools:sample/full_names" />
 
     <TextView
-        android:id="@+id/loginItemSchool"
+        android:id="@+id/loginItemSignedIn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/loginItemName"
         android:layout_marginEnd="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
         android:ellipsize="end"
-        android:gravity="bottom"
-        android:maxLines="2"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="14sp"
-        tools:text="@tools:sample/lorem/random" />
-
-    <TextView
-        android:id="@+id/loginItemSignedIn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="20dp"
-        android:layout_below="@id/loginItemSchool"
-        android:layout_marginEnd="16dp"
-        android:layout_toEndOf="@id/loginItemCheck"
-        android:ellipsize="end"
         android:enabled="false"
         android:gravity="bottom"
         android:maxLines="1"
+        android:minHeight="20dp"
         android:text="@string/login_signed_in"
         android:textColor="?android:textColorSecondary"
-        android:textSize="14sp"
-        android:visibility="gone"
-        tools:visibility="visible" />
+        android:textSize="14sp" />
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26ab51ef..38997054 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Invalid symbol</string>
     <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the previous screen</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
     <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_advanced">Other options</string>
     <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
@@ -74,6 +74,9 @@
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>
     <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
     <!--Notifications-->
     <string name="notifications_header_title">Enable notifications</string>
     <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index 9bcfb8b6..bf2d9f2c 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.ui.modules.login.form
 
 import io.github.wulkanowy.MainCoroutineRule
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.sdk.scrapper.Scrapper
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.mockk.*
@@ -12,7 +12,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import java.io.IOException
-import java.time.Instant
 
 class LoginFormPresenterTest {
 
@@ -33,6 +32,15 @@ class LoginFormPresenterTest {
 
     private lateinit var presenter: LoginFormPresenter
 
+    private val registerUser = RegisterUser(
+        email = "",
+        password = "",
+        login = "",
+        baseUrl = "",
+        loginType = Scrapper.LoginType.AUTO,
+        symbols = listOf(),
+    )
+
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
@@ -104,32 +112,9 @@ class LoginFormPresenterTest {
 
     @Test
     fun loginTest() {
-        val studentTest = Student(
-            email = "test@",
-            password = "123",
-            scrapperBaseUrl = "https://fakelog.cf/?email",
-            loginType = "AUTO",
-            studentName = "",
-            schoolSymbol = "",
-            schoolName = "",
-            studentId = 0,
-            classId = 1,
-            isCurrent = false,
-            symbol = "",
-            registrationDate = Instant.now(),
-            className = "",
-            mobileBaseUrl = "",
-            privateKey = "",
-            certificateKey = "",
-            loginMode = "",
-            userLoginId = 0,
-            schoolShortName = "",
-            isParent = false,
-            userName = ""
-        )
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf(
-            StudentWithSemesters(studentTest, emptyList())
-        )
+        coEvery {
+            repository.getUserSubjectsFromScrapper(any(), any(), any(), any())
+        } returns registerUser
 
         every { loginFormView.formUsernameValue } returns "@"
         every { loginFormView.formPassValue } returns "123456"
@@ -146,7 +131,9 @@ class LoginFormPresenterTest {
 
     @Test
     fun loginEmptyTest() {
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
+        coEvery {
+            repository.getUserSubjectsFromScrapper(any(), any(), any(), any())
+        } returns registerUser
         every { loginFormView.formUsernameValue } returns "@"
         every { loginFormView.formPassValue } returns "123456"
         every { loginFormView.formHostValue } returns "https://fakelog.cf/?email"
@@ -162,7 +149,9 @@ class LoginFormPresenterTest {
 
     @Test
     fun loginEmptyTwiceTest() {
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
+        coEvery {
+            repository.getUserSubjectsFromScrapper(any(), any(), any(), any())
+        } returns registerUser
         every { loginFormView.formUsernameValue } returns "@"
         every { loginFormView.formPassValue } returns "123456"
         every { loginFormView.formHostValue } returns "https://fakelog.cf/?email"
@@ -180,7 +169,14 @@ class LoginFormPresenterTest {
     @Test
     fun loginErrorTest() {
         val testException = IOException("test")
-        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } throws testException
+        coEvery {
+            repository.getUserSubjectsFromScrapper(
+                any(),
+                any(),
+                any(),
+                any()
+            )
+        } throws testException
         every { loginFormView.formUsernameValue } returns "@"
         every { loginFormView.formPassValue } returns "123456"
         every { loginFormView.formHostValue } returns "https://fakelog.cf/?email"
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index a31ef517..cf426a50 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -1,18 +1,22 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
 import io.github.wulkanowy.MainCoroutineRule
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.RegisterStudent
+import io.github.wulkanowy.data.pojos.RegisterSymbol
+import io.github.wulkanowy.data.pojos.RegisterUnit
+import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.sdk.scrapper.Scrapper
 import io.github.wulkanowy.services.sync.SyncManager
+import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.AppInfo
 import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import java.time.Instant
 
 class LoginStudentSelectPresenterTest {
 
@@ -22,7 +26,7 @@ class LoginStudentSelectPresenterTest {
     @MockK(relaxed = true)
     lateinit var errorHandler: LoginErrorHandler
 
-    @MockK(relaxed = true)
+    @MockK
     lateinit var loginStudentSelectView: LoginStudentSelectView
 
     @MockK
@@ -34,33 +38,55 @@ class LoginStudentSelectPresenterTest {
     @MockK(relaxed = true)
     lateinit var syncManager: SyncManager
 
+    private val appInfo = AppInfo()
+
     private lateinit var presenter: LoginStudentSelectPresenter
 
-    private val testStudent by lazy {
-        Student(
-            email = "test",
-            password = "test123",
-            scrapperBaseUrl = "https://fakelog.cf",
-            loginType = "AUTO",
-            symbol = "",
-            isCurrent = false,
-            studentId = 0,
-            schoolName = "",
-            schoolSymbol = "",
-            classId = 1,
-            studentName = "",
-            registrationDate = Instant.now(),
-            className = "",
-            loginMode = "",
-            certificateKey = "",
-            privateKey = "",
-            mobileBaseUrl = "",
-            schoolShortName = "",
-            userLoginId = 1,
-            isParent = false,
-            userName = ""
-        )
-    }
+    private val loginData = LoginData(
+        login = "",
+        password = "",
+        baseUrl = "",
+        symbol = null,
+    )
+
+    private val subject = RegisterStudent(
+        studentId = 0,
+        studentName = "",
+        studentSecondName = "",
+        studentSurname = "",
+        className = "",
+        classId = 0,
+        isParent = false,
+        semesters = listOf(),
+    )
+
+    private val school = RegisterUnit(
+        userLoginId = 0,
+        schoolId = "",
+        schoolName = "",
+        schoolShortName = "",
+        parentIds = listOf(),
+        studentIds = listOf(),
+        employeeIds = listOf(),
+        error = null,
+        students = listOf(subject)
+    )
+
+    private val symbol = RegisterSymbol(
+        symbol = "",
+        error = null,
+        userName = "",
+        schools = listOf(school),
+    )
+
+    private val registerUser = RegisterUser(
+        email = "",
+        password = "",
+        login = "",
+        baseUrl = "",
+        loginType = Scrapper.LoginType.AUTO,
+        symbols = listOf(symbol),
+    )
 
     private val testException by lazy { RuntimeException("Problem") }
 
@@ -69,30 +95,44 @@ class LoginStudentSelectPresenterTest {
         MockKAnnotations.init(this)
 
         clearMocks(studentRepository, loginStudentSelectView)
+
+        coEvery { studentRepository.getSavedStudents(false) } returns emptyList()
+
         every { loginStudentSelectView.initView() } just Runs
-        every { loginStudentSelectView.showContact(any()) } just Runs
+        every { loginStudentSelectView.symbols } returns emptyMap()
+
         every { loginStudentSelectView.enableSignIn(any()) } just Runs
         every { loginStudentSelectView.showProgress(any()) } just Runs
         every { loginStudentSelectView.showContent(any()) } just Runs
 
-        presenter = LoginStudentSelectPresenter(studentRepository, errorHandler, syncManager, analytics)
-        presenter.onAttachView(loginStudentSelectView, emptyList())
+        presenter = LoginStudentSelectPresenter(
+            studentRepository = studentRepository,
+            loginErrorHandler = errorHandler,
+            syncManager = syncManager,
+            analytics = analytics,
+            appInfo = appInfo,
+        )
     }
 
     @Test
     fun initViewTest() {
+        presenter.onAttachView(loginStudentSelectView, loginData, registerUser)
         verify { loginStudentSelectView.initView() }
     }
 
     @Test
     fun onSelectedStudentTest() {
-        coEvery {
-            studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList())))
-        } just Runs
+        val itemsSlot = slot<List<LoginStudentSelectItem>>()
+        every { loginStudentSelectView.updateData(capture(itemsSlot)) } just Runs
+        presenter.onAttachView(loginStudentSelectView, loginData, registerUser)
+
+        coEvery { studentRepository.saveStudents(any()) } just Runs
 
         every { loginStudentSelectView.navigateToNext() } just Runs
 
-        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
+        itemsSlot.captured.filterIsInstance<LoginStudentSelectItem.Student>().first().let {
+            it.onClick(it)
+        }
         presenter.onSignIn()
 
         verify { loginStudentSelectView.showContent(false) }
@@ -102,13 +142,15 @@ class LoginStudentSelectPresenterTest {
 
     @Test
     fun onSelectedStudentErrorTest() {
-        coEvery {
-            studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList())))
-        } throws testException
+        val itemsSlot = slot<List<LoginStudentSelectItem>>()
+        every { loginStudentSelectView.updateData(capture(itemsSlot)) } just Runs
+        presenter.onAttachView(loginStudentSelectView, loginData, registerUser)
 
-        coEvery { studentRepository.logoutStudent(testStudent) } just Runs
+        coEvery { studentRepository.saveStudents(any()) } throws testException
 
-        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
+        itemsSlot.captured.filterIsInstance<LoginStudentSelectItem.Student>().first().let {
+            it.onClick(it)
+        }
         presenter.onSignIn()
 
         verify { loginStudentSelectView.showContent(false) }

From b30b7c3318a9de656ba841af8315fc3a29bf5fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sun, 1 Jan 2023 21:52:46 +0100
Subject: [PATCH 214/429] New Crowdin updates (#2068)

---
 app/src/main/res/values-cs/strings.xml        |  12 +-
 .../res/values-da-rDK/preferences_values.xml  |  65 ++
 app/src/main/res/values-da-rDK/strings.xml    | 728 ++++++++++++++++++
 app/src/main/res/values-de/strings.xml        |  16 +-
 app/src/main/res/values-es-rES/strings.xml    |  12 +-
 app/src/main/res/values-pl/strings.xml        |  12 +-
 app/src/main/res/values-ru/strings.xml        |  12 +-
 app/src/main/res/values-sk/strings.xml        |  14 +-
 app/src/main/res/values-uk/strings.xml        |  12 +-
 9 files changed, 873 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/values-da-rDK/preferences_values.xml
 create mode 100644 app/src/main/res/values-da-rDK/strings.xml

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index f41cb17f..4a91cc85 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Neplatný symbol</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>Zarejestruj urządzenie mobilne</b>.\n\nUjistěte se, že jste na předchozí obrazovce nastavili správnou variantu deníku do pole <b>Variace deníku UONET+</b></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>
     <string name="login_select_student">Vyberte žáky, kteří se mají do aplikace přihlásit</string>
     <string name="login_advanced">Jiné možnosti</string>
     <string name="login_advanced_warning_mobile_api">V tomto režimu nefungují následující: šťastné číslo, statistiky třídy, shrnutí frekvencí, ospravedlnění nepřítomnosti, dokončené lekce, informace o škole a prohlížení seznamu registrovaných zařízení</string>
@@ -72,6 +72,14 @@
     <string name="login_recover">Obnovit</string>
     <string name="login_signed_in">Žák je už přihlášen</string>
     <string name="login_host_standard">Standardní</string>
+    <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>
+    <!--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>
+    <string name="notifications_skip">Přeskočit</string>
+    <string name="notifications_enable">Zapnout</string>
     <!--Main-->
     <string name="main_account_picker">Manažer účtů</string>
     <string name="main_log_in">Přihlásit se</string>
@@ -485,6 +493,8 @@
     </plurals>
     <string name="conferences_present">Přítomnost na setkání</string>
     <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Místo</string>
+    <string name="conference_topic">Téma</string>
     <!--Director information-->
     <string name="school_announcement_title">Školní oznámení</string>
     <string name="school_announcement_no_items">Žádná školní oznámení</string>
diff --git a/app/src/main/res/values-da-rDK/preferences_values.xml b/app/src/main/res/values-da-rDK/preferences_values.xml
new file mode 100644
index 00000000..ac2b6e9e
--- /dev/null
+++ b/app/src/main/res/values-da-rDK/preferences_values.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Black (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>System language</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+        <item>Slovenčina</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 minutes</item>
+        <item>30 minutes</item>
+        <item>1 hour</item>
+        <item>2 hours</item>
+        <item>6 hours</item>
+        <item>12 hours</item>
+        <item>24 hours</item>
+    </string-array>
+    <string-array name="grade_modifier_entries">
+        <item>0,00</item>
+        <item>0,25</item>
+        <item>0,33</item>
+        <item>0,5</item>
+        <item>0,75</item>
+    </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetically</item>
+        <item>By date</item>
+        <item>By average</item>
+    </string-array>
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Grade colors in register</item>
+    </string-array>
+    <string-array name="default_expand_grade_entries">
+        <item>Up to 1 at once</item>
+        <item>Always expanded</item>
+        <item>Unlimited expansions</item>
+    </string-array>
+    <string-array name="grade_average_mode_entries">
+        <item>Average of grades only from selected semester</item>
+        <item>Average of averages from both semesters</item>
+        <item>Average of grades from the whole year</item>
+    </string-array>
+    <string-array name="dashboard_tile_entries">
+        <item>Lucky number</item>
+        <item>Unread messages</item>
+        <item>Attendance</item>
+        <item>Lessons</item>
+        <item>Grades</item>
+        <item>Homework</item>
+        <item>School announcements</item>
+        <item>Exams</item>
+        <item>Conferences</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
new file mode 100644
index 00000000..66723127
--- /dev/null
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -0,0 +1,728 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Login</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Grades</string>
+    <string name="attendance_title">Attendance</string>
+    <string name="exam_title">Exams</string>
+    <string name="timetable_title">Timetable</string>
+    <string name="settings_title">Settings</string>
+    <string name="more_title">More</string>
+    <string name="about_title">About</string>
+    <string name="logviewer_title">Log viewer</string>
+    <string name="debug_title">Debug</string>
+    <string name="notification_debug_title">Notification debug</string>
+    <string name="contributors_title">Contributors</string>
+    <string name="license_title">Licenses</string>
+    <string name="message_title">Messages</string>
+    <string name="send_message_title">New message</string>
+    <string name="add_homework_title">New homework</string>
+    <string name="note_title">Notes and achievements</string>
+    <string name="homework_title">Homework</string>
+    <string name="account_title">Accounts manager</string>
+    <string name="account_quick_title">Select account</string>
+    <string name="account_details_title">Account details</string>
+    <string name="student_info_title">Student info</string>
+    <string name="dashboard_title">Dashboard</string>
+    <string name="notifications_center_title">Notifications center</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+    <!--Login-->
+    <string name="login_header_default">Sign in with the student or parent account</string>
+    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="login_nickname_hint">Username</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
+    <string name="login_password_hint">Password</string>
+    <string name="login_host_hint">UONET+ register variant</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_sign_in">Sign in</string>
+    <string name="login_invalid_password">Password too short</string>
+    <string name="login_incorrect_password_default">Login details are incorrect</string>
+    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</string>
+    <string name="login_invalid_pin">Invalid PIN</string>
+    <string name="login_invalid_token">Invalid token</string>
+    <string name="login_expired_token">Token expired</string>
+    <string name="login_invalid_email">Invalid email</string>
+    <string name="login_invalid_login">Use the assigned login instead of email</string>
+    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
+    <string name="login_invalid_symbol">Invalid symbol</string>
+    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
+    <string name="login_duplicate_student">Selected student is already logged in</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
+    <string name="login_select_student">Select students to log in to the application</string>
+    <string name="login_advanced">Other options</string>
+    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
+    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
+    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
+    <string name="login_privacy_policy">Privacy policy</string>
+    <string name="login_contact_header">Trouble signing in? Contact us!</string>
+    <string name="login_contact_email">Email</string>
+    <string name="login_contact_discord">Discord</string>
+    <string name="login_email_intent_title">Send email</string>
+    <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
+    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_title">Recover your account</string>
+    <string name="login_recover">Recover</string>
+    <string name="login_signed_in">Student is already signed in</string>
+    <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
+    <!--Main-->
+    <string name="main_account_picker">Account manager</string>
+    <string name="main_log_in">Log in</string>
+    <string name="main_session_expired">Session expired</string>
+    <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
+    <!--Grade-->
+    <string name="grade_header">Grade</string>
+    <string name="grade_semester">Semester %d</string>
+    <string name="grade_switch_semester">Change semester</string>
+    <string name="grade_no_items">No grades</string>
+    <string name="grade_weight">Weight</string>
+    <string name="grade_weight_value">Weight: %s</string>
+    <string name="grade_comment">Comment</string>
+    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
+    <string name="grade_average">Average: %1$.2f</string>
+    <string name="grade_points_sum">Points: %s</string>
+    <string name="grade_no_average">No average</string>
+    <string name="grade_summary_points">Total points</string>
+    <string name="grade_summary_final_grade">Final grade</string>
+    <string name="grade_summary_predicted_grade">Predicted grade</string>
+    <string name="grade_summary_calculated_average">Calculated average</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
+    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
+    <string name="grade_summary_final_average">Final average</string>
+    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
+    <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
+    <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Points</string>
+    <string name="grade_statistics_legend">Legend</string>
+    <string name="grade_statistics_class_average">Class average: %1$s</string>
+    <string name="grade_statistics_student_average">Your average: %1$s</string>
+    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
+    <string name="grade_statistics_average_class">Class</string>
+    <string name="grade_statistics_average_student">Student</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d grade</item>
+        <item quantity="other">%d grades</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">New grade</item>
+        <item quantity="other">New grades</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">You received %1$d grade</item>
+        <item quantity="other">You received %1$d grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lesson</string>
+    <string name="timetable_room">Room</string>
+    <string name="timetable_group">Group</string>
+    <string name="timetable_time">Hours</string>
+    <string name="timetable_changes">Changes</string>
+    <string name="timetable_no_items">No lessons this day</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
+    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
+    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
+    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
+    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_notify_new_items_title">
+        <item quantity="one">Timetable change</item>
+        <item quantity="other">Timetable changes</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items">
+        <item quantity="one">%1$s - %2$d change in timetable</item>
+        <item quantity="other">%1$s - %2$d  changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_group">
+        <item quantity="one">%1$d change in timetable</item>
+        <item quantity="other">%1$d changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_number_item">
+        <item quantity="one">%d change</item>
+        <item quantity="other">%d changes</item>
+    </plurals>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
+    <!--Additional lessons-->
+    <string name="additional_lessons_title">Additional lessons</string>
+    <string name="additional_lessons_button">Show additional lessons</string>
+    <string name="additional_lessons_no_items">No info about additional lessons</string>
+    <string name="additional_lessons_add">New lesson</string>
+    <string name="additional_lessons_add_title">New additional lesson</string>
+    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
+    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
+    <string name="additional_lessons_repeat">Repeat weekly</string>
+    <string name="additional_lessons_delete_title">Delete additional lesson</string>
+    <string name="additional_lessons_delete_one">Just this lesson</string>
+    <string name="additional_lessons_delete_series">All in the series</string>
+    <string name="additional_lessons_start">Start time</string>
+    <string name="additional_lessons_end">End time</string>
+    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
+    <string name="attendance_absence_school">Absent for school reasons</string>
+    <string name="attendance_absence_excused">Excused absence</string>
+    <string name="attendance_absence_unexcused">Unexcused absence</string>
+    <string name="attendance_exemption">Exemption</string>
+    <string name="attendance_excused_lateness">Excused lateness</string>
+    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
+    <string name="attendance_present">Present</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Number of lesson</string>
+    <string name="attendance_no_items">No entries</string>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
+    <plurals name="attendance_notify_new_items_title">
+        <item quantity="one">New attendance</item>
+        <item quantity="other">New attendance</item>
+    </plurals>
+    <plurals name="attendance_notify_new_items">
+        <item quantity="one">%1$d new attendance</item>
+        <item quantity="other">%1$d attendance</item>
+    </plurals>
+    <plurals name="attendance_number_item">
+        <item quantity="one">%d attendance</item>
+        <item quantity="other">%d attendance</item>
+    </plurals>
+    <!--Attendance summary-->
+    <string name="attendance_summary_total">Total</string>
+    <!--Exam-->
+    <string name="exam_no_items">No exams this week</string>
+    <string name="exam_type">Type</string>
+    <string name="exam_entry_date">Entry date</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">New exam</item>
+        <item quantity="other">New exams</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">%d new exam</item>
+        <item quantity="other">%d new exams</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d exam</item>
+        <item quantity="other">%d exams</item>
+    </plurals>
+    <!--Message-->
+    <string name="message_inbox">Inbox</string>
+    <string name="message_sent">Sent</string>
+    <string name="message_trash">Trash</string>
+    <string name="message_no_subject">(no subject)</string>
+    <string name="message_no_items">No messages</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
+    <string name="message_date">Date: %1$s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_forward">Forward</string>
+    <string name="message_select_all">Select all</string>
+    <string name="message_unselect_all">Unselect all</string>
+    <string name="message_move_to_trash">Move to trash</string>
+    <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_not_exists">Message does not exist</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
+    <string name="message_chip_only_unread">Only unread</string>
+    <string name="message_chip_only_with_attachments">Only with attachments</string>
+    <string name="message_read">Read: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%1$d message</item>
+        <item quantity="other">%1$d messages</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">New message</item>
+        <item quantity="other">New messages</item>
+    </plurals>
+    <string name="message_restore_dialog">Do you want to restore draft message?</string>
+    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">You received %1$d message</item>
+        <item quantity="other">You received %1$d messages</item>
+    </plurals>
+    <plurals name="message_selected_messages_count">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <!--Note-->
+    <string name="note_no_items">No info about notes</string>
+    <string name="note_points">Points</string>
+    <plurals name="note_number_item">
+        <item quantity="one">%d note</item>
+        <item quantity="other">%d notes</item>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">New note</item>
+        <item quantity="other">New notes</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--Homework-->
+    <string name="homework_no_items">No info about homework</string>
+    <string name="homework_mark_as_done">Mark as done</string>
+    <string name="homework_mark_as_undone">Mark as undone</string>
+    <string name="homework_add">Add homework</string>
+    <string name="homework_add_success">Homework added successfully</string>
+    <string name="homework_delete_success">Homework deleted successfully</string>
+    <string name="homework_attachments">Attachments</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">New homework</item>
+        <item quantity="other">New homework</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">You received %d new homework</item>
+        <item quantity="other">You received %d new homework</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d homework</item>
+        <item quantity="other">%d homework</item>
+    </plurals>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
+    <string name="lucky_number_history_button">Show history</string>
+    <!--Lucky number history-->
+    <string name="lucky_number_history_title">Lucky number history</string>
+    <string name="lucky_number_history_empty">No info about lucky numbers</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile devices</string>
+    <string name="mobile_devices_no_items">No devices</string>
+    <string name="mobile_devices_unregister">Deregister</string>
+    <string name="mobile_device_removed">Device removed</string>
+    <string name="mobile_device_qr">QR code</string>
+    <string name="mobile_device_token">Token</string>
+    <string name="mobile_device_symbol">Symbol</string>
+    <string name="mobile_device_pin">PIN</string>
+    <!--School and teachers-->
+    <string name="schoolandteachers_title">School and teachers</string>
+    <!--School-->
+    <string name="school_title">School</string>
+    <string name="school_no_info">No info about school</string>
+    <string name="school_name">School name</string>
+    <string name="school_address">School address</string>
+    <string name="school_telephone">Telephone</string>
+    <string name="school_headmaster">Name of headmaster</string>
+    <string name="school_pedagogue">Name of pedagogue</string>
+    <string name="school_address_button">Show on map</string>
+    <string name="school_telephone_button">Call</string>
+    <!--Teacher-->
+    <string name="teachers_title">Teachers</string>
+    <string name="teacher_no_items">No info about teachers</string>
+    <string name="teacher_no_subject">No subject</string>
+    <!--Conference-->
+    <string name="conferences_title">Conferences</string>
+    <string name="conference_no_items">No info about conferences</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d conference</item>
+        <item quantity="other">%d conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">New conference</item>
+        <item quantity="other">New conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">You have %1$d new conference</item>
+        <item quantity="other">You have %1$d new conferences</item>
+    </plurals>
+    <string name="conferences_present">Present at conference</string>
+    <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
+    <!--Director information-->
+    <string name="school_announcement_title">School announcements</string>
+    <string name="school_announcement_no_items">No school announcements</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d school announcement</item>
+        <item quantity="other">%d school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">New school announcement</item>
+        <item quantity="other">New school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">You have %1$d new school announcement</item>
+        <item quantity="other">You have %1$d new school announcements</item>
+    </plurals>
+    <!--Account-->
+    <string name="account_add_new">Add account</string>
+    <string name="account_logout">Logout</string>
+    <string name="account_confirm">Do you want to log out this student?</string>
+    <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_details_edit">Edit data</string>
+    <string name="account_quick_manager">Accounts manager</string>
+    <string name="account_select_student">Select student</string>
+    <string name="account_family">Family</string>
+    <string name="account_contact">Contact</string>
+    <string name="account_address">Residence details</string>
+    <string name="account_personal_data">Personal information</string>
+    <!--About-->
+    <string name="about_version">App version</string>
+    <string name="about_contributor">Contributors</string>
+    <string name="about_contributor_summary">List of Wulkanowy developers</string>
+    <string name="about_feedback">Report a bug</string>
+    <string name="about_feedback_summary">Send a bug report via e-mail</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_summary">Read Frequently Asked Questions</string>
+    <string name="about_discord">Discord server</string>
+    <string name="about_discord_summary">Join the Wulkanowy community</string>
+    <string name="about_facebook">Facebook fanpage</string>
+    <string name="about_twitter">Twitter page</string>
+    <string name="about_twitter_summary">Follow us on twitter</string>
+    <string name="about_facebook_summary">Like our facebook fanpage</string>
+    <string name="about_privacy">Privacy policy</string>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
+    <string name="about_system">System settings</string>
+    <string name="about_system_summary">Open system settings</string>
+    <string name="about_homepage">Homepage</string>
+    <string name="about_homepage_summary">Visit the website and help develop the application</string>
+    <string name="about_licenses">Licenses</string>
+    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">License</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Avatar</string>
+    <string name="contributor_see_more">See more on GitHub</string>
+    <!--Student info-->
+    <string name="student_info_empty">No info about student or student family</string>
+    <string name="student_info_first_name">Name</string>
+    <string name="student_info_second_name">Second name</string>
+    <string name="student_info_gender">Gender</string>
+    <string name="student_info_polish_citizenship">Polish citizenship</string>
+    <string name="student_info_family_name">Family name</string>
+    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
+    <string name="student_info_phone">Phone</string>
+    <string name="student_info_cellphone">Cellphone</string>
+    <string name="student_info_email">E-mail</string>
+    <string name="student_info_address">Address of residence</string>
+    <string name="student_info_registered_address">Address of registration</string>
+    <string name="student_info_correspondence_address">Correspondence address</string>
+    <string name="student_info_full_name">Surname and first name</string>
+    <string name="student_info_kinship">Degree of kinship</string>
+    <string name="student_info_guardian_address">Address</string>
+    <string name="student_info_phones">Phones</string>
+    <string name="student_info_male">Male</string>
+    <string name="student_info_female">Female</string>
+    <string name="student_info_last_name">Last name</string>
+    <string name="student_info_guardian">Guardian</string>
+    <!--Account edit-->
+    <string name="account_edit_nick_hint">Nick</string>
+    <string name="account_edit_header">Add nick</string>
+    <string name="account_edit_avatar_title">Choose avatar color</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lessons</string>
+    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
+    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
+    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
+    <string name="dashboard_timetable_second_lessons_title">Next:</string>
+    <string name="dashboard_timetable_third_title">Later:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">%1$d more lesson</item>
+        <item quantity="other">%1$d more lessons</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">until %1$s</string>
+    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
+    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
+    <string name="dashboard_homework_title">Homework</string>
+    <string name="dashboard_homework_no_homework">No homework to do</string>
+    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">%1$d more homework</item>
+        <item quantity="other">%1$d more homework</item>
+    </plurals>
+    <string name="dashboard_homework_time">due %1$s</string>
+    <string name="dashboard_grade_title">Last grades</string>
+    <string name="dashboard_grade_no_grade">No new grades</string>
+    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
+    <string name="dashboard_announcements_title">School announcements</string>
+    <string name="dashboard_announcements_no_announcements">No current announcements</string>
+    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">%1$d more announcement</item>
+        <item quantity="other">%1$d more announcements</item>
+    </plurals>
+    <string name="dashboard_exams_title">Exams</string>
+    <string name="dashboard_exams_no_exams">No upcoming exams</string>
+    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">%1$d more exam</item>
+        <item quantity="other">%1$d more exams</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Conferences</string>
+    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
+    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">%1$d more conference</item>
+        <item quantity="other">%1$d more conferences</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
+    <string name="dashboard_horizontal_group_no_data">None</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
+    <!--Generic-->
+    <string name="all_content">Content</string>
+    <string name="all_retry">Retry</string>
+    <string name="all_description">Description</string>
+    <string name="all_no_description">No description</string>
+    <string name="all_teacher">Teacher</string>
+    <string name="all_date">Date</string>
+    <string name="all_entry_date">Entry date</string>
+    <string name="all_color">Color</string>
+    <string name="all_details">Details</string>
+    <string name="all_category">Category</string>
+    <string name="all_close">Close</string>
+    <string name="all_no_data">No data</string>
+    <string name="all_subject">Subject</string>
+    <string name="all_prev">Prev</string>
+    <string name="all_next">Next</string>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search…</string>
+    <string name="all_yes">Yes</string>
+    <string name="all_no">No</string>
+    <string name="all_save">Save</string>
+    <string name="all_title">Title</string>
+    <string name="all_add">Add</string>
+    <string name="all_copied">Copied</string>
+    <string name="all_undo">Undo</string>
+    <string name="all_change">Change</string>
+    <string name="all_add_to_calendar">Add to calendar</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_theme_title">Choose theme</string>
+    <string name="widget_timetable_theme_light">Light</string>
+    <string name="widget_timetable_theme_dark">Dark</string>
+    <string name="widget_timetable_theme_system">System Theme</string>
+    <!--Preferences-->
+    <string name="pref_view_header">App</string>
+    <string name="pref_view_list">Default view</string>
+    <string name="pref_view_grade_average_mode">Calculated average options</string>
+    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
+    <string name="pref_view_present">Show presence</string>
+    <string name="pref_view_app_theme">Theme</string>
+    <string name="pref_view_expand_grade">Grades expanding</string>
+    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
+    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
+    <string name="pref_view_app_language">Language</string>
+    <string name="pref_notify_header">Notifications</string>
+    <string name="pref_notify_header_other">Other</string>
+    <string name="pref_notify_switch">Show notifications</string>
+    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
+    <string name="pref_notify_open_system_settings">Open system notification settings</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_debug_switch">Show debug notifications</string>
+    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
+    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
+    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
+    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
+    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
+    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
+    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
+    <string name="pref_notification_go_to_settings">Go to settings</string>
+    <string name="pref_services_header">Synchronization</string>
+    <string name="pref_services_switch">Automatic update</string>
+    <string name="pref_services_suspended">Suspended on holidays</string>
+    <string name="pref_services_interval">Updates interval</string>
+    <string name="pref_services_wifi">Wi-Fi only</string>
+    <string name="pref_services_force_sync">Sync now</string>
+    <string name="pref_services_message_sync_success">Synced!</string>
+    <string name="pref_services_message_sync_failed">Sync failed</string>
+    <string name="pref_services_sync_in_progress">Sync in progress</string>
+    <string name="pref_services_last_full_sync_date">Last full sync: %s</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_support">Watch single ad to support project</string>
+    <string name="pref_ads_privacy_title">Consent to data processing</string>
+    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
+    <string name="pref_ads_privacy_agree">Agree</string>
+    <string name="pref_ads_privacy_link">Privacy policy</string>
+    <string name="pref_ads_loading">Ad is loading</string>
+    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
+    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
+    <string name="pref_ads_summary_personalized">Personalized ads</string>
+    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
+    <string name="pref_settings_advanced_title">Advanced</string>
+    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
+    <string name="pref_settings_notifications_title">Notifications</string>
+    <string name="pref_settings_sync_title">Synchronization</string>
+    <string name="pref_settings_ads_title">Advertisements</string>
+    <string name="pref_grades_appearance_header">Grades</string>
+    <string name="pref_dashboard_appearance_header">Dashboard</string>
+    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
+    <string name="pref_attendance_appearance_view">Attendance</string>
+    <string name="pref_timetable_appearance_view">Timetable</string>
+    <string name="pref_grades_advanced_header">Grades</string>
+    <string name="pref_counted_average_advanced_header">Calculated average</string>
+    <string name="pref_messages_advanced_header">Messages</string>
+    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
+    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
+    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
+    <string name="pref_notifications_category">Notifications</string>
+    <string name="pref_sync_category">Synchronization</string>
+    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
+    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
+    <string name="pref_advanced_category">Advanced</string>
+    <string name="pref_about_category_summary">App version, contributors, social portals</string>
+    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+    <!--Notification Channels-->
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_new_homework">New homework</string>
+    <string name="channel_new_conference">New conferences</string>
+    <string name="channel_new_exam">New exams</string>
+    <string name="channel_lucky_number">Lucky number</string>
+    <string name="channel_new_message">New messages</string>
+    <string name="channel_new_notes">New notes</string>
+    <string name="channel_new_school_announcement">New school announcements</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
+    <string name="channel_debug">Debug</string>
+    <string name="channel_change_timetable">Timetable change</string>
+    <string name="channel_new_attendance">New attendance</string>
+    <!--Colors-->
+    <string name="all_black">Black</string>
+    <string name="all_red">Red</string>
+    <string name="all_blue">Blue</string>
+    <string name="all_green">Green</string>
+    <string name="all_purple">Purple</string>
+    <string name="all_empty_color">No color</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>
+    <string name="update_download_success_button">Restart</string>
+    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Errors-->
+    <string name="error_no_internet">No internet connection</string>
+    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
+    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
+    <string name="error_login_failed">Loading data failed. Please try again later</string>
+    <string name="error_password_change_required">Register password change required</string>
+    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
+    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
+    <string name="error_unknown_app">Unknown application error. Please try again later</string>
+    <string name="error_unknown">An unexpected error occurred</string>
+    <string name="error_feature_disabled">Feature disabled by your school</string>
+    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
+    <string name="error_field_required">This field is required</string>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6107fbb9..f7b8e7c4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Ungültige symbol</string>
     <string name="login_incorrect_symbol">Schüler nicht gefunden. Überprüfen Sie das Symbol und die gewählte Variation des UONET+ Registers</string>
     <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
-    <string name="login_symbol_helper">Das Symbol kann auf der Registerseite in&#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>gefunden werden.\n\nStellen Sie sicher, dass Sie die entsprechende Registervariante im Feld <b>UONET+ Registervariante</b> auf dem vorherigen Bildschirm festgelegt haben</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
     <string name="login_select_student">Wählen Sie die Studenten aus, die sich bei der Anwendung anmelden sollen</string>
     <string name="login_advanced">Andere Optionen</string>
     <string name="login_advanced_warning_mobile_api">In diesem Modus funktioniert eine Glücknummer, eine Klassenstatistik, eine Zusammenfassung der Anwesenheit, eine Entschuldigung für die Abwesenheit, abgeschlossene Lektionen, Schulinformationen und eine Vorschau der Liste der registrierten Geräte nicht</string>
@@ -72,6 +72,14 @@
     <string name="login_recover">Wiederherstellen</string>
     <string name="login_signed_in">Student ist bereits angemeldet</string>
     <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
     <!--Main-->
     <string name="main_account_picker">Kundenbetreuer</string>
     <string name="main_log_in">Anmelden</string>
@@ -275,7 +283,7 @@
     <string name="message_not_exists">Nachricht nicht vorhanden</string>
     <string name="message_required_recipients">Sie müssen mindestens 1 Empfänger auswählen.</string>
     <string name="message_content_min_length">Der Inhalt der Nachricht muss mindestens 3 Zeichen lang sein.</string>
-    <string name="message_chip_all_mailboxes">All mailboxes</string>
+    <string name="message_chip_all_mailboxes">Alle postfächer</string>
     <string name="message_chip_only_unread">Nur ungelesen</string>
     <string name="message_chip_only_with_attachments">Nur mit Anhängen</string>
     <string name="message_read">Lesen: %s</string>
@@ -299,7 +307,7 @@
         <item quantity="other">%1$d ausgewählt</item>
     </plurals>
     <string name="message_messages_deleted">Nachrichten gelöscht</string>
-    <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_mailbox_chooser_title">Postfach auswählen</string>
     <!--Note-->
     <string name="note_no_items">Keine Informationen über Eintragen</string>
     <string name="note_points">Punkte</string>
@@ -413,6 +421,8 @@
     </plurals>
     <string name="conferences_present">Teilnahme an einem Meeting</string>
     <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
     <!--Director information-->
     <string name="school_announcement_title">Schulankündigungen</string>
     <string name="school_announcement_no_items">Keine schulankündigungen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 95a00a60..66723127 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Invalid symbol</string>
     <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the previous screen</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
     <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_advanced">Other options</string>
     <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
@@ -72,6 +72,14 @@
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>
     <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
     <!--Main-->
     <string name="main_account_picker">Account manager</string>
     <string name="main_log_in">Log in</string>
@@ -413,6 +421,8 @@
     </plurals>
     <string name="conferences_present">Present at conference</string>
     <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
     <!--Director information-->
     <string name="school_announcement_title">School announcements</string>
     <string name="school_announcement_no_items">No school announcements</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f612d826..4891015d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Nieprawidłowy symbol</string>
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź poprawność symbolu i wybranej odmiany dziennika UONET+</string>
     <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</string>
-    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nUpewnij się, że w polu <b>Dziennik UONET+</b> na poprzednim ekranie została ustawiona odpowiednia odmiana dziennika</string>
+    <string name="login_symbol_helper">Symbol można znaleźć na stronie dziennika w&#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nUpewnij się, że ustawiłeś odpowiednią odmianę dziennika w polu  <b>Odmiana dziennika UONET+</b> na pierwszym ekranie logowania</string>
     <string name="login_select_student">Wybierz uczniów do zalogowania w aplikacji</string>
     <string name="login_advanced">Inne opcje</string>
     <string name="login_advanced_warning_mobile_api">W tym trybie nie działa szczęśliwy numerek, uczeń na tle klasy, podsumowanie frekwencji, usprawiedliwianie nieobecności, lekcje zrealizowane, informacje o szkole i podgląd listy zarejestrowanych urządzeń</string>
@@ -72,6 +72,14 @@
     <string name="login_recover">Przywróć</string>
     <string name="login_signed_in">Uczeń jest już zalogowany</string>
     <string name="login_host_standard">Standardowa</string>
+    <string name="login_other_search_locations">Inne lokalizacje wyszukiwania</string>
+    <string name="login_no_active_student">Nie znaleziono aktywnych uczniów</string>
+    <string name="login_symbol_enter">Wprowadź inny symbol</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Włącz powiadomienia</string>
+    <string name="notifications_header_description">Włącz powiadomienia, aby nie przegapić wiadomości od nauczyciela lub nowej oceny</string>
+    <string name="notifications_skip">Pomiń</string>
+    <string name="notifications_enable">Włącz</string>
     <!--Main-->
     <string name="main_account_picker">Menadżer kont</string>
     <string name="main_log_in">Zaloguj się</string>
@@ -485,6 +493,8 @@
     </plurals>
     <string name="conferences_present">Obecność na zebraniu</string>
     <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Miejsce</string>
+    <string name="conference_topic">Temat</string>
     <!--Director information-->
     <string name="school_announcement_title">Ogłoszenia szkolne</string>
     <string name="school_announcement_no_items">Brak ogłoszeń szkolnych</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 195371fd..01e43183 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Неверный symbol</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>Zarejestruj urządzenie mobilne</b>.\n\nУбедитесь, что вы выбрали соответствующий тип дневника в поле <b>Тип дневника UONET+</b> на предыдущем экране</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
     <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
     <string name="login_advanced">Другие варианты</string>
     <string name="login_advanced_warning_mobile_api">В этом режиме не работают: счастливый номер, статистика класса по оценкам, статистика посещаемости и уроков, информация о школе и список зарегистрированных устройств</string>
@@ -72,6 +72,14 @@
     <string name="login_recover">Восстановить</string>
     <string name="login_signed_in">Ученик уже авторизован</string>
     <string name="login_host_standard">Стандартный</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
     <!--Main-->
     <string name="main_account_picker">Менеджер аккаунтов</string>
     <string name="main_log_in">Войти</string>
@@ -485,6 +493,8 @@
     </plurals>
     <string name="conferences_present">Присутствует на встрече</string>
     <string name="conference_agenda">Повестка дня</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
     <!--Director information-->
     <string name="school_announcement_title">Объявления школы</string>
     <string name="school_announcement_no_items">Нет школьных объявлений</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9fd06bcb..4189c534 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -35,7 +35,7 @@
     <string name="login_email_hint">Email</string>
     <string name="login_login_pesel_email_hint">Prihlásenie, číslo PESEL alebo e-mail</string>
     <string name="login_password_hint">Heslo</string>
-    <string name="login_host_hint">Variácie denníka UONET+</string>
+    <string name="login_host_hint">Variácia denníka UONET+</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybridné</string>
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Neplatný symbol</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>Zarejestruj urządzenie mobilne</b>.\n\nUistite sa, že ste na predchádzajúcu obrazovke nastaviť správny variant denníka do poľa <b>Variácie denníka UONET+</b></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>
     <string name="login_select_student">Vyberte žiakov, ktorí sa majú do aplikácie prihlásiť</string>
     <string name="login_advanced">Iné možnosti</string>
     <string name="login_advanced_warning_mobile_api">V tomto režime nefungujú nasledovné: šťastné číslo, štatistiky triedy, zhrnutie frekvencií, ospravedlnenie neprítomnosti, dokončené lekcie, informácie o škole a prezeranie zoznamu registrovaných zariadení</string>
@@ -72,6 +72,14 @@
     <string name="login_recover">Obnoviť</string>
     <string name="login_signed_in">Žiak je už prihlásený</string>
     <string name="login_host_standard">Štandardná</string>
+    <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>
+    <!--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>
+    <string name="notifications_skip">Preskočiť</string>
+    <string name="notifications_enable">Zapnúť</string>
     <!--Main-->
     <string name="main_account_picker">Manažér účtov</string>
     <string name="main_log_in">Prihlásiť sa</string>
@@ -485,6 +493,8 @@
     </plurals>
     <string name="conferences_present">Prítomnosť na stretnutí</string>
     <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Miesto</string>
+    <string name="conference_topic">Téma</string>
     <!--Director information-->
     <string name="school_announcement_title">Školské oznámenia</string>
     <string name="school_announcement_no_items">Žiadne školské oznámenia</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2d3bf372..99c34065 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_symbol">Неправильний symbol</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>Zarejestruj urządzenie mobilne</b>.\n\nПереконайтесь, що ви встановили відповідний тип щоденника в полі <b>Тип щоденника UONET+</b> на попередньому екрані</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
     <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>
     <string name="login_advanced">Інші варіанти</string>
     <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності та уроків, інформація про школу та список зареєстрованих пристроїв</string>
@@ -72,6 +72,14 @@
     <string name="login_recover">Відновити</string>
     <string name="login_signed_in">Учня вже авторизовано</string>
     <string name="login_host_standard">Стандартний</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
     <!--Main-->
     <string name="main_account_picker">Змінити облікові записи</string>
     <string name="main_log_in">Увійти</string>
@@ -485,6 +493,8 @@
     </plurals>
     <string name="conferences_present">Присутність на зустрічі</string>
     <string name="conference_agenda">Порядок денний</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
     <!--Director information-->
     <string name="school_announcement_title">Оголошення школи</string>
     <string name="school_announcement_no_items">Немає шкільних оголошень</string>

From f4c6e0ad1b3a2149ebe9f822710845b553916b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 1 Jan 2023 21:57:39 +0100
Subject: [PATCH 215/429] Version 1.9.0

---
 app/build.gradle                                  |  8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b13f8da3..ce9039df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 118
-        versionName "1.8.3"
+        versionCode 119
+        versionName "1.9.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -162,7 +162,7 @@ play {
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
     userFraction = 0.10d
-    updatePriority = 5
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:a3b97edd48"
+    implementation "io.github.wulkanowy:sdk:1.9.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 5a47ddc7..9e24f9d9 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,8 +1,10 @@
-Wersja 1.8.3
+Wersja 1.9.0
 
-- naprawiliśmy logowanie dla użytkowników systemu Resman Rzeszów
-- dodaliśmy wsparcie dla nowej platformy z Tomaszowa Mazowieckiego
-- poprawiliśmy dopasowywanie skrzynek pocztowych do uczniów
-- naprawiliśmy literówkę w tytule wiadomości z szablonem usprawiedliwienia
+- dodaliśmy obsługę Androida 13 (w tym ikona aplikacji obsługująca Material You)
+- przerobiliśmy ekran wyboru ucznia przy pierwszym logowaniu
+- naprawiliśmy usuwanie wiadomości w niektórych przypadkach
+- naprawiliśmy błąd występujący przy resecie hasła
+- naprawiliśmy literówkę w tytule domyślnej treści wiadomości usprawiedliwiania
+- naprawiliśmy nazwę aplikacji przy ustawionym w telefonie jezyku francuskim
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 1c9860091aef9901f79a75ba7e88f7912f324927 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Jan 2023 07:45:25 +0000
Subject: [PATCH 216/429] Bump robolectric from 4.9.1 to 4.9.2 (#2093)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ce9039df..3477092a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -264,7 +264,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.9.1'
+    testImplementation 'org.robolectric:robolectric:4.9.2'
     testImplementation "androidx.test:runner:1.5.1"
     testImplementation "androidx.test.ext:junit:1.1.4"
     testImplementation "androidx.test:core:1.5.0"

From 377e0c3a0dd4158fa38a51a44dfcb8a072e02a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 5 Jan 2023 22:42:35 +0100
Subject: [PATCH 217/429] Fix school name text wrap in dashboard and student
 details (#2095)

---
 app/src/main/res/layout/fragment_account_details.xml |  8 ++++++--
 app/src/main/res/layout/item_dashboard_account.xml   | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/fragment_account_details.xml b/app/src/main/res/layout/fragment_account_details.xml
index af9564b5..0c904c07 100644
--- a/app/src/main/res/layout/fragment_account_details.xml
+++ b/app/src/main/res/layout/fragment_account_details.xml
@@ -111,9 +111,11 @@
 
                 <TextView
                     android:id="@+id/accountDetailsName"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="16dp"
+                    android:gravity="center_horizontal"
                     android:textSize="24sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -122,9 +124,11 @@
 
                 <TextView
                     android:id="@+id/accountDetailsSchool"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="5dp"
+                    android:gravity="center_horizontal"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="14sp"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_dashboard_account.xml b/app/src/main/res/layout/item_dashboard_account.xml
index 139157c8..6e5aca54 100644
--- a/app/src/main/res/layout/item_dashboard_account.xml
+++ b/app/src/main/res/layout/item_dashboard_account.xml
@@ -26,27 +26,31 @@
 
         <TextView
             android:id="@+id/dashboard_account_item_name"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
             android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/dashboard_account_item_avatar"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="John Smith" />
 
         <TextView
             android:id="@+id/dashboard_account_item_school_name"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
             android:textColor="?android:textColorSecondary"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/dashboard_account_item_avatar"
             app:layout_constraintTop_toBottomOf="@id/dashboard_account_item_name"
-            tools:text="Szkoła Wulkanowego " />
+            tools:text="Szkoła Wulkanowego" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
@@ -56,4 +60,4 @@
         android:layout_gravity="center"
         android:indeterminate="true"
         android:visibility="gone" />
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>

From 5161fdd543277aecef54ee6b14fdf935c314ec75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 5 Jan 2023 22:47:53 +0100
Subject: [PATCH 218/429] Add missing info to student selection email reports
 (#2096)

---
 app/build.gradle                              |  2 +-
 .../LoginStudentSelectPresenter.kt            | 23 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3477092a..8bf52bc1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.9.0"
+    implementation "io.github.wulkanowy:sdk:1.9.1-SNAPSHOT"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git 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
index f94ea7b7..9148b6ab 100644
--- 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
@@ -280,11 +280,24 @@ class LoginStudentSelectPresenter @Inject constructor(
 
     private fun onEmailClick() {
         view?.openEmail(lastError?.message.ifNullOrBlank {
-            registerUser.symbols.flatMap { symbol ->
-                symbol.schools.map { it.error?.message } + symbol.error?.message
-            }.filterNotNull().distinct().joinToString("; ") {
-                it.take(46) + "..."
-            }.ifEmpty { "blank" }
+            loginData.baseUrl + "/" + loginData.symbol + "\n" + registerUser.symbols.filterNot {
+                it.error is AccountPermissionException && it.symbol != loginData.symbol
+            }.joinToString(";\n") { symbol ->
+                buildString {
+                    append(" -")
+                    append(symbol.symbol)
+                    append("(${symbol.error?.message?.let { it.take(46) + "..." } ?: symbol.schools.size})")
+                    if (symbol.schools.isNotEmpty()) {
+                        append(": ")
+                    }
+                    append(symbol.schools.joinToString(", ") { unit ->
+                        buildString {
+                            append(unit.schoolShortName)
+                            append("(${unit.error?.message?.let { it.take(46) + "..." } ?: unit.students.size})")
+                        }
+                    })
+                }
+            }
         })
     }
 

From 3eb74da9458d6db334317c9f9e8906d0985dcdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 5 Jan 2023 23:01:38 +0100
Subject: [PATCH 219/429] Version 1.9.1

---
 app/build.gradle                                  | 10 +++++-----
 app/src/main/play/release-notes/pl-PL/default.txt |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8bf52bc1..fff19ebe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 119
-        versionName "1.9.0"
+        versionCode 120
+        versionName "1.9.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,8 +161,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.10d
-    updatePriority = 1
+    userFraction = 0.50d
+    updatePriority = 2
     enabled.set(false)
 }
 
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.9.1-SNAPSHOT"
+    implementation "io.github.wulkanowy:sdk:1.9.1"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 9e24f9d9..76c6a0cb 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 1.9.0
+Wersja 1.9.1
 
 - dodaliśmy obsługę Androida 13 (w tym ikona aplikacji obsługująca Material You)
 - przerobiliśmy ekran wyboru ucznia przy pierwszym logowaniu

From 368028c6f4a3a7a3868a5769b546d1297aaf3e9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Jan 2023 14:11:53 +0000
Subject: [PATCH 220/429] Bump kotlin_version from 1.7.21 to 1.8.0 (#2092)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 87e201ac..31252efa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.7.21'
+        kotlin_version = '1.8.0'
         about_libraries = '10.5.2'
         hilt_version = "2.44.2"
     }

From 2293e8c1e6b7f6a75dd230e2491c5045763b31bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 07:17:17 +0000
Subject: [PATCH 221/429] Bump huawei-publish-gradle-plugin from 1.3.4 to 1.3.5
 (#2101)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 31252efa..8d04bf03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         classpath 'com.huawei.agconnect:agcp:1.7.3.302'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
-        classpath "ru.cian:huawei-publish-gradle-plugin:1.3.4"
+        classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"

From 84812fb048814e033d3693304ea7efb460ab97d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 07:17:38 +0000
Subject: [PATCH 222/429] Bump hianalytics from 6.9.0.301 to 6.9.1.200 (#2100)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index fff19ebe..13b36ac7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -250,7 +250,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:21.4.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.9.0.301'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.302'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From 0306e381305663cce7a7e6eac88b986ee2de7278 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 07:17:58 +0000
Subject: [PATCH 223/429] Bump runner from 1.5.1 to 1.5.2 (#2099)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 13b36ac7..61429772 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -265,7 +265,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
     testImplementation 'org.robolectric:robolectric:4.9.2'
-    testImplementation "androidx.test:runner:1.5.1"
+    testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.4"
     testImplementation "androidx.test:core:1.5.0"
     testImplementation "androidx.room:room-testing:$room"

From af8bb53c1769097acd4f9d2052bfffaf9a3a55f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 07:28:02 +0000
Subject: [PATCH 224/429] Bump junit from 1.1.4 to 1.1.5 (#2098)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 61429772..aaa4b6af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -266,7 +266,7 @@ dependencies {
 
     testImplementation 'org.robolectric:robolectric:4.9.2'
     testImplementation "androidx.test:runner:1.5.2"
-    testImplementation "androidx.test.ext:junit:1.1.4"
+    testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"
     testImplementation "androidx.room:room-testing:$room"
     testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"

From e1bffabf1063f1ea67009b5bbe14c3669f50644c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sat, 14 Jan 2023 15:48:58 +0100
Subject: [PATCH 225/429] Fix marking message as read (#2102)

---
 app/build.gradle                                             | 2 +-
 .../github/wulkanowy/data/repositories/MessageRepository.kt  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index aaa4b6af..067a8a47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.9.1"
+    implementation "io.github.wulkanowy:sdk:1.9.2-SNAPSHOT"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index 6dfc3ab7..53d9bead 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -103,7 +103,10 @@ class MessageRepository @Inject constructor(
             messagesDb.loadMessageWithAttachment(message.messageGlobalKey)
         },
         fetch = {
-            sdk.init(student).getMessageDetails(it!!.message.messageGlobalKey, markAsRead)
+            sdk.init(student).getMessageDetails(
+                messageKey = it!!.message.messageGlobalKey,
+                markAsRead = message.unread && markAsRead,
+            )
         },
         saveFetchResult = { old, new ->
             checkNotNull(old) { "Fetched message no longer exist!" }

From 89678c22767f333215d4bd440e70501f645c357b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Jan 2023 15:13:06 +0000
Subject: [PATCH 226/429] Bump agcp from 1.7.3.302 to 1.8.0.300 (#2108)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8d04bf03..2831fa73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'com.huawei.agconnect:agcp:1.7.3.302'
+        classpath 'com.huawei.agconnect:agcp:1.8.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"

From ac4a822930b1a72058407588f7e51b9179829968 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Jan 2023 15:13:34 +0000
Subject: [PATCH 227/429] Bump agconnect-crash from 1.7.3.302 to 1.8.0.300
 (#2104)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 067a8a47..e15341f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -251,7 +251,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:21.4.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.7.3.302'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.8.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From ef9e4b7ad960014484d444c6352a48b0befad014 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Jan 2023 15:14:15 +0000
Subject: [PATCH 228/429] Bump appcompat from 1.5.1 to 1.6.0 (#2107)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e15341f8..5219fed3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,7 +196,7 @@ dependencies {
     implementation "androidx.core:core-ktx:1.9.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.6.1"
-    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "androidx.appcompat:appcompat:1.6.0"
     implementation "androidx.fragment:fragment-ktx:1.5.5"
     implementation "androidx.annotation:annotation:1.5.0"
 

From 95cf521f632160fd81996d3f7f6090c871f402ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Jan 2023 15:21:22 +0000
Subject: [PATCH 229/429] Bump gradle from 7.3.1 to 7.4.0 (#2106)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2831fa73..5abbe57d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.huawei.agconnect:agcp:1.8.0.300'

From 6df3f22c7db756e771e8ea45898f3fcd24323d70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Jan 2023 15:30:53 +0000
Subject: [PATCH 230/429] Bump room from 2.4.3 to 2.5.0 (#2105)

---
 app/build.gradle                                               | 2 +-
 .../main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5219fed3..33e80058 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ huaweiPublish {
 ext {
     work_manager = "2.7.1"
     android_hilt = "1.0.0"
-    room = "2.4.3"
+    room = "2.5.0"
     chucker = "3.5.2"
     mockk = "1.13.3"
     coroutines = "1.6.4"
diff --git 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
index 87b3e0b3..cfa7a72a 100644
--- 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,7 +1,6 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.*
-import androidx.room.OnConflictStrategy.ABORT
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
@@ -11,7 +10,7 @@ import javax.inject.Singleton
 @Dao
 abstract class StudentDao {
 
-    @Insert(onConflict = ABORT)
+    @Insert(onConflict = OnConflictStrategy.ABORT)
     abstract suspend fun insertAll(student: List<Student>): List<Long>
 
     @Delete

From 32d6b4a7a6cc4c83c378aa132d16bcede347418c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 14 Jan 2023 17:06:47 +0100
Subject: [PATCH 231/429] Add menu order settings (#1924)

---
 .../repositories/PreferencesRepository.kt     |  19 +-
 .../wulkanowy/ui/modules/Destination.kt       |  30 ++-
 .../modules/conference/ConferenceFragment.kt  |  10 +-
 .../modules/conference/ConferencePresenter.kt |   7 +
 .../ui/modules/conference/ConferenceView.kt   |   2 +
 .../wulkanowy/ui/modules/exam/ExamFragment.kt |  14 +-
 .../ui/modules/exam/ExamPresenter.kt          |  13 ++
 .../wulkanowy/ui/modules/exam/ExamView.kt     |   2 +
 .../ui/modules/homework/HomeworkFragment.kt   |  10 +-
 .../ui/modules/homework/HomeworkPresenter.kt  |  15 +-
 .../ui/modules/homework/HomeworkView.kt       |   2 +
 .../luckynumber/LuckyNumberFragment.kt        |  10 +-
 .../luckynumber/LuckyNumberPresenter.kt       |   5 +
 .../ui/modules/luckynumber/LuckyNumberView.kt |   2 +
 .../wulkanowy/ui/modules/main/MainActivity.kt |  35 +--
 .../ui/modules/main/MainPresenter.kt          |  17 +-
 .../wulkanowy/ui/modules/main/MainView.kt     |   7 +-
 .../ui/modules/message/MessageFragment.kt     |  20 +-
 .../ui/modules/message/MessagePresenter.kt    |   8 +
 .../ui/modules/message/MessageView.kt         |   4 +
 .../modules/message/tab/MessageTabFragment.kt |   4 +
 .../message/tab/MessageTabPresenter.kt        |   8 +
 .../mobiledevice/MobileDeviceFragment.kt      |  10 +-
 .../mobiledevice/MobileDevicePresenter.kt     |   6 +
 .../modules/mobiledevice/MobileDeviceView.kt  |   2 +
 .../wulkanowy/ui/modules/more/MoreAdapter.kt  |  14 +-
 .../wulkanowy/ui/modules/more/MoreFragment.kt |  88 +-------
 .../wulkanowy/ui/modules/more/MoreItem.kt     |  12 +
 .../ui/modules/more/MorePresenter.kt          |  58 +++--
 .../wulkanowy/ui/modules/more/MoreView.kt     |  44 +---
 .../wulkanowy/ui/modules/note/NoteFragment.kt |  10 +-
 .../ui/modules/note/NotePresenter.kt          |   6 +
 .../wulkanowy/ui/modules/note/NoteView.kt     |   2 +
 .../appearance/menuorder/AppMenuItem.kt       | 206 ++++++++++++++++++
 .../menuorder/MenuItemMoveCallback.kt         |  44 ++++
 .../appearance/menuorder/MenuOrderAdapter.kt  |  58 +++++
 .../MenuOrderDividerItemDecoration.kt         |  50 +++++
 .../appearance/menuorder/MenuOrderFragment.kt | 101 +++++++++
 .../appearance/menuorder/MenuOrderItem.kt     |   6 +
 .../menuorder/MenuOrderPresenter.kt           |  64 ++++++
 .../appearance/menuorder/MenuOrderView.kt     |  16 ++
 .../main/res/drawable/ic_menu_order_drag.xml  |  10 +
 .../main/res/layout/fragment_menu_order.xml   |  12 +
 app/src/main/res/layout/item_menu_order.xml   |  46 ++++
 app/src/main/res/values/preferences_keys.xml  |   1 +
 app/src/main/res/values/strings.xml           |   8 +
 .../res/xml/scheme_preferences_appearance.xml |  14 +-
 .../ui/modules/main/MainPresenterTest.kt      |   2 +-
 48 files changed, 918 insertions(+), 216 deletions(-)
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/AppMenuItem.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuItemMoveCallback.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderAdapter.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderDividerItemDecoration.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderFragment.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderItem.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderPresenter.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderView.kt
 create mode 100644 app/src/main/res/drawable/ic_menu_order_drag.xml
 create mode 100644 app/src/main/res/layout/fragment_menu_order.xml
 create mode 100644 app/src/main/res/layout/item_menu_order.xml

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index afc26286..29a65a96 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -10,6 +10,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.enums.*
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
+import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.decodeFromString
@@ -28,9 +29,6 @@ class PreferencesRepository @Inject constructor(
     private val json: Json,
 ) {
 
-    val startMenuIndex: Int
-        get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
-
     val isShowPresent: Boolean
         get() = getBoolean(
             R.string.pref_key_attendance_present,
@@ -315,6 +313,20 @@ class PreferencesRepository @Inject constructor(
             putBoolean(context.getString(R.string.pref_key_ads_enabled), value)
         }
 
+    var appMenuItemOrder: List<AppMenuItem>
+        get() {
+            val value = sharedPref.getString(PREF_KEY_APP_MENU_ITEM_ORDER, null)
+                ?: return AppMenuItem.defaultAppMenuItemList
+
+            return json.decodeFromString(value)
+        }
+        set(value) = sharedPref.edit {
+            putString(
+                PREF_KEY_APP_MENU_ITEM_ORDER,
+                json.encodeToString(value)
+            )
+        }
+
     var installationId: String
         get() = sharedPref.getString(PREF_KEY_INSTALLATION_ID, null).orEmpty()
         private set(value) = sharedPref.edit { putString(PREF_KEY_INSTALLATION_ID, value) }
@@ -341,6 +353,7 @@ class PreferencesRepository @Inject constructor(
         sharedPref.getBoolean(id, context.resources.getBoolean(default))
 
     private companion object {
+        private const val PREF_KEY_APP_MENU_ITEM_ORDER = "app_menu_item_order"
         private const val PREF_KEY_INSTALLATION_ID = "installation_id"
         private const val PREF_KEY_DASHBOARD_ITEMS_POSITION = "dashboard_items_position"
         private const val PREF_KEY_IN_APP_REVIEW_COUNT = "in_app_review_count"
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
index 561419a0..958be5a7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
@@ -10,10 +10,12 @@ import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
 import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
+import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
+import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import kotlinx.serialization.Serializable
 import java.time.LocalDate
@@ -39,10 +41,12 @@ sealed class Destination {
         NOTE(Note),
         CONFERENCE(Conference),
         SCHOOL_ANNOUNCEMENT(SchoolAnnouncement),
-        SCHOOL(School),
-        LUCKY_NUMBER(More),
+        SCHOOL_AND_TEACHERS(SchoolAndTeachers),
+        LUCKY_NUMBER(LuckyNumber),
         MORE(More),
-        MESSAGE(Message);
+        MESSAGE(Message),
+        MOBILE_DEVICE(MobileDevice),
+        SETTINGS(Settings);
     }
 
     @Serializable
@@ -103,9 +107,9 @@ sealed class Destination {
     }
 
     @Serializable
-    object School : Destination() {
-        override val destinationType get() = Type.SCHOOL
-        override val destinationFragment get() = SchoolFragment.newInstance()
+    object SchoolAndTeachers : Destination() {
+        override val destinationType get() = Type.SCHOOL_AND_TEACHERS
+        override val destinationFragment get() = SchoolAndTeachersFragment.newInstance()
     }
 
     @Serializable
@@ -125,4 +129,16 @@ sealed class Destination {
         override val destinationType get() = Type.MESSAGE
         override val destinationFragment get() = MessageFragment.newInstance()
     }
+
+    @Serializable
+    object MobileDevice : Destination() {
+        override val destinationType get() = Type.MOBILE_DEVICE
+        override val destinationFragment get() = MobileDeviceFragment.newInstance()
+    }
+
+    @Serializable
+    object Settings : Destination() {
+        override val destinationType get() = Type.SETTINGS
+        override val destinationFragment get() = SettingsFragment.newInstance()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt
index b9642b1c..0cd3150c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceFragment.kt
@@ -16,7 +16,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ConferenceFragment : BaseFragment<FragmentConferenceBinding>(R.layout.fragment_conference),
-    ConferenceView, MainView.TitledView {
+    ConferenceView, MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: ConferencePresenter
@@ -109,6 +109,14 @@ class ConferenceFragment : BaseFragment<FragmentConferenceBinding>(R.layout.frag
         (activity as? MainActivity)?.showDialogFragment(ConferenceDialog.newInstance(conference))
     }
 
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onFragmentReselected()
+    }
+
+    override fun resetView() {
+        binding.conferenceRecycler.smoothScrollToPosition(0)
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt
index f5364893..1178c720 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferencePresenter.kt
@@ -96,4 +96,11 @@ class ConferencePresenter @Inject constructor(
             .onResourceError(errorHandler::dispatch)
             .launch()
     }
+
+    fun onFragmentReselected() {
+        Timber.i("Conference is reselected")
+        if (view?.isViewEmpty == false) {
+            view?.resetView()
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceView.kt
index 4f73394d..3299a1f0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceView.kt
@@ -28,4 +28,6 @@ interface ConferenceView : BaseView {
     fun showContent(show: Boolean)
 
     fun openConferenceDialog(conference: Conference)
+
+    fun resetView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index ddd0e4a1..3d42bd00 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -2,9 +2,7 @@ package io.github.wulkanowy.ui.modules.exam
 
 import android.os.Bundle
 import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
+import android.view.View.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -20,7 +18,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
-    MainView.TitledView {
+    MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: ExamPresenter
@@ -126,6 +124,14 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
         (activity as? MainActivity)?.showDialogFragment(ExamDialog.newInstance(exam))
     }
 
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onViewReselected()
+    }
+
+    override fun resetView() {
+        binding.examRecycler.smoothScrollToPosition(0)
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index 99b0bcb8..85814072 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -175,4 +175,17 @@ class ExamPresenter @Inject constructor(
             )
         }
     }
+
+    fun onViewReselected() {
+        Timber.i("Exam view is reselected")
+
+        baseDate = now().nextOrSameSchoolDay
+
+        if (currentDate != baseDate) {
+            reloadView(baseDate)
+            loadData()
+        } else if (view?.isViewEmpty == false) {
+            view?.resetView()
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
index 45b9e788..677fac40 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
@@ -34,4 +34,6 @@ interface ExamView : BaseView {
     fun showPreButton(show: Boolean)
 
     fun showExamDialog(exam: Exam)
+
+    fun resetView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index d4eaade2..9d5130e4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -21,7 +21,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment_homework),
-    HomeworkView, MainView.TitledView {
+    HomeworkView, MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: HomeworkPresenter
@@ -133,6 +133,14 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
         (activity as? MainActivity)?.showDialogFragment(HomeworkAddDialog())
     }
 
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onViewReselected()
+    }
+
+    override fun resetView() {
+        binding.homeworkRecycler.smoothScrollToPosition(0)
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 2ac552b4..6b263e26 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -177,8 +177,21 @@ class HomeworkPresenter @Inject constructor(
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek(
                 "${currentDate.monday.toFormattedString("dd.MM")} - " +
-                        currentDate.sunday.toFormattedString("dd.MM")
+                    currentDate.sunday.toFormattedString("dd.MM")
             )
         }
     }
+
+    fun onViewReselected() {
+        Timber.i("Homework view is reselected")
+
+        baseDate = LocalDate.now().nextOrSameSchoolDay
+
+        if (currentDate != baseDate) {
+            reloadView(baseDate)
+            loadData()
+        } else if (view?.isViewEmpty == false) {
+            view?.resetView()
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
index 7c05ab86..56ba6c89 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
@@ -36,4 +36,6 @@ interface HomeworkView : BaseView {
     fun showHomeworkDialog(homework: Homework)
 
     fun showAddHomeworkDialog()
+
+    fun resetView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
index 0a73fe15..a6c75c1d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -18,7 +18,7 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class LuckyNumberFragment :
     BaseFragment<FragmentLuckyNumberBinding>(R.layout.fragment_lucky_number), LuckyNumberView,
-    MainView.TitledView {
+    MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: LuckyNumberPresenter
@@ -86,6 +86,14 @@ class LuckyNumberFragment :
         (activity as? MainActivity)?.pushView(LuckyNumberHistoryFragment.newInstance())
     }
 
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onViewReselected()
+    }
+
+    override fun popView() {
+        (activity as? MainActivity)?.popView()
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
index 6f5c8e74..2039624b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -99,4 +99,9 @@ class LuckyNumberPresenter @Inject constructor(
     fun onDetailsClick() {
         view?.showErrorDetailsDialog(lastError)
     }
+
+    fun onViewReselected() {
+        Timber.i("Luckynumber view is reselected")
+        view?.popView()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
index 0c05a156..3d34ebc8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberView.kt
@@ -26,4 +26,6 @@ interface LuckyNumberView : BaseView {
     fun showContent(show: Boolean)
 
     fun openLuckyNumberHistory()
+
+    fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index d332ee35..51092376 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -27,6 +27,7 @@ import io.github.wulkanowy.databinding.DialogAdsConsentBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.account.accountquick.AccountQuickDialog
+import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
 import io.github.wulkanowy.utils.*
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -124,13 +125,20 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         return true
     }
 
-    override fun initView(startMenuIndex: Int, rootDestinations: List<Destination>) {
+    override fun initView(
+        startMenuIndex: Int,
+        rootAppMenuItems: List<AppMenuItem>,
+        rootUpdatedDestinations: List<Destination>
+    ) {
         initializeToolbar()
-        initializeBottomNavigation(startMenuIndex)
-        initializeNavController(startMenuIndex, rootDestinations)
+        initializeBottomNavigation(startMenuIndex, rootAppMenuItems)
+        initializeNavController(startMenuIndex, rootUpdatedDestinations)
     }
 
-    private fun initializeNavController(startMenuIndex: Int, rootDestinations: List<Destination>) {
+    private fun initializeNavController(
+        startMenuIndex: Int,
+        rootUpdatedDestinations: List<Destination>
+    ) {
         with(navController) {
             setOnViewChangeListener { destinationView ->
                 presenter.onViewChange(destinationView)
@@ -140,7 +148,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
                 )
             }
             fragmentHideStrategy = HIDE
-            rootFragments = rootDestinations.map { it.destinationFragment }
+            rootFragments = rootUpdatedDestinations.map { it.destinationFragment }
 
             initialize(startMenuIndex, savedInstanceState)
         }
@@ -156,17 +164,16 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         }
     }
 
-    private fun initializeBottomNavigation(startMenuIndex: Int) {
+    private fun initializeBottomNavigation(
+        startMenuIndex: Int,
+        rootAppMenuItems: List<AppMenuItem>
+    ) {
         with(binding.mainBottomNav) {
             with(menu) {
-                add(Menu.NONE, 0, Menu.NONE, R.string.dashboard_title)
-                    .setIcon(R.drawable.ic_main_dashboard)
-                add(Menu.NONE, 1, Menu.NONE, R.string.grade_title)
-                    .setIcon(R.drawable.ic_main_grade)
-                add(Menu.NONE, 2, Menu.NONE, R.string.attendance_title)
-                    .setIcon(R.drawable.ic_main_attendance)
-                add(Menu.NONE, 3, Menu.NONE, R.string.timetable_title)
-                    .setIcon(R.drawable.ic_main_timetable)
+                rootAppMenuItems.forEachIndexed { index, item ->
+                    add(Menu.NONE, index, Menu.NONE, item.title)
+                        .setIcon(item.icon)
+                }
                 add(Menu.NONE, 4, Menu.NONE, R.string.more_title)
                     .setIcon(R.drawable.ic_main_more)
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 458e966d..d51cdac6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -42,17 +42,16 @@ class MainPresenter @Inject constructor(
 
     private var studentsWitSemesters: List<StudentWithSemesters>? = null
 
-    private val rootDestinationTypeList = listOf(
-        Destination.Type.DASHBOARD,
-        Destination.Type.GRADE,
-        Destination.Type.ATTENDANCE,
-        Destination.Type.TIMETABLE,
-        Destination.Type.MORE
-    )
+    private val rootAppMenuItems = preferencesRepository.appMenuItemOrder
+        .sortedBy { it.order }
+        .take(4)
+
+    private val rootDestinationTypeList = rootAppMenuItems.map { it.destinationType }
+        .plus(Destination.Type.MORE)
 
     private val Destination?.startMenuIndex
         get() = when {
-            this == null -> preferencesRepository.startMenuIndex
+            this == null -> 0
             destinationType in rootDestinationTypeList -> {
                 rootDestinationTypeList.indexOf(destinationType)
             }
@@ -69,7 +68,7 @@ class MainPresenter @Inject constructor(
             if (it == initDestination?.destinationType) initDestination else it.defaultDestination
         }
 
-        view.initView(startMenuIndex, destinations)
+        view.initView(startMenuIndex, rootAppMenuItems, destinations)
         if (initDestination != null && startMenuIndex == 4) {
             view.openMoreDestination(initDestination)
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 3d018e3d..03f9641d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -4,6 +4,7 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.Destination
+import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
 
 interface MainView : BaseView {
 
@@ -15,7 +16,11 @@ interface MainView : BaseView {
 
     val currentStackSize: Int?
 
-    fun initView(startMenuIndex: Int, rootDestinations: List<Destination>)
+    fun initView(
+        startMenuIndex: Int,
+        rootAppMenuItems: List<AppMenuItem>,
+        rootUpdatedDestinations: List<Destination>
+    )
 
     fun switchMenuView(position: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 4607793c..4317fb7f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -15,6 +15,7 @@ import io.github.wulkanowy.data.enums.MessageFolder.*
 import io.github.wulkanowy.databinding.FragmentMessageBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
+import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
@@ -24,7 +25,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_message),
-    MessageView, MainView.TitledView {
+    MessageView, MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: MessagePresenter
@@ -123,8 +124,12 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
         presenter.onChildViewShowNewMessage(show)
     }
 
-    fun onFragmentChanged() {
-        presenter.onFragmentChanged()
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onFragmentReselected()
+    }
+
+    override fun onFragmentChanged() {
+        if (::presenter.isInitialized) presenter.onFragmentChanged()
     }
 
     override fun notifyChildLoadData(index: Int, forceRefresh: Boolean) {
@@ -139,10 +144,19 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
         }
     }
 
+    override fun notifyChildParentReselected(index: Int) {
+        (pagerAdapter.getFragmentInstance(index) as? MessageTabFragment)
+            ?.onParentReselected()
+    }
+
     override fun openSendMessage() {
         context?.let { it.startActivity(SendMessageActivity.getStartIntent(it)) }
     }
 
+    override fun popView() {
+        (activity as? MainActivity)?.popView()
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index 68bdc4b7..cf6bad19 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -39,6 +39,14 @@ class MessagePresenter @Inject constructor(
         view?.notifyChildrenFinishActionMode()
     }
 
+    fun onFragmentReselected() {
+        Timber.i("Message view is reselected")
+        view?.run {
+            popView()
+            notifyChildParentReselected(currentPageIndex)
+        }
+    }
+
     fun onChildViewLoaded() {
         view?.apply {
             showContent(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
index e0cc5098..def4a275 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
@@ -20,5 +20,9 @@ interface MessageView : BaseView {
 
     fun notifyChildrenFinishActionMode()
 
+    fun notifyChildParentReselected(index: Int)
+
     fun openSendMessage()
+
+    fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index c78ccc6e..592cbd60 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -235,6 +235,10 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         presenter.onParentFinishActionMode()
     }
 
+    fun onParentReselected() {
+        presenter.onParentReselected()
+    }
+
     private fun onChipChecked(chip: CompoundButton, isChecked: Boolean) {
         when (chip.id) {
             R.id.chip_unread -> presenter.onUnreadFilterSelected(isChecked)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index ea142db2..ec92e9c2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -83,6 +83,14 @@ class MessageTabPresenter @Inject constructor(
         view?.showActionMode(false)
     }
 
+    fun onParentReselected() {
+        view?.run {
+            if (!isViewEmpty) {
+                resetListPosition()
+            }
+        }
+    }
+
     fun onDestroyActionMode() {
         isActionMode = false
         messagesToDelete.clear()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
index f8e367c5..1afe773c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
@@ -22,7 +22,7 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class MobileDeviceFragment :
     BaseFragment<FragmentMobileDeviceBinding>(R.layout.fragment_mobile_device), MobileDeviceView,
-    MainView.TitledView {
+    MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: MobileDevicePresenter
@@ -135,6 +135,14 @@ class MobileDeviceFragment :
         (activity as? MainActivity)?.showDialogFragment(MobileDeviceTokenDialog.newInstance())
     }
 
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onFragmentReselected()
+    }
+
+    override fun resetView() {
+        binding.mobileDevicesRecycler.smoothScrollToPosition(0)
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
index 36a720e5..56785dbf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
@@ -129,4 +129,10 @@ class MobileDevicePresenter @Inject constructor(
             .onResourceError(errorHandler::dispatch)
             .launch("unregister")
     }
+
+    fun onFragmentReselected() {
+        if (view?.isViewEmpty == false) {
+            view?.resetView()
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
index b94646a7..973cb123 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
@@ -32,4 +32,6 @@ interface MobileDeviceView : BaseView {
     fun setErrorDetails(message: String)
 
     fun showTokenDialog()
+
+    fun resetView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
index 70587b0c..697eab33 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.more
 
-import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
@@ -9,9 +8,9 @@ import javax.inject.Inject
 
 class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemViewHolder>() {
 
-    var items = emptyList<Pair<String, Drawable?>>()
+    var items = emptyList<MoreItem>()
 
-    var onClickListener: (name: String) -> Unit = {}
+    var onClickListener: (moreItem: MoreItem) -> Unit = {}
 
     override fun getItemCount() = items.size
 
@@ -20,13 +19,14 @@ class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemV
     )
 
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val (title, drawable) = items[position]
+        val item = items[position]
+        val context = holder.binding.root.context
 
         with(holder.binding) {
-            moreItemTitle.text = title
-            moreItemImage.setImageDrawable(drawable)
+            moreItemTitle.text = context.getString(item.title)
+            moreItemImage.setImageResource(item.icon)
 
-            root.setOnClickListener { onClickListener(title) }
+            root.setOnClickListener { onClickListener(item) }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index df55abc9..40831806 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.more
 
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -8,19 +7,10 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentMoreBinding
 import io.github.wulkanowy.ui.base.BaseFragment
-import io.github.wulkanowy.ui.modules.conference.ConferenceFragment
-import io.github.wulkanowy.ui.modules.exam.ExamFragment
-import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
-import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.message.MessageFragment
-import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
-import io.github.wulkanowy.ui.modules.note.NoteFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
-import io.github.wulkanowy.ui.modules.settings.SettingsFragment
-import io.github.wulkanowy.utils.getCompatDrawable
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -40,36 +30,6 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     override val titleStringId: Int
         get() = R.string.more_title
 
-    override val messagesRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.message_title) to getCompatDrawable(R.drawable.ic_more_messages) }
-
-    override val homeworkRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.homework_title) to getCompatDrawable(R.drawable.ic_more_homework) }
-
-    override val noteRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.note_title) to getCompatDrawable(R.drawable.ic_more_note) }
-
-    override val conferencesRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.conferences_title) to getCompatDrawable(R.drawable.ic_more_conferences) }
-
-    override val schoolAnnouncementRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.school_announcement_title) to getCompatDrawable(R.drawable.ic_all_about) }
-
-    override val schoolAndTeachersRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.schoolandteachers_title) to getCompatDrawable((R.drawable.ic_more_schoolandteachers)) }
-
-    override val mobileDevicesRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.mobile_devices_title) to getCompatDrawable(R.drawable.ic_more_mobile_devices) }
-
-    override val settingsRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) }
-
-    override val examRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.exam_title) to getCompatDrawable(R.drawable.ic_main_exam) }
-
-    override val luckyNumberRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.lucky_number_title) to getCompatDrawable(R.drawable.ic_more_lucky_number) }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMoreBinding.bind(view)
@@ -94,57 +54,21 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
             ?.onFragmentChanged()
     }
 
-    override fun updateData(data: List<Pair<String, Drawable?>>) {
+    override fun updateData(data: List<MoreItem>) {
         with(moreAdapter) {
             items = data
             notifyDataSetChanged()
         }
     }
 
-    override fun openMessagesView() {
-        (activity as? MainActivity)?.pushView(MessageFragment.newInstance())
-    }
-
-    override fun openHomeworkView() {
-        (activity as? MainActivity)?.pushView(HomeworkFragment.newInstance())
-    }
-
-    override fun openNoteView() {
-        (activity as? MainActivity)?.pushView(NoteFragment.newInstance())
-    }
-
-    override fun openSchoolAnnouncementView() {
-        (activity as? MainActivity)?.pushView(SchoolAnnouncementFragment.newInstance())
-    }
-
-    override fun openConferencesView() {
-        (activity as? MainActivity)?.pushView(ConferenceFragment.newInstance())
-    }
-
-    override fun openSchoolAndTeachersView() {
-        (activity as? MainActivity)?.pushView(SchoolAndTeachersFragment.newInstance())
-    }
-
-    override fun openMobileDevicesView() {
-        (activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
-    }
-
-    override fun openSettingsView() {
-        (activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
-    }
-
-    override fun openExamView() {
-        (activity as? MainActivity)?.pushView(ExamFragment.newInstance())
-    }
-
-    override fun openLuckyNumberView() {
-        (activity as? MainActivity)?.pushView(LuckyNumberFragment.newInstance())
-    }
-
     override fun popView(depth: Int) {
         (activity as? MainActivity)?.popView(depth)
     }
 
+    override fun openView(destination: Destination) {
+        (activity as? MainActivity)?.pushView(destination.destinationFragment)
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
new file mode 100644
index 00000000..d544f041
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.more
+
+import io.github.wulkanowy.ui.modules.Destination
+
+data class MoreItem(
+
+    val icon: Int,
+
+    val title: Int,
+
+    val destination: Destination
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index 92551d6e..0ebaf4c7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -1,16 +1,24 @@
 package io.github.wulkanowy.ui.modules.more
 
+import io.github.wulkanowy.R
+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.ui.modules.Destination
 import timber.log.Timber
 import javax.inject.Inject
 
 class MorePresenter @Inject constructor(
     errorHandler: ErrorHandler,
-    studentRepository: StudentRepository
+    studentRepository: StudentRepository,
+    preferencesRepository: PreferencesRepository
 ) : BasePresenter<MoreView>(errorHandler, studentRepository) {
 
+    private val moreAppMenuItem = preferencesRepository.appMenuItemOrder
+        .sortedBy { it.order }
+        .drop(4)
+
     override fun onAttachView(view: MoreView) {
         super.onAttachView(view)
         view.initView()
@@ -18,22 +26,10 @@ class MorePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(title: String) {
-        Timber.i("Select more item \"${title}\"")
-        view?.run {
-            when (title) {
-                messagesRes?.first -> openMessagesView()
-                examRes?.first -> openExamView()
-                homeworkRes?.first -> openHomeworkView()
-                noteRes?.first -> openNoteView()
-                conferencesRes?.first -> openConferencesView()
-                schoolAnnouncementRes?.first -> openSchoolAnnouncementView()
-                schoolAndTeachersRes?.first -> openSchoolAndTeachersView()
-                mobileDevicesRes?.first -> openMobileDevicesView()
-                settingsRes?.first -> openSettingsView()
-                luckyNumberRes?.first -> openLuckyNumberView()
-            }
-        }
+    fun onItemSelected(moreItem: MoreItem) {
+        Timber.i("Select more item \"${moreItem.destination.destinationType}\"")
+
+        view?.openView(moreItem.destination)
     }
 
     fun onViewReselected() {
@@ -43,19 +39,21 @@ class MorePresenter @Inject constructor(
 
     private fun loadData() {
         Timber.i("Load items for more view")
-        view?.run {
-            updateData(listOfNotNull(
-                messagesRes,
-                examRes,
-                homeworkRes,
-                noteRes,
-                luckyNumberRes,
-                conferencesRes,
-                schoolAnnouncementRes,
-                schoolAndTeachersRes,
-                mobileDevicesRes,
-                settingsRes
-            ))
+        val moreItems = moreAppMenuItem.map {
+            MoreItem(
+                icon = it.icon,
+                title = it.title,
+                destination = it.destinationType.defaultDestination
+            )
         }
+            .plus(
+                MoreItem(
+                    icon = R.drawable.ic_more_settings,
+                    title = R.string.settings_title,
+                    destination = Destination.Settings
+                )
+            )
+
+        view?.updateData(moreItems)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index cb895de2..fbca97ed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -1,53 +1,15 @@
 package io.github.wulkanowy.ui.modules.more
 
-import android.graphics.drawable.Drawable
 import io.github.wulkanowy.ui.base.BaseView
+import io.github.wulkanowy.ui.modules.Destination
 
 interface MoreView : BaseView {
 
-    val messagesRes: Pair<String, Drawable?>?
-
-    val homeworkRes: Pair<String, Drawable?>?
-
-    val noteRes: Pair<String, Drawable?>?
-
-    val conferencesRes: Pair<String, Drawable?>?
-
-    val schoolAnnouncementRes: Pair<String, Drawable?>?
-
-    val schoolAndTeachersRes: Pair<String, Drawable?>?
-
-    val mobileDevicesRes: Pair<String, Drawable?>?
-
-    val settingsRes: Pair<String, Drawable?>?
-
-    val examRes: Pair<String, Drawable?>?
-
-    val luckyNumberRes: Pair<String, Drawable?>?
-
     fun initView()
 
-    fun updateData(data: List<Pair<String, Drawable?>>)
-
-    fun openSettingsView()
+    fun updateData(data: List<MoreItem>)
 
     fun popView(depth: Int)
 
-    fun openMessagesView()
-
-    fun openHomeworkView()
-
-    fun openNoteView()
-
-    fun openSchoolAnnouncementView()
-
-    fun openConferencesView()
-
-    fun openSchoolAndTeachersView()
-
-    fun openMobileDevicesView()
-
-    fun openExamView()
-
-    fun openLuckyNumberView()
+    fun openView(destination: Destination)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
index dd622344..cb54b384 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
@@ -18,7 +18,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note), NoteView,
-    MainView.TitledView {
+    MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: NotePresenter
@@ -112,6 +112,14 @@ class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note),
         binding.noteSwipe.isRefreshing = show
     }
 
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onFragmentReselected()
+    }
+
+    override fun resetView() {
+        binding.noteRecycler.smoothScrollToPosition(0)
+    }
+
     override fun onDestroyView() {
         presenter.onDetachView()
         super.onDestroyView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index 440565e1..62ad347f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
@@ -121,4 +121,10 @@ class NotePresenter @Inject constructor(
             }
             .launch("update_note")
     }
+
+    fun onFragmentReselected() {
+        if (view?.isViewEmpty == false) {
+            view?.resetView()
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
index 9fc0be94..b813b315 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
@@ -30,4 +30,6 @@ interface NoteView : BaseView {
     fun showRefresh(show: Boolean)
 
     fun showNoteDialog(note: Note)
+
+    fun resetView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/AppMenuItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/AppMenuItem.kt
new file mode 100644
index 00000000..f522913a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/AppMenuItem.kt
@@ -0,0 +1,206 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.modules.Destination
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+
+@Serializable
+sealed class AppMenuItem {
+
+    companion object {
+        val defaultAppMenuItemList = setOf(
+            DashboardAppMenuItem(),
+            GradeAppMenuItem(),
+            TimetableAppMenuItem(),
+            AttendanceAppMenuItem(),
+            ExamsAppMenuItem(),
+            HomeworkAppMenuItem(),
+            NoteAppMenuItem(),
+            LuckyNumberAppMenuItem(),
+            SchoolAnnouncementsAppMenuItem(),
+            SchoolAndTeachersAppMenuItem(),
+            MobileDevicesAppMenuItem(),
+            ConferenceAppMenuItem(),
+            MessageAppMenuItem()
+        ).sortedBy { it.order }
+    }
+
+    // https://youtrack.jetbrains.com/issue/KT-38958
+    abstract var order: Int
+
+    abstract val icon: Int
+
+    abstract val title: Int
+
+    abstract val destinationType: Destination.Type
+
+    @Serializable
+    data class DashboardAppMenuItem(override var order: Int = 0) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_main_dashboard
+
+        @Transient
+        override val title = R.string.dashboard_title
+
+        @Transient
+        override val destinationType = Destination.Type.DASHBOARD
+    }
+
+    @Serializable
+    data class GradeAppMenuItem(override var order: Int = 1) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_main_grade
+
+        @Transient
+        override val title = R.string.grade_title
+
+        @Transient
+        override val destinationType = Destination.Type.GRADE
+    }
+
+    @Serializable
+    data class AttendanceAppMenuItem(override var order: Int = 2) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_main_attendance
+
+        @Transient
+        override val title = R.string.attendance_title
+
+        @Transient
+        override val destinationType = Destination.Type.ATTENDANCE
+    }
+
+    @Serializable
+    data class TimetableAppMenuItem(override var order: Int = 3) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_main_timetable
+
+        @Transient
+        override val title = R.string.timetable_title
+
+        @Transient
+        override val destinationType = Destination.Type.TIMETABLE
+    }
+
+    @Serializable
+    data class MessageAppMenuItem(override var order: Int = 4) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_more_messages
+
+        @Transient
+        override val title = R.string.message_title
+
+        @Transient
+        override val destinationType = Destination.Type.MESSAGE
+    }
+
+    @Serializable
+    data class ExamsAppMenuItem(override var order: Int = 5) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_main_exam
+
+        @Transient
+        override val title = R.string.exam_title
+
+        @Transient
+        override val destinationType = Destination.Type.EXAM
+    }
+
+    @Serializable
+    data class HomeworkAppMenuItem(override var order: Int = 6) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_more_homework
+
+        @Transient
+        override val title = R.string.homework_title
+
+        @Transient
+        override val destinationType = Destination.Type.HOMEWORK
+    }
+
+    @Serializable
+    data class NoteAppMenuItem(override var order: Int = 7) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_more_note
+
+        @Transient
+        override val title = R.string.note_title
+
+        @Transient
+        override val destinationType = Destination.Type.NOTE
+    }
+
+    @Serializable
+    data class LuckyNumberAppMenuItem(override var order: Int = 8) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_more_lucky_number
+
+        @Transient
+        override val title = R.string.lucky_number_title
+
+        @Transient
+        override val destinationType = Destination.Type.LUCKY_NUMBER
+    }
+
+    @Serializable
+    data class ConferenceAppMenuItem(override var order: Int = 9) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_more_conferences
+
+        @Transient
+        override val title = R.string.conferences_title
+
+        @Transient
+        override val destinationType = Destination.Type.CONFERENCE
+    }
+
+    @Serializable
+    data class SchoolAnnouncementsAppMenuItem(override var order: Int = 10) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_all_about
+
+        @Transient
+        override val title = R.string.school_announcement_title
+
+        @Transient
+        override val destinationType = Destination.Type.SCHOOL_ANNOUNCEMENT
+    }
+
+    @Serializable
+    data class SchoolAndTeachersAppMenuItem(override var order: Int = 11) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_more_schoolandteachers
+
+        @Transient
+        override val title = R.string.schoolandteachers_title
+
+        @Transient
+        override val destinationType = Destination.Type.SCHOOL_AND_TEACHERS
+    }
+
+    @Serializable
+    data class MobileDevicesAppMenuItem(override var order: Int = 12) : AppMenuItem() {
+
+        @Transient
+        override val icon = R.drawable.ic_more_mobile_devices
+
+        @Transient
+        override val title = R.string.mobile_devices_title
+
+        @Transient
+        override val destinationType = Destination.Type.MOBILE_DEVICE
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuItemMoveCallback.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuItemMoveCallback.kt
new file mode 100644
index 00000000..49196fad
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuItemMoveCallback.kt
@@ -0,0 +1,44 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import java.util.*
+
+class MenuItemMoveCallback(
+    private val menuOrderAdapter: MenuOrderAdapter,
+    private var onUserInteractionEndListener: (List<MenuOrderItem>) -> Unit = {}
+) : ItemTouchHelper.Callback() {
+
+    override fun isLongPressDragEnabled() = true
+
+    override fun isItemViewSwipeEnabled() = false
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        //Not implemented
+    }
+
+    override fun getMovementFlags(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder
+    ) = makeMovementFlags(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0)
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        val list = menuOrderAdapter.items.toMutableList()
+
+        Collections.swap(list, viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
+
+        menuOrderAdapter.submitList(list)
+        return true
+    }
+
+    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        super.clearView(recyclerView, viewHolder)
+
+        onUserInteractionEndListener(menuOrderAdapter.items.toList())
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderAdapter.kt
new file mode 100644
index 00000000..6bdd2fe0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderAdapter.kt
@@ -0,0 +1,58 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.databinding.ItemMenuOrderBinding
+import javax.inject.Inject
+
+class MenuOrderAdapter @Inject constructor() :
+    RecyclerView.Adapter<MenuOrderAdapter.ViewHolder>() {
+
+    val items = mutableListOf<MenuOrderItem>()
+
+    fun submitList(newItems: List<MenuOrderItem>) {
+        val diffResult = DiffUtil.calculateDiff(DiffCallback(newItems, items.toMutableList()))
+
+        with(items) {
+            clear()
+            addAll(newItems)
+        }
+
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        ItemMenuOrderBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position].appMenuItem
+
+        with(holder.binding) {
+            menuOrderItemTitle.setText(item.title)
+            menuOrderItemIcon.setImageResource(item.icon)
+        }
+    }
+
+    class ViewHolder(val binding: ItemMenuOrderBinding) : RecyclerView.ViewHolder(binding.root)
+
+    private class DiffCallback(
+        private val oldList: List<MenuOrderItem>,
+        private val newList: List<MenuOrderItem>
+    ) : DiffUtil.Callback() {
+
+        override fun getNewListSize() = newList.size
+
+        override fun getOldListSize() = oldList.size
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            oldList[oldItemPosition] == newList[newItemPosition]
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            oldList[oldItemPosition].appMenuItem.destinationType == newList[newItemPosition].appMenuItem.destinationType
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderDividerItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderDividerItemDecoration.kt
new file mode 100644
index 00000000..21a7f5e8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderDividerItemDecoration.kt
@@ -0,0 +1,50 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.ShapeDrawable
+import android.view.View
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.core.view.forEach
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.getThemeAttrColor
+
+class MenuOrderDividerItemDecoration(private val context: Context) :
+    DividerItemDecoration(context, VERTICAL) {
+
+    private val dividerDrawable = ShapeDrawable()
+        .apply {
+            DrawableCompat.setTint(this, context.getThemeAttrColor(R.attr.colorDivider))
+        }
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        canvas.save()
+        val dividerLeft = parent.paddingLeft
+        val dividerRight = parent.width - parent.paddingRight
+
+        parent.forEach {
+            if (parent.getChildAdapterPosition(it) == 3) {
+                val params = it.layoutParams as RecyclerView.LayoutParams
+                val dividerTop = it.bottom + params.bottomMargin
+                val dividerBottom = dividerTop + dividerDrawable.intrinsicHeight
+
+                dividerDrawable.setBounds(dividerLeft, dividerTop, dividerRight, dividerBottom + 30)
+                dividerDrawable.draw(canvas)
+            }
+        }
+
+        canvas.restore()
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect, view: View, parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        if (parent.getChildAdapterPosition(view) == 3) {
+            outRect.bottom = dividerDrawable.intrinsicHeight + 30
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderFragment.kt
new file mode 100644
index 00000000..e08fc5dd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderFragment.kt
@@ -0,0 +1,101 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.activity.addCallback
+import androidx.core.view.MenuProvider
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.SimpleItemAnimator
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentMenuOrderBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import javax.inject.Inject
+
+
+@AndroidEntryPoint
+class MenuOrderFragment : BaseFragment<FragmentMenuOrderBinding>(R.layout.fragment_menu_order),
+    MenuOrderView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: MenuOrderPresenter
+
+    @Inject
+    lateinit var menuOrderAdapter: MenuOrderAdapter
+
+    override val titleStringId = R.string.menu_order_title
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMenuOrderBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        val itemTouchHelper = ItemTouchHelper(
+            MenuItemMoveCallback(menuOrderAdapter, presenter::onDragAndDropEnd)
+        )
+
+        itemTouchHelper.attachToRecyclerView(binding.menuOrderRecycler)
+
+        with(binding.menuOrderRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = menuOrderAdapter
+            addItemDecoration(MenuOrderDividerItemDecoration(context))
+            addItemDecoration(DividerItemDecoration(context))
+            (itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
+        }
+
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
+            presenter.onBackSelected()
+        }
+
+        initializeToolbar()
+    }
+
+    private fun initializeToolbar() {
+        requireActivity().addMenuProvider(object : MenuProvider {
+            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+            }
+
+            override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+                if (menuItem.itemId == android.R.id.home) {
+                    presenter.onBackSelected()
+                    return true
+                }
+                return false
+            }
+
+        }, viewLifecycleOwner)
+    }
+
+    override fun updateData(data: List<MenuOrderItem>) {
+        menuOrderAdapter.submitList(data)
+    }
+
+    override fun restartApp() {
+        startActivity(MainActivity.getStartIntent(requireContext()))
+        requireActivity().finishAffinity()
+    }
+
+    override fun popView() {
+        (activity as? MainActivity?)?.popView()
+    }
+
+    override fun showRestartConfirmationDialog() {
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.menu_order_confirm_title)
+            .setMessage(R.string.menu_order_confirm_content)
+            .setPositiveButton(R.string.menu_order_confirm_restart) { _, _ -> presenter.onConfirmRestart() }
+            .setNegativeButton(R.string.all_cancel) { _, _ -> presenter.onCancelRestart() }
+            .show()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderItem.kt
new file mode 100644
index 00000000..b82bc1bd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderItem.kt
@@ -0,0 +1,6 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+data class MenuOrderItem(
+    val appMenuItem: AppMenuItem,
+    val order: Int
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderPresenter.kt
new file mode 100644
index 00000000..1c90cc5e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderPresenter.kt
@@ -0,0 +1,64 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+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 timber.log.Timber
+import javax.inject.Inject
+
+class MenuOrderPresenter @Inject constructor(
+    studentRepository: StudentRepository,
+    errorHandler: ErrorHandler,
+    private val preferencesRepository: PreferencesRepository
+) : BasePresenter<MenuOrderView>(errorHandler, studentRepository) {
+
+    private var updatedMenuOrderItems = emptyList<MenuOrderItem>()
+
+    override fun onAttachView(view: MenuOrderView) {
+        super.onAttachView(view)
+        view.initView()
+        Timber.i("Menu order view was initialized")
+        loadData()
+    }
+
+    private fun loadData() {
+        val savedMenuItemList = (preferencesRepository.appMenuItemOrder)
+            .sortedBy { it.order }
+            .map { MenuOrderItem(it, it.order) }
+
+        view?.updateData(savedMenuItemList)
+    }
+
+    fun onDragAndDropEnd(list: List<MenuOrderItem>) {
+        val updatedList = list.mapIndexed { index, menuOrderItem ->
+            menuOrderItem.copy(order = index)
+        }
+
+        updatedMenuOrderItems = updatedList
+        view?.updateData(updatedList)
+    }
+
+    fun onBackSelected() {
+        if (updatedMenuOrderItems.isNotEmpty()) {
+            view?.showRestartConfirmationDialog()
+        } else {
+            view?.popView()
+        }
+    }
+
+    fun onConfirmRestart() {
+        updatedMenuOrderItems.forEach {
+            it.appMenuItem.apply {
+                order = it.order
+            }
+        }
+
+        preferencesRepository.appMenuItemOrder = updatedMenuOrderItems.map { it.appMenuItem }
+        view?.restartApp()
+    }
+
+    fun onCancelRestart() {
+        view?.popView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderView.kt
new file mode 100644
index 00000000..264e68cc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/menuorder/MenuOrderView.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.ui.modules.settings.appearance.menuorder
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface MenuOrderView : BaseView {
+
+    fun initView()
+
+    fun updateData(data: List<MenuOrderItem>)
+
+    fun restartApp()
+
+    fun showRestartConfirmationDialog()
+
+    fun popView()
+}
diff --git a/app/src/main/res/drawable/ic_menu_order_drag.xml b/app/src/main/res/drawable/ic_menu_order_drag.xml
new file mode 100644
index 00000000..623c67d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_order_drag.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_menu_order.xml b/app/src/main/res/layout/fragment_menu_order.xml
new file mode 100644
index 00000000..1773b45a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_menu_order.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/menu_order_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_menu_order" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_menu_order.xml b/app/src/main/res/layout/item_menu_order.xml
new file mode 100644
index 00000000..84510d1e
--- /dev/null
+++ b/app/src/main/res/layout/item_menu_order.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorSurface"
+    android:minHeight="56dp">
+
+    <ImageView
+        android:id="@+id/menu_order_item_icon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorOnSurface"
+        tools:ignore="ContentDescription"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/menu_order_item_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/menu_order_item_drag_icon"
+        app:layout_constraintStart_toEndOf="@id/menu_order_item_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem" />
+
+    <ImageView
+        android:id="@+id/menu_order_item_drag_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/ic_menu_order_drag"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorOnSurface"
+        tools:ignore="ContentDescription" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 80a71bc7..739c1877 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -40,4 +40,5 @@
     <string name="pref_key_ads_privacy_policy">ads_privacy_policy</string>
     <string name="pref_key_ads_consent_data_processing">ads_consent_data_processing</string>
     <string name="pref_key_ads_over_eighteen">ads_over_eighteen</string>
+    <string name="pref_key_menu_order">appearance_menu_order</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38997054..d8fbe9b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Student info</string>
     <string name="dashboard_title">Dashboard</string>
     <string name="notifications_center_title">Notifications center</string>
+    <string name="menu_order_title">Menu configuartion</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -595,6 +596,7 @@
     <string name="all_undo">Undo</string>
     <string name="all_change">Change</string>
     <string name="all_add_to_calendar">Add to calendar</string>
+    <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
     <string name="widget_timetable_theme_title">Choose theme</string>
@@ -616,6 +618,8 @@
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
     <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
     <string name="pref_view_app_language">Language</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_header_other">Other</string>
     <string name="pref_notify_switch">Show notifications</string>
@@ -717,6 +721,10 @@
     <string name="update_download_success">An update has just been downloaded.</string>
     <string name="update_download_success_button">Restart</string>
     <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
diff --git a/app/src/main/res/xml/scheme_preferences_appearance.xml b/app/src/main/res/xml/scheme_preferences_appearance.xml
index b2da0287..62216c76 100644
--- a/app/src/main/res/xml/scheme_preferences_appearance.xml
+++ b/app/src/main/res/xml/scheme_preferences_appearance.xml
@@ -20,23 +20,21 @@
             app:key="@string/pref_key_app_theme"
             app:title="@string/pref_view_app_theme"
             app:useSimpleSummaryProvider="true" />
-        <ListPreference
-            app:defaultValue="@string/pref_default_startup"
-            app:entries="@array/startup_tab_entries"
-            app:entryValues="@array/startup_tab_value"
+        <Preference
+            app:fragment="io.github.wulkanowy.ui.modules.settings.appearance.menuorder.MenuOrderFragment"
             app:iconSpaceReserved="false"
-            app:key="@string/pref_key_start_menu"
-            app:title="@string/pref_view_list"
-            app:useSimpleSummaryProvider="true" />
+            app:key="@string/pref_key_menu_order"
+            app:summary="@string/pref_view_menu_order_summary"
+            app:title="@string/pref_view_menu_order_title" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_dashboard_appearance_header">
         <MultiSelectListPreference
+            app:defaultValue="@array/pref_default_dashboard_tiles"
             app:entries="@array/dashboard_tile_entries"
             app:entryValues="@array/dashboard_tile_values"
             app:iconSpaceReserved="false"
-            app:defaultValue="@array/pref_default_dashboard_tiles"
             app:key="@string/pref_key_dashboard_tiles"
             app:title="@string/pref_dashboard_appearance_tiles_title" />
     </PreferenceCategory>
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 6cfab199..460c8385 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -46,7 +46,7 @@ class MainPresenterTest {
         MockKAnnotations.init(this)
         clearMocks(mainView)
 
-        every { mainView.initView(any(), any()) } just Runs
+        every { mainView.initView(any(), any(), any()) } just Runs
         presenter = MainPresenter(
             errorHandler = errorHandler,
             studentRepository = studentRepository,

From f7d12670e7903dbaffd4dc3f2b13e4eecd351679 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 29 Jan 2023 17:54:58 +0000
Subject: [PATCH 232/429] Bump firebase-bom from 31.1.1 to 31.2.0 (#2111)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 33e80058..d4e93990 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.1.1')
+    playImplementation platform('com.google.firebase:firebase-bom:31.2.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 277c3c7f0b641bf3c48ecfe49cff525fd45bc6bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 29 Jan 2023 17:55:16 +0000
Subject: [PATCH 233/429] Bump google-services from 4.3.14 to 4.3.15 (#2110)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5abbe57d..dfe7f927 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 'com.android.tools.build:gradle:7.4.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.8.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"

From d1b198222de672b13316edf6e95b95b2cb793efa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 15:52:36 +0000
Subject: [PATCH 234/429] Bump material from 1.7.0 to 1.8.0 (#2113)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d4e93990..afc0d871 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -206,7 +206,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.7.0"
+    implementation "com.google.android.material:material:1.8.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.3.0'

From 22dd16d278feb2db9a61f21ad3c2ebf16d33436e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 15:53:30 +0000
Subject: [PATCH 235/429] Bump mockk from 1.13.3 to 1.13.4 (#2112)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index afc0d871..30f75c2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.5.0"
     chucker = "3.5.2"
-    mockk = "1.13.3"
+    mockk = "1.13.4"
     coroutines = "1.6.4"
 }
 

From 6596f3226b50787737059ac61ae7afaedb188b55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:39:48 +0000
Subject: [PATCH 236/429] Bump com.google.firebase:firebase-bom from 31.2.0 to
 31.2.1 (#2123)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 30f75c2a..f279c800 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.8.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.2.0')
+    playImplementation platform('com.google.firebase:firebase-bom:31.2.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 2760318f3d0744bbf713892a36200c6bc19dd25c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:40:06 +0000
Subject: [PATCH 237/429] Bump androidx.appcompat:appcompat from 1.6.0 to 1.6.1
 (#2122)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f279c800..b96f38af 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,7 +196,7 @@ dependencies {
     implementation "androidx.core:core-ktx:1.9.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.6.1"
-    implementation "androidx.appcompat:appcompat:1.6.0"
+    implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.5.5"
     implementation "androidx.annotation:annotation:1.5.0"
 

From 87b8989dc81c355fd08b3d9862e46b0a959b87d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:40:26 +0000
Subject: [PATCH 238/429] Bump com.google.firebase:firebase-crashlytics-gradle
 from 2.9.2 to 2.9.4 (#2121)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dfe7f927..633554c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.8.0.300'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730"

From af6d5c3063510cf49d9d5e68aa37bb5ae26c3b1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:44:16 +0000
Subject: [PATCH 239/429] Bump work_manager from 2.7.1 to 2.8.0 (#2119)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b96f38af..e24718fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,7 +177,7 @@ huaweiPublish {
 }
 
 ext {
-    work_manager = "2.7.1"
+    work_manager = "2.8.0"
     android_hilt = "1.0.0"
     room = "2.5.0"
     chucker = "3.5.2"

From 4d237d3672ae7535b15738f2b6aa8991d1a3e2cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:44:37 +0000
Subject: [PATCH 240/429] Bump com.android.tools.build:gradle from 7.4.0 to
 7.4.1 (#2115)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 633554c3..50f80406 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.8.0.300'

From 6f819bcb8084ce9948c8ed49c91c047b515e8d1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:44:57 +0000
Subject: [PATCH 241/429] Bump com.google.android.gms:play-services-ads from
 21.4.0 to 21.5.0 (#2116)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e24718fe..edf5c7cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -248,7 +248,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:21.4.0'
+    playImplementation 'com.google.android.gms:play-services-ads:21.5.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.8.0.300'

From d21e4afad2f0aacd934eb9dba53dc83406120593 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:46:31 +0000
Subject: [PATCH 242/429] Bump com.android.tools:desugar_jdk_libs from 1.1.8 to
 2.0.2 (#2118)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index edf5c7cc..5d6c1c78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ ext {
 dependencies {
     implementation "io.github.wulkanowy:sdk:1.9.2-SNAPSHOT"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"

From 78ae23df684132a71c1362a573bcbae21335cecd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Feb 2023 22:57:25 +0000
Subject: [PATCH 243/429] Bump kotlin_version from 1.8.0 to 1.8.10 (#2117)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 50f80406..059540fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.8.0'
+        kotlin_version = '1.8.10'
         about_libraries = '10.5.2'
         hilt_version = "2.44.2"
     }

From ac446e4f91ab95bef194aec766805f7b65a7955b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 09:09:18 +0000
Subject: [PATCH 244/429] Bump hilt_version from 2.44.2 to 2.45 (#2120)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 059540fe..8dc23844 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.8.10'
         about_libraries = '10.5.2'
-        hilt_version = "2.44.2"
+        hilt_version = "2.45"
     }
     repositories {
         mavenCentral()

From ea26a6c1c900c88d39bb84476e6ffa1578363396 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 20:57:36 +0000
Subject: [PATCH 245/429] Bump com.huawei.agconnect:agconnect-crash from
 1.8.0.300 to 1.8.1.300 (#2136)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5d6c1c78..e9461c26 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -251,7 +251,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:21.5.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.8.0.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.8.1.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From 811f839949071cdcc7bfa61cbea7313568264e6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 20:58:33 +0000
Subject: [PATCH 246/429] Bump androidx.test.ext:junit from 1.1.4 to 1.1.5
 (#2135)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e9461c26..e6f3acf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -274,7 +274,7 @@ dependencies {
 
     androidTestImplementation "androidx.test:core:1.5.0"
     androidTestImplementation "androidx.test:runner:1.5.1"
-    androidTestImplementation "androidx.test.ext:junit:1.1.4"
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }

From 0c2fd1d2db55c748aecf16dbf559c9b7ac7c991a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 20:58:55 +0000
Subject: [PATCH 247/429] Bump androidx.annotation:annotation from 1.5.0 to
 1.6.0 (#2134)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e6f3acf9..729efc12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -198,7 +198,7 @@ dependencies {
     implementation "androidx.activity:activity-ktx:1.6.1"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.5.5"
-    implementation "androidx.annotation:annotation:1.5.0"
+    implementation "androidx.annotation:annotation:1.6.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"
     implementation "androidx.recyclerview:recyclerview:1.2.1"

From 3d2816874999d7df25f4ce1e4d0adc486ccbdde8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 20:59:36 +0000
Subject: [PATCH 248/429] Bump com.huawei.agconnect:agcp from 1.8.0.300 to
 1.8.1.300 (#2131)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8dc23844..ee597b0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.huawei.agconnect:agcp:1.8.0.300'
+        classpath 'com.huawei.agconnect:agcp:1.8.1.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"

From 531c7592b2d3d43506d8c0bd1de5be2077570556 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 21:00:51 +0000
Subject: [PATCH 249/429] Bump org.jetbrains.kotlinx:kotlinx-serialization-json
 (#2132)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 729efc12..49685eee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -190,7 +190,7 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.9.0"

From 63bd5f95cb3fb8e46bdd6e0c3a07871d5f3e5caa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 21:02:04 +0000
Subject: [PATCH 250/429] Bump about_libraries from 10.5.2 to 10.6.1 (#2130)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ee597b0c..33f5be3c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.10'
-        about_libraries = '10.5.2'
+        about_libraries = '10.6.1'
         hilt_version = "2.45"
     }
     repositories {

From 3e09a1dcee5d4a711081be4d5351c682ad403555 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 21:14:08 +0000
Subject: [PATCH 251/429] Bump com.fredporciuncula:flow-preferences from 1.8.0
 to 1.9.0 (#2126)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 49685eee..1525b21c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,7 +239,7 @@ dependencies {
     implementation "io.coil-kt:coil:2.2.2"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-    implementation 'com.fredporciuncula:flow-preferences:1.8.0'
+    implementation 'com.fredporciuncula:flow-preferences:1.9.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
     playImplementation platform('com.google.firebase:firebase-bom:31.2.1')

From 5b0e47b1c5fead141ef34da28a439dde349d7120 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 21:14:29 +0000
Subject: [PATCH 252/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2127)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 33f5be3c..eed6655a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From 9ae2ffe7aecd8bacb615a5fa900cbc42eb9afd2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 21:17:58 +0000
Subject: [PATCH 253/429] Bump androidx.test:runner from 1.5.1 to 1.5.2 (#2133)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1525b21c..1732d6e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -273,7 +273,7 @@ dependencies {
     kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
 
     androidTestImplementation "androidx.test:core:1.5.0"
-    androidTestImplementation "androidx.test:runner:1.5.1"
+    androidTestImplementation "androidx.test:runner:1.5.2"
     androidTestImplementation "androidx.test.ext:junit:1.1.5"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"

From 6ddaeb99da22c8b33ad944487a6efbf6044c3dd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Mar 2023 21:29:48 +0000
Subject: [PATCH 254/429] Bump com.google.firebase:firebase-bom from 31.2.1 to
 31.2.2 (#2125)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1732d6e6..a470dae8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.2.1')
+    playImplementation platform('com.google.firebase:firebase-bom:31.2.2')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 12a54278fc3aef03bba4afcf4f63ba67765f39dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 1 Mar 2023 22:53:42 +0100
Subject: [PATCH 255/429] New Crowdin updates (#2109)

---
 app/src/main/res/values-cs/strings.xml     |  8 ++++
 app/src/main/res/values-da-rDK/strings.xml |  8 ++++
 app/src/main/res/values-de/strings.xml     |  8 ++++
 app/src/main/res/values-es-rES/strings.xml |  8 ++++
 app/src/main/res/values-pl/strings.xml     |  8 ++++
 app/src/main/res/values-ru/strings.xml     | 46 +++++++++++++---------
 app/src/main/res/values-sk/strings.xml     |  8 ++++
 app/src/main/res/values-uk/strings.xml     | 30 ++++++++------
 8 files changed, 94 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4a91cc85..47f7707f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Informace o žáku</string>
     <string name="dashboard_title">Domů</string>
     <string name="notifications_center_title">Centrum oznámení</string>
+    <string name="menu_order_title">Menu configuartion</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -678,6 +679,7 @@
     <string name="all_undo">Vrátit</string>
     <string name="all_change">Změnit</string>
     <string name="all_add_to_calendar">Přidat do kalendáře</string>
+    <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Žádné lekce</string>
     <string name="widget_timetable_theme_title">Vybrat motiv</string>
@@ -699,6 +701,8 @@
     <string name="pref_view_grade_color_scheme">Známky barevné schéma</string>
     <string name="pref_view_grade_sorting_mode">Třídění předmětů</string>
     <string name="pref_view_app_language">Jazyk</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
     <string name="pref_notify_header">Oznámení</string>
     <string name="pref_notify_header_other">Jiné</string>
     <string name="pref_notify_switch">Zobrazit oznámení</string>
@@ -800,6 +804,10 @@
     <string name="update_download_success">Aktualizace byla stažena.</string>
     <string name="update_download_success_button">Restartovat</string>
     <string name="update_failed">Aktualizace selhala! Wulkanowy nemusí fungovat správně. Zvažte aktualizaci</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
     <!--Errors-->
     <string name="error_no_internet">Žádné internetové připojení</string>
     <string name="error_invalid_device_datetime">Vyskytla se chyba. Zkontrolujte hodiny svého zařízení</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 66723127..3875b3d9 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Student info</string>
     <string name="dashboard_title">Dashboard</string>
     <string name="notifications_center_title">Notifications center</string>
+    <string name="menu_order_title">Menu configuartion</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -590,6 +591,7 @@
     <string name="all_undo">Undo</string>
     <string name="all_change">Change</string>
     <string name="all_add_to_calendar">Add to calendar</string>
+    <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
     <string name="widget_timetable_theme_title">Choose theme</string>
@@ -611,6 +613,8 @@
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
     <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
     <string name="pref_view_app_language">Language</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_header_other">Other</string>
     <string name="pref_notify_switch">Show notifications</string>
@@ -712,6 +716,10 @@
     <string name="update_download_success">An update has just been downloaded.</string>
     <string name="update_download_success_button">Restart</string>
     <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f7b8e7c4..c03181e4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Schülerinfo</string>
     <string name="dashboard_title">Übersicht</string>
     <string name="notifications_center_title">Benachrichtigungszentrum</string>
+    <string name="menu_order_title">Menu configuartion</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -590,6 +591,7 @@
     <string name="all_undo">lösen</string>
     <string name="all_change">Ändern</string>
     <string name="all_add_to_calendar">Zum Kalender hinzufügen</string>
+    <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Keine Lektionen</string>
     <string name="widget_timetable_theme_title">Thema wählen</string>
@@ -611,6 +613,8 @@
     <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
     <string name="pref_view_grade_sorting_mode">Schulfachen sortieren</string>
     <string name="pref_view_app_language">Sprache</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
     <string name="pref_notify_header">Benachrichtigungen</string>
     <string name="pref_notify_header_other">Sonstiges</string>
     <string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
@@ -712,6 +716,10 @@
     <string name="update_download_success">Ein Update wurde gerade heruntergeladen.</string>
     <string name="update_download_success_button">Neustart</string>
     <string name="update_failed">Update fehlgeschlagen! Wulkanowy funktioniert möglicherweise nicht richtig. Überlegen Sie die Aktualisierung</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
     <!--Errors-->
     <string name="error_no_internet">Keine Internetverbindung</string>
     <string name="error_invalid_device_datetime">Es ist ein Fehler aufgetreten. Überprüfen Sie Ihre Geräteuhr</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 66723127..3875b3d9 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Student info</string>
     <string name="dashboard_title">Dashboard</string>
     <string name="notifications_center_title">Notifications center</string>
+    <string name="menu_order_title">Menu configuartion</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -590,6 +591,7 @@
     <string name="all_undo">Undo</string>
     <string name="all_change">Change</string>
     <string name="all_add_to_calendar">Add to calendar</string>
+    <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
     <string name="widget_timetable_theme_title">Choose theme</string>
@@ -611,6 +613,8 @@
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
     <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
     <string name="pref_view_app_language">Language</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_header_other">Other</string>
     <string name="pref_notify_switch">Show notifications</string>
@@ -712,6 +716,10 @@
     <string name="update_download_success">An update has just been downloaded.</string>
     <string name="update_download_success_button">Restart</string>
     <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4891015d..7f0c3291 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Informacje o uczniu</string>
     <string name="dashboard_title">Start</string>
     <string name="notifications_center_title">Centrum powiadomień</string>
+    <string name="menu_order_title">Konfiguracja menu</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -678,6 +679,7 @@
     <string name="all_undo">Cofnij</string>
     <string name="all_change">Zmień</string>
     <string name="all_add_to_calendar">Dodaj do kalendarza</string>
+    <string name="all_cancel">Anuluj</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
     <string name="widget_timetable_theme_title">Wybierz motyw</string>
@@ -699,6 +701,8 @@
     <string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
     <string name="pref_view_grade_sorting_mode">Sortowanie przedmiotów</string>
     <string name="pref_view_app_language">Język</string>
+    <string name="pref_view_menu_order_title">Konfiguracja menu</string>
+    <string name="pref_view_menu_order_summary">Ustaw kolejność funkcji w menu</string>
     <string name="pref_notify_header">Powiadomienia</string>
     <string name="pref_notify_header_other">Inne</string>
     <string name="pref_notify_switch">Pokazuj powiadomienia</string>
@@ -800,6 +804,10 @@
     <string name="update_download_success">Aktualizacja została pobrana.</string>
     <string name="update_download_success_button">Uruchom ponownie</string>
     <string name="update_failed">Aktualizacja nie powiodła się! Wulkanowy może nie działać prawidłowo. Rozważ aktualizację</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Ponowne uruchomienie aplikacji</string>
+    <string name="menu_order_confirm_content">W celu zapisania zmian aplikacja musi zostać ponownie uruchomiona</string>
+    <string name="menu_order_confirm_restart">Uruchom ponownie</string>
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_invalid_device_datetime">Wystąpił błąd. Sprawdź poprawność daty w urządzeniu</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 01e43183..42e1e0bb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -15,8 +15,8 @@
     <string name="notification_debug_title">Отладка уведомлений</string>
     <string name="contributors_title">Разработчики</string>
     <string name="license_title">Лицензии</string>
-    <string name="message_title">Письма</string>
-    <string name="send_message_title">Написать</string>
+    <string name="message_title">Сообщения</string>
+    <string name="send_message_title">Новое сообщение</string>
     <string name="add_homework_title">Новое домашнее задание</string>
     <string name="note_title">Замечания и свершения</string>
     <string name="homework_title">Домашние задания</string>
@@ -26,6 +26,7 @@
     <string name="student_info_title">Информация о ученике</string>
     <string name="dashboard_title">Главная</string>
     <string name="notifications_center_title">Центр уведомлений</string>
+    <string name="menu_order_title">Настройка меню</string>
     <!--Subtitles-->
     <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
     <!--Login-->
@@ -55,7 +56,7 @@
     <string name="login_invalid_symbol">Неверный symbol</string>
     <string name="login_incorrect_symbol">Ученик не найден. Проверьте symbol и выбранный тип дненика UONET+</string>
     <string name="login_duplicate_student">Данный ученик уже авторизован</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</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>
     <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
     <string name="login_advanced">Другие варианты</string>
     <string name="login_advanced_warning_mobile_api">В этом режиме не работают: счастливый номер, статистика класса по оценкам, статистика посещаемости и уроков, информация о школе и список зарегистрированных устройств</string>
@@ -72,14 +73,14 @@
     <string name="login_recover">Восстановить</string>
     <string name="login_signed_in">Ученик уже авторизован</string>
     <string name="login_host_standard">Стандартный</string>
-    <string name="login_other_search_locations">Other search locations</string>
-    <string name="login_no_active_student">No active students found</string>
-    <string name="login_symbol_enter">Enter a different symbol</string>
+    <string name="login_other_search_locations">Другие места поиска</string>
+    <string name="login_no_active_student">Не найдено активных учеников</string>
+    <string name="login_symbol_enter">Введите другой symbol</string>
     <!--Notifications-->
-    <string name="notifications_header_title">Enable notifications</string>
-    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
-    <string name="notifications_skip">Skip</string>
-    <string name="notifications_enable">Enable</string>
+    <string name="notifications_header_title">Включить уведомления</string>
+    <string name="notifications_header_description">Включить уведомления, чтобы вы не пропустили сообщение от учителя или новую оценку</string>
+    <string name="notifications_skip">Пропустить</string>
+    <string name="notifications_enable">Включить</string>
     <!--Main-->
     <string name="main_account_picker">Менеджер аккаунтов</string>
     <string name="main_log_in">Войти</string>
@@ -294,7 +295,7 @@
     <string name="message_sent">Отправленные</string>
     <string name="message_trash">Корзина</string>
     <string name="message_no_subject">(нет темы)</string>
-    <string name="message_no_items">Нет писем</string>
+    <string name="message_no_items">Нет сообщений</string>
     <string name="message_from">От:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %1$s</string>
@@ -304,7 +305,7 @@
     <string name="message_unselect_all">Отменить выбор</string>
     <string name="message_move_to_trash">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
-    <string name="message_delete_success">Письмо успешно удалено</string>
+    <string name="message_delete_success">Сообщение успешно удалено</string>
     <string name="message_mailbox_type_student">ученик</string>
     <string name="message_mailbox_type_parent">родитель</string>
     <string name="message_mailbox_type_guardian">опекун</string>
@@ -313,8 +314,8 @@
     <string name="message_print">Печать</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Содержание</string>
-    <string name="message_send_successful">Письмо успешно отправлено</string>
-    <string name="message_not_exists">Письма не существует</string>
+    <string name="message_send_successful">Сообщение успешно отправлено</string>
+    <string name="message_not_exists">Сообщения не существует</string>
     <string name="message_required_recipients">Вы должны выбрать как минимум одного получателя</string>
     <string name="message_content_min_length">Текст сообщения должен содержать как минимум 3 знака</string>
     <string name="message_chip_all_mailboxes">Все почтовые ящики</string>
@@ -334,8 +335,8 @@
         <item quantity="many">Новые сообщения</item>
         <item quantity="other">Новые сообщения</item>
     </plurals>
-    <string name="message_restore_dialog">Вы хотите восстановить черновик письма?</string>
-    <string name="message_restore_dialog_with_recipients">Вы хотите восстановить черновик письма с получателями: %s?</string>
+    <string name="message_restore_dialog">Вы хотите восстановить черновик сообщения?</string>
+    <string name="message_restore_dialog_with_recipients">Вы хотите восстановить черновик сообщения с получателями: %s?</string>
     <plurals name="message_notify_new_items">
         <item quantity="one">Вы получили %1$d новое сообщение</item>
         <item quantity="few">Вы получили %1$d новых сообщения</item>
@@ -493,8 +494,8 @@
     </plurals>
     <string name="conferences_present">Присутствует на встрече</string>
     <string name="conference_agenda">Повестка дня</string>
-    <string name="conference_place">Place</string>
-    <string name="conference_topic">Topic</string>
+    <string name="conference_place">Место</string>
+    <string name="conference_topic">Тема</string>
     <!--Director information-->
     <string name="school_announcement_title">Объявления школы</string>
     <string name="school_announcement_no_items">Нет школьных объявлений</string>
@@ -678,6 +679,7 @@
     <string name="all_undo">Отменить</string>
     <string name="all_change">Изменить</string>
     <string name="all_add_to_calendar">Добавить в календарь</string>
+    <string name="all_cancel">Отменить</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
@@ -699,6 +701,8 @@
     <string name="pref_view_grade_color_scheme">Цветовая схема оценок</string>
     <string name="pref_view_grade_sorting_mode">Сортировка уроков</string>
     <string name="pref_view_app_language">Язык</string>
+    <string name="pref_view_menu_order_title">Настройка меню</string>
+    <string name="pref_view_menu_order_summary">Установить порядок функций в меню</string>
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_header_other">Прочее</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
@@ -780,7 +784,7 @@
     <string name="channel_new_conference">Новые встречи</string>
     <string name="channel_new_exam">Новые тесты</string>
     <string name="channel_lucky_number">Счастливый номер</string>
-    <string name="channel_new_message">Новые письма</string>
+    <string name="channel_new_message">Новые сообщения</string>
     <string name="channel_new_notes">Новые замечания</string>
     <string name="channel_new_school_announcement">Новые школьные объявления</string>
     <string name="channel_push">Push-уведомления</string>
@@ -800,6 +804,10 @@
     <string name="update_download_success">Только что было скачано обновление.</string>
     <string name="update_download_success_button">Перезапустить</string>
     <string name="update_failed">Не удалось обновить! Wulkanowy может работать некорректно. Рассмотрите возможность обновления</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Перезапуск приложение</string>
+    <string name="menu_order_confirm_content">Для сохранения изменений необходимо перезапустить приложение</string>
+    <string name="menu_order_confirm_restart">Перезапустить</string>
     <!--Errors-->
     <string name="error_no_internet">Интернет-соединение отсутствует</string>
     <string name="error_invalid_device_datetime">Произошла ошибка. Проверьте время на вашем устройстве</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 4189c534..915e2ef4 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Informácie o žiakovi</string>
     <string name="dashboard_title">Domov</string>
     <string name="notifications_center_title">Centrum oznámení</string>
+    <string name="menu_order_title">Menu configuartion</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -678,6 +679,7 @@
     <string name="all_undo">Vrátiť</string>
     <string name="all_change">Zmeniť</string>
     <string name="all_add_to_calendar">Pridať do kalendára</string>
+    <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Žiadne lekcie</string>
     <string name="widget_timetable_theme_title">Vybrať motív</string>
@@ -699,6 +701,8 @@
     <string name="pref_view_grade_color_scheme">Známky farebnú schému</string>
     <string name="pref_view_grade_sorting_mode">Triedenie predmetov</string>
     <string name="pref_view_app_language">Jazyk</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
     <string name="pref_notify_header">Oznámenia</string>
     <string name="pref_notify_header_other">Iné</string>
     <string name="pref_notify_switch">Zobraziť oznámenia</string>
@@ -800,6 +804,10 @@
     <string name="update_download_success">Aktualizácia bola stiahnutá.</string>
     <string name="update_download_success_button">Reštartovať</string>
     <string name="update_failed">Aktualizácia zlyhala! Wulkanowy nemusí fungovať správne. Zvážte aktualizáciu</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
     <!--Errors-->
     <string name="error_no_internet">Žiadne internetové pripojenie</string>
     <string name="error_invalid_device_datetime">Vyskytla sa chyba. Skontrolujte hodiny svojho zariadenia</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 99c34065..0c736904 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -26,6 +26,7 @@
     <string name="student_info_title">Інформація про учня</string>
     <string name="dashboard_title">Головна</string>
     <string name="notifications_center_title">Центр сповіщень</string>
+    <string name="menu_order_title">Конфігурація меню</string>
     <!--Subtitles-->
     <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
     <!--Login-->
@@ -55,7 +56,7 @@
     <string name="login_invalid_symbol">Неправильний symbol</string>
     <string name="login_incorrect_symbol">Студента не знайдено. Перевірте symbol та обранний тип щоденника UONET+</string>
     <string name="login_duplicate_student">Цього учня вже авторизовано</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</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>
     <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>
     <string name="login_advanced">Інші варіанти</string>
     <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності та уроків, інформація про школу та список зареєстрованих пристроїв</string>
@@ -72,14 +73,14 @@
     <string name="login_recover">Відновити</string>
     <string name="login_signed_in">Учня вже авторизовано</string>
     <string name="login_host_standard">Стандартний</string>
-    <string name="login_other_search_locations">Other search locations</string>
-    <string name="login_no_active_student">No active students found</string>
-    <string name="login_symbol_enter">Enter a different symbol</string>
+    <string name="login_other_search_locations">Інші розташування пошуку</string>
+    <string name="login_no_active_student">Активних учнів не знайдено</string>
+    <string name="login_symbol_enter">Введіть інший symbol</string>
     <!--Notifications-->
-    <string name="notifications_header_title">Enable notifications</string>
-    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
-    <string name="notifications_skip">Skip</string>
-    <string name="notifications_enable">Enable</string>
+    <string name="notifications_header_title">Увімкнути сповіщення</string>
+    <string name="notifications_header_description">Увімкнути сповіщення, щоб не пропустити лист від вчителя або нову оцінку</string>
+    <string name="notifications_skip">Пропустити</string>
+    <string name="notifications_enable">Увімкнути</string>
     <!--Main-->
     <string name="main_account_picker">Змінити облікові записи</string>
     <string name="main_log_in">Увійти</string>
@@ -493,8 +494,8 @@
     </plurals>
     <string name="conferences_present">Присутність на зустрічі</string>
     <string name="conference_agenda">Порядок денний</string>
-    <string name="conference_place">Place</string>
-    <string name="conference_topic">Topic</string>
+    <string name="conference_place">Місце</string>
+    <string name="conference_topic">Тема</string>
     <!--Director information-->
     <string name="school_announcement_title">Оголошення школи</string>
     <string name="school_announcement_no_items">Немає шкільних оголошень</string>
@@ -522,7 +523,7 @@
     <string name="account_confirm">Ви впевнені, що хочете вийти з цього облікового запису?</string>
     <string name="account_logout_student">Вийти з облікового запису учня</string>
     <string name="account_type_student">Обліковий запис учня</string>
-    <string name="account_type_parent">Обліковий запис батька</string>
+    <string name="account_type_parent">Обліковий запис родителя</string>
     <string name="account_details_edit">Змінити дані</string>
     <string name="account_quick_manager">Змінити облікові записи</string>
     <string name="account_select_student">Вибрати учня</string>
@@ -678,6 +679,7 @@
     <string name="all_undo">Відмінити</string>
     <string name="all_change">Змінити</string>
     <string name="all_add_to_calendar">Додати у календар</string>
+    <string name="all_cancel">Скасувати</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Немаэ уроків</string>
     <string name="widget_timetable_theme_title">Увібрати тему</string>
@@ -699,6 +701,8 @@
     <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>
     <string name="pref_view_grade_sorting_mode">Сортування предметів</string>
     <string name="pref_view_app_language">Мова</string>
+    <string name="pref_view_menu_order_title">Конфігурація меню</string>
+    <string name="pref_view_menu_order_summary">Встановити порядок функцій в меню</string>
     <string name="pref_notify_header">Повідомлення</string>
     <string name="pref_notify_header_other">Інше</string>
     <string name="pref_notify_switch">Показувати повідомлення</string>
@@ -800,6 +804,10 @@
     <string name="update_download_success">Щойно завантажено оновлення.</string>
     <string name="update_download_success_button">Перезавантажити</string>
     <string name="update_failed">Помилка оновлення! Wulkanowy може не працювати належним чином. Подумайте про оновлення</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Перезавантаження додатку</string>
+    <string name="menu_order_confirm_content">Додаток потрібно перезавантажити для збереження змін</string>
+    <string name="menu_order_confirm_restart">Перезавантажити</string>
     <!--Errors-->
     <string name="error_no_internet">Немає з\'єднання з інтернетом</string>
     <string name="error_invalid_device_datetime">Сталася помилка. Перевірте годинник пристрою</string>

From f11354dd3501953403b47f63b6f67ea45564d9e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sat, 14 Jan 2023 15:48:58 +0100
Subject: [PATCH 256/429] Fix marking message as read (#2102)

---
 app/build.gradle                                             | 2 +-
 .../github/wulkanowy/data/repositories/MessageRepository.kt  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fff19ebe..c38fc407 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.9.1"
+    implementation "io.github.wulkanowy:sdk:1.9.2-SNAPSHOT"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index 6dfc3ab7..53d9bead 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -103,7 +103,10 @@ class MessageRepository @Inject constructor(
             messagesDb.loadMessageWithAttachment(message.messageGlobalKey)
         },
         fetch = {
-            sdk.init(student).getMessageDetails(it!!.message.messageGlobalKey, markAsRead)
+            sdk.init(student).getMessageDetails(
+                messageKey = it!!.message.messageGlobalKey,
+                markAsRead = message.unread && markAsRead,
+            )
         },
         saveFetchResult = { old, new ->
             checkNotNull(old) { "Fetched message no longer exist!" }

From a495fcbc5f30decab849c0c9a7f76000192d91a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 2 Mar 2023 18:01:48 +0100
Subject: [PATCH 257/429] Fix saving attachements with same url but from
 different messages (#2137)

---
 .../55.json                                   | 2435 +++++++++++++++++
 .../github/wulkanowy/data/db/AppDatabase.kt   |    3 +-
 .../data/db/entities/MessageAttachment.kt     |   10 +-
 .../data/db/migrations/Migration55.kt         |   17 +
 .../wulkanowy/data/mappers/MessageMapper.kt   |    1 -
 5 files changed, 2458 insertions(+), 8 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/55.json
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration55.kt

diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/55.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/55.json
new file mode 100644
index 00000000..60c2efbe
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/55.json
@@ -0,0 +1,2435 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 55,
+    "identityHash": "cba22eea6d26cf4d6b9a388ba3329a12",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "globalKey"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'cba22eea6d26cf4d6b9a388ba3329a12')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index cfb53485..0aea86da 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -48,6 +48,7 @@ import javax.inject.Singleton
         AutoMigration(from = 46, to = 47),
         AutoMigration(from = 47, to = 48),
         AutoMigration(from = 51, to = 52),
+        AutoMigration(from = 54, to = 55, spec = Migration55::class),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -56,7 +57,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 54
+        const val VERSION_SCHEMA = 55
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
index 93f04299..6f0c84ad 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
@@ -2,16 +2,14 @@ package io.github.wulkanowy.data.db.entities
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.PrimaryKey
 import java.io.Serializable
 
-@Entity(tableName = "MessageAttachments")
+@Entity(
+    tableName = "MessageAttachments",
+    primaryKeys = ["message_global_key", "url", "filename"],
+)
 data class MessageAttachment(
 
-    @PrimaryKey
-    @ColumnInfo(name = "real_id")
-    val realId: Int,
-
     @ColumnInfo(name = "message_global_key")
     val messageGlobalKey: String,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration55.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration55.kt
new file mode 100644
index 00000000..424be171
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration55.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.DeleteColumn
+import androidx.room.migration.AutoMigrationSpec
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+@DeleteColumn(
+    tableName = "MessageAttachments",
+    columnName = "real_id",
+)
+class Migration55 : AutoMigrationSpec {
+
+    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+        db.execSQL("DELETE FROM Messages")
+        db.execSQL("DELETE FROM MessageAttachments")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 2ede5aa1..6fc5dc95 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -40,7 +40,6 @@ fun List<SdkMessage>.mapToEntities(
 fun List<SdkMessageAttachment>.mapToEntities(messageGlobalKey: String) = map {
     MessageAttachment(
         messageGlobalKey = messageGlobalKey,
-        realId = it.url.hashCode(),
         url = it.url,
         filename = it.filename
     )

From fba86930feb8dea805950d2e094426b5a7c37f11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Mar 2023 21:46:18 +0000
Subject: [PATCH 258/429] Bump com.android.tools.build:gradle from 7.4.1 to
 7.4.2 (#2140)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index eed6655a..c14e0dbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.8.1.300'

From 9ce1ba75b2ffb50baf4d1a6f44b295d998c2c690 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Mar 2023 21:46:37 +0000
Subject: [PATCH 259/429] Bump com.google.firebase:firebase-bom from 31.2.2 to
 31.2.3 (#2141)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a470dae8..d583891a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.2.2')
+    playImplementation platform('com.google.firebase:firebase-bom:31.2.3')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 5331bf90cde50e847aa6e7f56a87a569691d8a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 7 Mar 2023 18:10:20 +0100
Subject: [PATCH 260/429] Use user agent template from firebase remote config
 (#2139)

* Use user agent template from firebase remote config

* Improve base class usage, activation refactor
---
 app/build.gradle                              |  1 +
 .../wulkanowy/utils/RemoteConfigHelper.kt     |  7 ++++
 .../wulkanowy/utils/RemoteConfigHelper.kt     |  7 ++++
 .../java/io/github/wulkanowy/WulkanowyApp.kt  |  4 +++
 .../io/github/wulkanowy/data/DataModule.kt    |  4 ++-
 .../wulkanowy/utils/BaseRemoteConfigHelper.kt |  9 +++++
 .../wulkanowy/utils/RemoteConfigDefaults.kt   |  8 +++++
 .../wulkanowy/utils/RemoteConfigHelper.kt     | 35 +++++++++++++++++++
 8 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 app/src/fdroid/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
 create mode 100644 app/src/hms/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/utils/BaseRemoteConfigHelper.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/utils/RemoteConfigDefaults.kt
 create mode 100644 app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt

diff --git a/app/build.gradle b/app/build.gradle
index c38fc407..470b4e29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -246,6 +246,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
+    playImplementation 'com.google.firebase:firebase-config-ktx'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:21.4.0'
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
new file mode 100644
index 00000000..88f2598f
--- /dev/null
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigHelper @Inject constructor() : BaseRemoteConfigHelper()
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
new file mode 100644
index 00000000..88f2598f
--- /dev/null
+++ b/app/src/hms/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigHelper @Inject constructor() : BaseRemoteConfigHelper()
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 7d2eeb1e..a39a3874 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -34,11 +34,15 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var adsHelper: AdsHelper
 
+    @Inject
+    lateinit var remoteConfigHelper: RemoteConfigHelper
+
     override fun onCreate() {
         super.onCreate()
         initializeAppLanguage()
         themeManager.applyDefaultTheme()
         adsHelper.initialize()
+        remoteConfigHelper.initialize()
         initLogging()
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
index 22123cbe..e538b2b2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
@@ -19,6 +19,7 @@ import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.RemoteConfigHelper
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
@@ -36,10 +37,11 @@ internal class DataModule {
 
     @Singleton
     @Provides
-    fun provideSdk(chuckerInterceptor: ChuckerInterceptor) =
+    fun provideSdk(chuckerInterceptor: ChuckerInterceptor, remoteConfig: RemoteConfigHelper) =
         Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
+            userAgentTemplate = remoteConfig.userAgentTemplate
             setSimpleHttpLogger { Timber.d(it) }
 
             // for debug only
diff --git a/app/src/main/java/io/github/wulkanowy/utils/BaseRemoteConfigHelper.kt b/app/src/main/java/io/github/wulkanowy/utils/BaseRemoteConfigHelper.kt
new file mode 100644
index 00000000..002612a8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/BaseRemoteConfigHelper.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.utils
+
+abstract class BaseRemoteConfigHelper {
+
+    open fun initialize() = Unit
+
+    open val userAgentTemplate: String
+        get() = RemoteConfigDefaults.USER_AGENT_TEMPLATE.value as String
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/RemoteConfigDefaults.kt b/app/src/main/java/io/github/wulkanowy/utils/RemoteConfigDefaults.kt
new file mode 100644
index 00000000..6e8f7ae6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/RemoteConfigDefaults.kt
@@ -0,0 +1,8 @@
+package io.github.wulkanowy.utils
+
+enum class RemoteConfigDefaults(val value: Any) {
+    USER_AGENT_TEMPLATE(""),
+    ;
+
+    val key get() = name.lowercase()
+}
diff --git a/app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
new file mode 100644
index 00000000..379932f3
--- /dev/null
+++ b/app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import com.google.firebase.FirebaseApp
+import com.google.firebase.ktx.Firebase
+import com.google.firebase.remoteconfig.ktx.remoteConfig
+import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val appInfo: AppInfo,
+) : BaseRemoteConfigHelper() {
+
+    fun initialize() {
+        FirebaseApp.initializeApp(context)
+
+        Firebase.remoteConfig.setConfigSettingsAsync(remoteConfigSettings {
+            fetchTimeoutInSeconds = 3
+            if (appInfo.isDebug) {
+                minimumFetchIntervalInSeconds = 0
+            }
+        })
+        Firebase.remoteConfig.setDefaultsAsync(RemoteConfigDefaults.values().associate {
+            it.key to it.value
+        })
+        Firebase.remoteConfig.fetchAndActivate()
+    }
+
+    override val userAgentTemplate: String
+        get() = Firebase.remoteConfig.getString(RemoteConfigDefaults.USER_AGENT_TEMPLATE.key)
+}

From ef398f7409c9bbdde3d0dbed115c2a38ec67eecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 7 Mar 2023 22:29:37 +0100
Subject: [PATCH 261/429] Add missing override to
 RemoteConfigHelper.initialize()

---
 .../play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
index 379932f3..d17bfb4e 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/RemoteConfigHelper.kt
@@ -15,7 +15,7 @@ class RemoteConfigHelper @Inject constructor(
     private val appInfo: AppInfo,
 ) : BaseRemoteConfigHelper() {
 
-    fun initialize() {
+    override fun initialize() {
         FirebaseApp.initializeApp(context)
 
         Firebase.remoteConfig.setConfigSettingsAsync(remoteConfigSettings {

From ee5ac46493a04e5d49f411d611e75b8acb676588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 8 Mar 2023 09:11:25 +0100
Subject: [PATCH 262/429] Show invalid symbol message when nonexistent symbol
 entered  (#2143)

---
 .../LoginStudentSelectPresenter.kt            |  9 ++++--
 .../login/symbol/LoginSymbolFragment.kt       |  7 ++++
 .../login/symbol/LoginSymbolPresenter.kt      | 32 +++++++++++++------
 .../modules/login/symbol/LoginSymbolView.kt   |  2 ++
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git 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
index 9148b6ab..7e1fe3b2 100644
--- 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
@@ -12,6 +12,7 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.sdk.scrapper.login.AccountPermissionException
+import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
@@ -158,7 +159,7 @@ class LoginStudentSelectPresenter @Inject constructor(
         isNotEmptySymbolsExist: Boolean,
     ) = buildList {
         val filteredEmptySymbols = emptySymbols.filter {
-            it.error !is AccountPermissionException
+            it.error !is InvalidSymbolException
         }.ifEmpty { emptySymbols.takeIf { !isNotEmptySymbolsExist }.orEmpty() }
 
         if (filteredEmptySymbols.isNotEmpty() && isNotEmptySymbolsExist) {
@@ -281,7 +282,7 @@ class LoginStudentSelectPresenter @Inject constructor(
     private fun onEmailClick() {
         view?.openEmail(lastError?.message.ifNullOrBlank {
             loginData.baseUrl + "/" + loginData.symbol + "\n" + registerUser.symbols.filterNot {
-                it.error is AccountPermissionException && it.symbol != loginData.symbol
+                (it.error is AccountPermissionException || it.error is InvalidSymbolException) && it.symbol != loginData.symbol
             }.joinToString(";\n") { symbol ->
                 buildString {
                     append(" -")
@@ -297,7 +298,9 @@ class LoginStudentSelectPresenter @Inject constructor(
                         }
                     })
                 }
-            }
+            } + "\nPozostałe: " + registerUser.symbols.filter {
+                it.error is AccountPermissionException || it.error is InvalidSymbolException
+            }.joinToString(", ") { it.symbol }
         })
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 67416cb6..692aaeb7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -93,6 +93,13 @@ class LoginSymbolFragment :
         }
     }
 
+    override fun setErrorSymbolInvalid() {
+        with(binding.loginSymbolNameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_symbol)
+        }
+    }
+
     override fun setErrorSymbolRequire() {
         setErrorSymbol(getString(R.string.error_field_required))
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index a6ccd7a5..03ea95fa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -7,6 +7,7 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.sdk.scrapper.getNormalizedSymbol
+import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -61,11 +62,11 @@ class LoginSymbolPresenter @Inject constructor(
                 email = loginData.login,
                 password = loginData.password,
                 scrapperBaseUrl = loginData.baseUrl,
-                symbol = view?.symbolValue.orEmpty(),
+                symbol = loginData.symbol.orEmpty(),
             )
-        }.onEach {
-            registerUser = it.dataOrNull
-            when (it) {
+        }.onEach { user ->
+            registerUser = user.dataOrNull
+            when (user) {
                 is Resource.Loading -> view?.run {
                     Timber.i("Login with symbol started")
                     hideSoftKeyboard()
@@ -73,7 +74,7 @@ class LoginSymbolPresenter @Inject constructor(
                     showContent(false)
                 }
                 is Resource.Success -> {
-                    when (it.data.symbols.size) {
+                    when (user.data.symbols.size) {
                         0 -> {
                             Timber.i("Login with symbol result: Empty student list")
                             view?.run {
@@ -82,8 +83,19 @@ class LoginSymbolPresenter @Inject constructor(
                             }
                         }
                         else -> {
-                            Timber.i("Login with symbol result: Success")
-                            view?.navigateToStudentSelect(loginData, requireNotNull(it.data))
+                            val enteredSymbolDetails = user.data.symbols
+                                .firstOrNull()
+                                ?.takeIf { it.symbol == loginData.symbol }
+
+                            if (enteredSymbolDetails?.error is InvalidSymbolException) {
+                                view?.run {
+                                    setErrorSymbolInvalid()
+                                    showContact(true)
+                                }
+                            } else {
+                                Timber.i("Login with symbol result: Success")
+                                view?.navigateToStudentSelect(loginData, requireNotNull(user.data))
+                            }
                         }
                     }
                     analytics.logEvent(
@@ -102,10 +114,10 @@ class LoginSymbolPresenter @Inject constructor(
                         "students" to -1,
                         "scrapperBaseUrl" to loginData.baseUrl,
                         "symbol" to view?.symbolValue,
-                        "error" to it.error.message.ifNullOrBlank { "No message" }
+                        "error" to user.error.message.ifNullOrBlank { "No message" }
                     )
-                    loginErrorHandler.dispatch(it.error)
-                    lastError = it.error
+                    loginErrorHandler.dispatch(user.error)
+                    lastError = user.error
                     view?.showContact(true)
                 }
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 6b62d1f7..6585c00f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -16,6 +16,8 @@ interface LoginSymbolView : BaseView {
 
     fun setErrorSymbolIncorrect()
 
+    fun setErrorSymbolInvalid()
+
     fun setErrorSymbolRequire()
 
     fun setErrorSymbol(message: String)

From 1b40e339b7e321cc5840db169a232ec9aa6c6761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 8 Mar 2023 21:28:48 +0100
Subject: [PATCH 263/429] Version 1.9.2

---
 app/build.gradle                                  |  6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 470b4e29..255e0098 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 120
-        versionName "1.9.1"
+        versionCode 121
+        versionName "1.9.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.9.2-SNAPSHOT"
+    implementation "io.github.wulkanowy:sdk:1.9.2"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 76c6a0cb..b3fec438 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,10 +1,7 @@
-Wersja 1.9.1
+Wersja 1.9.2
 
-- dodaliśmy obsługę Androida 13 (w tym ikona aplikacji obsługująca Material You)
-- przerobiliśmy ekran wyboru ucznia przy pierwszym logowaniu
-- naprawiliśmy usuwanie wiadomości w niektórych przypadkach
-- naprawiliśmy błąd występujący przy resecie hasła
-- naprawiliśmy literówkę w tytule domyślnej treści wiadomości usprawiedliwiania
-- naprawiliśmy nazwę aplikacji przy ustawionym w telefonie jezyku francuskim
+- naprawiliśmy oznaczanie wiadomości jako odczytanych (problem dotyczył głównie kont rodziców z wieloma dziećmi w tej samej szkole)
+- naprawiliśmy zapisywanie załączników do wiadomości w sytuacji, gdy ten sam załącznik był dodany do więcej niż jednej wiadomości
+- usprawniliśmy ekran z wyborem uczniów i wpisywaniem symbolu przy pierwszym logowaniu
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From cc2079f4c93030d440b2e12cfeb6dc5a3b879dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 8 Mar 2023 21:36:57 +0100
Subject: [PATCH 264/429] New Crowdin updates (#2138)

---
 app/src/main/res/values-cs/strings.xml | 14 +++++++-------
 app/src/main/res/values-sk/strings.xml | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 47f7707f..1897a48b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -26,7 +26,7 @@
     <string name="student_info_title">Informace o žáku</string>
     <string name="dashboard_title">Domů</string>
     <string name="notifications_center_title">Centrum oznámení</string>
-    <string name="menu_order_title">Menu configuartion</string>
+    <string name="menu_order_title">Konfigurace menu</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -679,7 +679,7 @@
     <string name="all_undo">Vrátit</string>
     <string name="all_change">Změnit</string>
     <string name="all_add_to_calendar">Přidat do kalendáře</string>
-    <string name="all_cancel">Cancel</string>
+    <string name="all_cancel">Zrušit</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Žádné lekce</string>
     <string name="widget_timetable_theme_title">Vybrat motiv</string>
@@ -701,8 +701,8 @@
     <string name="pref_view_grade_color_scheme">Známky barevné schéma</string>
     <string name="pref_view_grade_sorting_mode">Třídění předmětů</string>
     <string name="pref_view_app_language">Jazyk</string>
-    <string name="pref_view_menu_order_title">Menu configuration</string>
-    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
+    <string name="pref_view_menu_order_title">Konfigurace menu</string>
+    <string name="pref_view_menu_order_summary">Nastavit pořadí funkcí v menu</string>
     <string name="pref_notify_header">Oznámení</string>
     <string name="pref_notify_header_other">Jiné</string>
     <string name="pref_notify_switch">Zobrazit oznámení</string>
@@ -805,9 +805,9 @@
     <string name="update_download_success_button">Restartovat</string>
     <string name="update_failed">Aktualizace selhala! Wulkanowy nemusí fungovat správně. Zvažte aktualizaci</string>
     <!--Menu order-->
-    <string name="menu_order_confirm_title">Application restart</string>
-    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
-    <string name="menu_order_confirm_restart">Restart</string>
+    <string name="menu_order_confirm_title">Restartování aplikace</string>
+    <string name="menu_order_confirm_content">Pro uložení změn je nutné aplikaci restartovat</string>
+    <string name="menu_order_confirm_restart">Restartovat</string>
     <!--Errors-->
     <string name="error_no_internet">Žádné internetové připojení</string>
     <string name="error_invalid_device_datetime">Vyskytla se chyba. Zkontrolujte hodiny svého zařízení</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 915e2ef4..8979a95f 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -26,7 +26,7 @@
     <string name="student_info_title">Informácie o žiakovi</string>
     <string name="dashboard_title">Domov</string>
     <string name="notifications_center_title">Centrum oznámení</string>
-    <string name="menu_order_title">Menu configuartion</string>
+    <string name="menu_order_title">Konfigurácia menu</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -679,7 +679,7 @@
     <string name="all_undo">Vrátiť</string>
     <string name="all_change">Zmeniť</string>
     <string name="all_add_to_calendar">Pridať do kalendára</string>
-    <string name="all_cancel">Cancel</string>
+    <string name="all_cancel">Zrušiť</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Žiadne lekcie</string>
     <string name="widget_timetable_theme_title">Vybrať motív</string>
@@ -701,8 +701,8 @@
     <string name="pref_view_grade_color_scheme">Známky farebnú schému</string>
     <string name="pref_view_grade_sorting_mode">Triedenie predmetov</string>
     <string name="pref_view_app_language">Jazyk</string>
-    <string name="pref_view_menu_order_title">Menu configuration</string>
-    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
+    <string name="pref_view_menu_order_title">Konfigurácia menu</string>
+    <string name="pref_view_menu_order_summary">Nastaviť poradie funkcií v menu</string>
     <string name="pref_notify_header">Oznámenia</string>
     <string name="pref_notify_header_other">Iné</string>
     <string name="pref_notify_switch">Zobraziť oznámenia</string>
@@ -805,9 +805,9 @@
     <string name="update_download_success_button">Reštartovať</string>
     <string name="update_failed">Aktualizácia zlyhala! Wulkanowy nemusí fungovať správne. Zvážte aktualizáciu</string>
     <!--Menu order-->
-    <string name="menu_order_confirm_title">Application restart</string>
-    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
-    <string name="menu_order_confirm_restart">Restart</string>
+    <string name="menu_order_confirm_title">Reštartovanie aplikácie</string>
+    <string name="menu_order_confirm_content">Pre uloženie zmien je nutné aplikáciu reštartovať</string>
+    <string name="menu_order_confirm_restart">Reštartovať</string>
     <!--Errors-->
     <string name="error_no_internet">Žiadne internetové pripojenie</string>
     <string name="error_invalid_device_datetime">Vyskytla sa chyba. Skontrolujte hodiny svojho zariadenia</string>

From a350a167f3611d1b3f77b6d199a61db4f21d80a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Mar 2023 18:14:31 +0000
Subject: [PATCH 265/429] Bump androidx.lifecycle:lifecycle-livedata-ktx from
 2.5.1 to 2.6.0 (#2146)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1e4de10e..9ca1c9d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -214,7 +214,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"

From 060bab46e210f554759d7e3340598b225ff57739 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Mar 2023 18:14:50 +0000
Subject: [PATCH 266/429] Bump androidx.recyclerview:recyclerview from 1.2.1 to
 1.3.0 (#2145)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9ca1c9d4..1eddaecc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -201,7 +201,7 @@ dependencies {
     implementation "androidx.annotation:annotation:1.6.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.0"
     implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"

From a2a31df98ee4b425c90a7c9a75a7323b28361192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sat, 18 Mar 2023 00:41:45 +0100
Subject: [PATCH 267/429] Fix crash on deserialize parcelable array (#2149)

---
 .../main/java/io/github/wulkanowy/utils/BundleExtension.kt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
index d0d47025..d3c9f800 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/BundleExtension.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.utils
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.os.Parcelable
 import java.io.Serializable
 
 inline fun <reified T : Serializable> Bundle.serializable(key: String): T = when {
@@ -15,10 +16,10 @@ inline fun <reified T : Serializable> Bundle.nullableSerializable(key: String):
     else -> @Suppress("DEPRECATION") getSerializable(key) as T?
 }
 
-@Suppress("DEPRECATION", "UNCHECKED_CAST")
-inline fun <reified T : Serializable> Bundle.parcelableArray(key: String): Array<T>? = when {
+@Suppress("UNCHECKED_CAST")
+inline fun <reified T : Parcelable> Bundle.parcelableArray(key: String): Array<T>? = when {
     Build.VERSION.SDK_INT >= 33 -> getParcelableArray(key, T::class.java)
-    else -> getParcelableArray(key) as Array<T>?
+    else -> @Suppress("DEPRECATION") getParcelableArray(key) as Array<T>?
 }
 
 inline fun <reified T : Serializable> Intent.serializable(key: String): T = when {

From b3c6e2004bd59d80c013236304612c083fe5f6cc Mon Sep 17 00:00:00 2001
From: Michael <5672750+mibac138@users.noreply.github.com>
Date: Sat, 18 Mar 2023 15:10:12 +0100
Subject: [PATCH 268/429] Make GradeAverageProvider reactive to configuration
 changes (#1698)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 .../repositories/PreferencesRepository.kt     |  68 +-
 .../ui/modules/grade/GradeAverageProvider.kt  | 148 ++--
 .../modules/grade/GradeAverageProviderTest.kt | 691 +++++++++++++-----
 3 files changed, 632 insertions(+), 275 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 29a65a96..f6da6a63 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -2,9 +2,11 @@ package io.github.wulkanowy.data.repositories
 
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.annotation.StringRes
 import androidx.core.content.edit
 import com.fredporciuncula.flow.preferences.FlowSharedPreferences
 import com.fredporciuncula.flow.preferences.Preference
+import com.fredporciuncula.flow.preferences.Serializer
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.enums.*
@@ -35,20 +37,29 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_attendance_present
         )
 
-    val gradeAverageMode: GradeAverageMode
-        get() = GradeAverageMode.getByValue(
-            getString(
-                R.string.pref_key_grade_average_mode,
-                R.string.pref_default_grade_average_mode
-            )
+    private val gradeAverageModePref: Preference<GradeAverageMode>
+        get() = getObjectFlow(
+            R.string.pref_key_grade_average_mode,
+            R.string.pref_default_grade_average_mode,
+            object : Serializer<GradeAverageMode> {
+                override fun serialize(value: GradeAverageMode) = value.value
+                override fun deserialize(serialized: String) =
+                    GradeAverageMode.getByValue(serialized)
+            },
         )
 
-    val gradeAverageForceCalc: Boolean
-        get() = getBoolean(
-            R.string.pref_key_grade_average_force_calc,
-            R.bool.pref_default_grade_average_force_calc
+    val gradeAverageModeFlow: Flow<GradeAverageMode>
+        get() = gradeAverageModePref.asFlow()
+
+    private val gradeAverageForceCalcPref: Preference<Boolean>
+        get() = flowSharedPref.getBoolean(
+            context.getString(R.string.pref_key_grade_average_force_calc),
+            context.resources.getBoolean(R.bool.pref_default_grade_average_force_calc)
         )
 
+    val gradeAverageForceCalcFlow: Flow<Boolean>
+        get() = gradeAverageForceCalcPref.asFlow()
+
     val gradeExpandMode: GradeExpandMode
         get() = GradeExpandMode.getByValue(
             getString(
@@ -138,12 +149,24 @@ class PreferencesRepository @Inject constructor(
             R.string.pref_default_grade_modifier_plus
         ).toDouble()
 
+    val gradePlusModifierFlow: Flow<Double>
+        get() = getStringFlow(
+            R.string.pref_key_grade_modifier_plus,
+            R.string.pref_default_grade_modifier_plus
+        ).asFlow().map { it.toDouble() }
+
     val gradeMinusModifier: Double
         get() = getString(
             R.string.pref_key_grade_modifier_minus,
             R.string.pref_default_grade_modifier_minus
         ).toDouble()
 
+    val gradeMinusModifierFlow: Flow<Double>
+        get() = getStringFlow(
+            R.string.pref_key_grade_modifier_minus,
+            R.string.pref_default_grade_modifier_minus
+        ).asFlow().map { it.toDouble() }
+
     val fillMessageContent: Boolean
         get() = getBoolean(
             R.string.pref_key_fill_message_content,
@@ -191,11 +214,11 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_subjects_without_grades
         )
 
-    val isOptionalArithmeticAverage: Boolean
-        get() = getBoolean(
-            R.string.pref_key_optional_arithmetic_average,
-            R.bool.pref_default_optional_arithmetic_average
-        )
+    val isOptionalArithmeticAverageFlow: Flow<Boolean>
+        get() = flowSharedPref.getBoolean(
+            context.getString(R.string.pref_key_optional_arithmetic_average),
+            context.resources.getBoolean(R.bool.pref_default_optional_arithmetic_average)
+        ).asFlow()
 
     var lasSyncDate: Instant?
         get() = getLong(R.string.pref_key_last_sync_date, R.string.pref_default_last_sync_date)
@@ -342,6 +365,21 @@ class PreferencesRepository @Inject constructor(
     private fun getLong(id: String, default: Int) =
         sharedPref.getLong(id, context.resources.getString(default).toLong())
 
+    private fun getStringFlow(id: Int, default: Int) =
+        flowSharedPref.getString(context.getString(id), context.getString(default))
+
+    private fun <T : Any> getObjectFlow(
+        @StringRes id: Int,
+        @StringRes default: Int,
+        serializer: Serializer<T>
+    ): Preference<T> = flowSharedPref.getObject(
+        key = context.getString(id),
+        serializer = serializer,
+        defaultValue = serializer.deserialize(
+            flowSharedPref.getString(context.getString(default)).get()
+        )
+    )
+
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
     private fun getString(id: String, default: Int) =
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index b6733d4f..38bae376 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -12,70 +12,91 @@ import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.*
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
-import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
 import javax.inject.Inject
 
-@OptIn(FlowPreview::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class GradeAverageProvider @Inject constructor(
     private val semesterRepository: SemesterRepository,
     private val gradeRepository: GradeRepository,
     private val preferencesRepository: PreferencesRepository
 ) {
 
-    private val plusModifier get() = preferencesRepository.gradePlusModifier
+    private data class AverageCalcParams(
+        val gradeAverageMode: GradeAverageMode,
+        val forceAverageCalc: Boolean,
+        val isOptionalArithmeticAverage: Boolean,
+        val plusModifier: Double,
+        val minusModifier: Double,
+    )
 
-    private val minusModifier get() = preferencesRepository.gradeMinusModifier
-
-    private val isOptionalArithmeticAverage get() = preferencesRepository.isOptionalArithmeticAverage
-
-    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean) =
+    fun getGradesDetailsWithAverage(
+        student: Student,
+        semesterId: Int,
+        forceRefresh: Boolean
+    ): Flow<Resource<List<GradeSubject>>> = combine(
+        flow = preferencesRepository.gradeAverageModeFlow,
+        flow2 = preferencesRepository.gradeAverageForceCalcFlow,
+        flow3 = preferencesRepository.isOptionalArithmeticAverageFlow,
+        flow4 = preferencesRepository.gradePlusModifierFlow,
+        flow5 = preferencesRepository.gradeMinusModifierFlow,
+    ) { gradeAverageMode, forceAverageCalc, isOptionalArithmeticAverage, plusModifier, minusModifier ->
+        AverageCalcParams(
+            gradeAverageMode = gradeAverageMode,
+            forceAverageCalc = forceAverageCalc,
+            isOptionalArithmeticAverage = isOptionalArithmeticAverage,
+            plusModifier = plusModifier,
+            minusModifier = minusModifier,
+        )
+    }.flatMapLatest { params ->
         flatResourceFlow {
             val semesters = semesterRepository.getSemesters(student)
-
-            when (preferencesRepository.gradeAverageMode) {
+            when (params.gradeAverageMode) {
                 ONE_SEMESTER -> getGradeSubjects(
                     student = student,
                     semester = semesters.single { it.semesterId == semesterId },
-                    forceRefresh = forceRefresh
+                    forceRefresh = forceRefresh,
+                    params = params,
                 )
                 BOTH_SEMESTERS -> calculateCombinedAverage(
                     student = student,
                     semesters = semesters,
                     semesterId = semesterId,
                     forceRefresh = forceRefresh,
-                    averageMode = BOTH_SEMESTERS
+                    config = params,
                 )
                 ALL_YEAR -> calculateCombinedAverage(
                     student = student,
                     semesters = semesters,
                     semesterId = semesterId,
                     forceRefresh = forceRefresh,
-                    averageMode = ALL_YEAR
+                    config = params,
                 )
             }
-        }.distinctUntilChanged()
+        }
+    }
 
     private fun calculateCombinedAverage(
         student: Student,
         semesters: List<Semester>,
         semesterId: Int,
         forceRefresh: Boolean,
-        averageMode: GradeAverageMode
+        config: AverageCalcParams,
     ): Flow<Resource<List<GradeSubject>>> {
-        val isGradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester =
             semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
 
         val selectedSemesterGradeSubjects =
-            getGradeSubjects(student, selectedSemester, forceRefresh)
+            getGradeSubjects(student, selectedSemester, forceRefresh, config)
 
         if (selectedSemester == firstSemester) return selectedSemesterGradeSubjects
 
-        val firstSemesterGradeSubjects = getGradeSubjects(student, firstSemester, forceRefresh)
+        val firstSemesterGradeSubjects =
+            getGradeSubjects(student, firstSemester, forceRefresh, config)
 
         return selectedSemesterGradeSubjects.combine(firstSemesterGradeSubjects) { secondSemesterGradeSubject, firstSemesterGradeSubject ->
             if (firstSemesterGradeSubject.errorOrNull != null) {
@@ -91,21 +112,21 @@ class GradeAverageProvider @Inject constructor(
                 val firstSemesterSubject = firstSemesterGradeSubject.dataOrNull.orEmpty()
                     .singleOrNull { it.subject == secondSemesterSubject.subject }
 
-                val updatedAverage = if (averageMode == ALL_YEAR) {
+                val updatedAverage = if (config.gradeAverageMode == ALL_YEAR) {
                     calculateAllYearAverage(
                         student = student,
                         isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
-                        isGradeAverageForceCalc = isGradeAverageForceCalc,
                         secondSemesterSubject = secondSemesterSubject,
-                        firstSemesterSubject = firstSemesterSubject
+                        firstSemesterSubject = firstSemesterSubject,
+                        config = config,
                     )
                 } else {
                     calculateBothSemestersAverage(
                         student = student,
                         isAnyVulcanAverage = isAnyVulcanAverageInFirstSemester || isAnyVulcanAverageInSecondSemester,
-                        isGradeAverageForceCalc = isGradeAverageForceCalc,
                         secondSemesterSubject = secondSemesterSubject,
-                        firstSemesterSubject = firstSemesterSubject
+                        firstSemesterSubject = firstSemesterSubject,
+                        config = config
                     )
                 }
                 secondSemesterSubject.copy(average = updatedAverage)
@@ -117,17 +138,17 @@ class GradeAverageProvider @Inject constructor(
     private fun calculateAllYearAverage(
         student: Student,
         isAnyVulcanAverage: Boolean,
-        isGradeAverageForceCalc: Boolean,
         secondSemesterSubject: GradeSubject,
-        firstSemesterSubject: GradeSubject?
-    ) = if (!isAnyVulcanAverage || isGradeAverageForceCalc) {
-        val updatedSecondSemesterGrades =
-            secondSemesterSubject.grades.updateModifiers(student)
-        val updatedFirstSemesterGrades =
-            firstSemesterSubject?.grades?.updateModifiers(student).orEmpty()
+        firstSemesterSubject: GradeSubject?,
+        config: AverageCalcParams,
+    ) = if (!isAnyVulcanAverage || config.forceAverageCalc) {
+        val updatedSecondSemesterGrades = secondSemesterSubject.grades
+            .updateModifiers(student, config)
+        val updatedFirstSemesterGrades = firstSemesterSubject?.grades
+            ?.updateModifiers(student, config).orEmpty()
 
         (updatedSecondSemesterGrades + updatedFirstSemesterGrades).calcAverage(
-            isOptionalArithmeticAverage
+            config.isOptionalArithmeticAverage
         )
     } else {
         secondSemesterSubject.average
@@ -136,32 +157,35 @@ class GradeAverageProvider @Inject constructor(
     private fun calculateBothSemestersAverage(
         student: Student,
         isAnyVulcanAverage: Boolean,
-        isGradeAverageForceCalc: Boolean,
         secondSemesterSubject: GradeSubject,
-        firstSemesterSubject: GradeSubject?
-    ): Double = if (!isAnyVulcanAverage || isGradeAverageForceCalc) {
-        val divider = if (secondSemesterSubject.grades.any { it.weightValue > .0 }) 2 else 1
+        firstSemesterSubject: GradeSubject?,
+        config: AverageCalcParams,
+    ): Double {
+        return if (!isAnyVulcanAverage || config.forceAverageCalc) {
+            val divider = if (secondSemesterSubject.grades.any { it.weightValue > .0 }) 2 else 1
+            val secondSemesterAverage = secondSemesterSubject.grades
+                .updateModifiers(student, config)
+                .calcAverage(config.isOptionalArithmeticAverage)
+            val firstSemesterAverage = firstSemesterSubject?.grades
+                ?.updateModifiers(student, config)
+                ?.calcAverage(config.isOptionalArithmeticAverage) ?: secondSemesterAverage
 
-        val secondSemesterAverage = secondSemesterSubject.grades.updateModifiers(student)
-            .calcAverage(isOptionalArithmeticAverage)
-        val firstSemesterAverage = firstSemesterSubject?.grades?.updateModifiers(student)
-            ?.calcAverage(isOptionalArithmeticAverage) ?: secondSemesterAverage
+            (secondSemesterAverage + firstSemesterAverage) / divider
+        } else {
+            val divider = if (secondSemesterSubject.average > 0) 2 else 1
 
-        (secondSemesterAverage + firstSemesterAverage) / divider
-    } else {
-        val divider = if (secondSemesterSubject.average > 0) 2 else 1
-
-        (secondSemesterSubject.average + (firstSemesterSubject?.average
-            ?: secondSemesterSubject.average)) / divider
+            secondSemesterSubject.average.plus(
+                (firstSemesterSubject?.average ?: secondSemesterSubject.average)
+            ) / divider
+        }
     }
 
     private fun getGradeSubjects(
         student: Student,
         semester: Semester,
-        forceRefresh: Boolean
+        forceRefresh: Boolean,
+        params: AverageCalcParams,
     ): Flow<Resource<List<GradeSubject>>> {
-        val isGradeAverageForceCalc = preferencesRepository.gradeAverageForceCalc
-
         return gradeRepository.getGrades(student, semester, forceRefresh = forceRefresh)
             .mapResourceData { res ->
                 val (details, summaries) = res
@@ -172,13 +196,15 @@ class GradeAverageProvider @Inject constructor(
                     student = student,
                     semester = semester,
                     grades = allGrades.toList(),
-                    calcAverage = isAnyAverage
+                    calcAverage = isAnyAverage,
+                    params = params,
                 ).map { summary ->
                     val grades = allGrades[summary.subject].orEmpty()
                     GradeSubject(
                         subject = summary.subject,
-                        average = if (!isAnyAverage || isGradeAverageForceCalc) {
-                            grades.updateModifiers(student).calcAverage(isOptionalArithmeticAverage)
+                        average = if (!isAnyAverage || params.forceAverageCalc) {
+                            grades.updateModifiers(student, params)
+                                .calcAverage(params.isOptionalArithmeticAverage)
                         } else summary.average,
                         points = summary.pointsSum,
                         summary = summary,
@@ -195,7 +221,8 @@ class GradeAverageProvider @Inject constructor(
         student: Student,
         semester: Semester,
         grades: List<Pair<String, List<Grade>>>,
-        calcAverage: Boolean
+        calcAverage: Boolean,
+        params: AverageCalcParams,
     ): List<GradeSummary> {
         if (isNotEmpty() && size > grades.size) return this
 
@@ -211,15 +238,16 @@ class GradeAverageProvider @Inject constructor(
                 proposedPoints = "",
                 finalPoints = "",
                 pointsSum = "",
-                average = if (calcAverage) details.updateModifiers(student)
-                    .calcAverage(isOptionalArithmeticAverage) else .0
+                average = if (calcAverage) details.updateModifiers(student, params)
+                    .calcAverage(params.isOptionalArithmeticAverage) else .0
             )
         }
     }
 
-    private fun List<Grade>.updateModifiers(student: Student): List<Grade> {
-        return if (student.loginMode == Sdk.Mode.SCRAPPER.name) {
-            map { it.changeModifier(plusModifier, minusModifier) }
-        } else this
-    }
+    private fun List<Grade>.updateModifiers(
+        student: Student,
+        params: AverageCalcParams,
+    ): List<Grade> = if (student.loginMode == Sdk.Mode.SCRAPPER.name) {
+        map { it.changeModifier(params.plusModifier, params.minusModifier) }
+    } else this
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index a6ecdc26..10c84efc 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -1,14 +1,12 @@
 package io.github.wulkanowy.ui.modules.grade
 
-import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.dataOrNull
+import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.GradeRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
-import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.getSemesterEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.Status
@@ -20,6 +18,7 @@ import io.mockk.impl.annotations.MockK
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
@@ -31,7 +30,9 @@ import java.time.LocalDate.of
 
 class GradeAverageProviderTest {
 
-    private suspend fun <T> Flow<Resource<T>>.getResult() = toList()[1].dataOrNull!!
+    private suspend fun <T> Flow<Resource<T>>.getResult() = toFirstResult().let {
+        it.dataOrNull ?: throw it.errorOrNull ?: error("Unknown state")
+    }
 
     @MockK
     lateinit var preferencesRepository: PreferencesRepository
@@ -133,19 +134,23 @@ class GradeAverageProviderTest {
     fun setUp() {
         MockKAnnotations.init(this)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
+        every { preferencesRepository.gradeMinusModifierFlow } returns flowOf(.33)
+        every { preferencesRepository.gradePlusModifierFlow } returns flowOf(.33)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
 
-        gradeAverageProvider = GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
+        gradeAverageProvider =
+            GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
     }
 
     @Test
     fun `calc current semester standard average with no weights`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -154,16 +159,26 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { noWeightGrades to noWeightGradesSummary }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(0.0, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 0,0
+        assertEquals(
+            0.0,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // from summary: 0,0
     }
 
     @Test
     fun `calc current semester arithmetic average with no weights`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(true)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -172,16 +187,26 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { noWeightGrades to noWeightGradesArithmeticSummary }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(4.0, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 4,0
+        assertEquals(
+            4.0,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // from summary: 4,0
     }
 
     @Test
     fun `calc current semester average with load from cache sequence`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flow {
             emit(Resource.Loading())
@@ -189,7 +214,13 @@ class GradeAverageProviderTest {
             emit(Resource.Success(secondGradeWithModifier to secondSummariesWithModifier))
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).toList() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).toList()
+        }
 
         with(items[0]) {
             assertEquals(Status.LOADING, status)
@@ -204,14 +235,18 @@ class GradeAverageProviderTest {
             assertEquals(1, dataOrNull?.size)
         }
 
-        assertEquals(3.5, items[1].dataOrNull?.single { it.subject == "Język polski" }?.average ?: 0.0, .0) // from details and after set custom plus/minus
+        assertEquals(
+            3.5,
+            items[1].dataOrNull?.single { it.subject == "Język polski" }?.average ?: 0.0,
+            .0
+        ) // from details and after set custom plus/minus
     }
 
     @Test
-    fun `calc all year semester average with delayed emit`(){
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+    fun `calc all year semester average with delayed emit`() {
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
 
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[2], false) } returns flow {
@@ -224,7 +259,13 @@ class GradeAverageProviderTest {
             emit(Resource.Success(secondGradeWithModifier to secondSummariesWithModifier))
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, false).toList() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                false
+            ).toList()
+        }
 
         with(items[0]) {
             assertEquals(Status.LOADING, status)
@@ -235,14 +276,18 @@ class GradeAverageProviderTest {
             assertEquals(1, dataOrNull?.size)
         }
 
-        assertEquals(3.5, items[1].dataOrNull?.single { it.subject == "Język polski" }?.average ?: 0.0, .0) // from details and after set custom plus/minus
+        assertEquals(
+            3.5,
+            items[1].dataOrNull?.single { it.subject == "Język polski" }?.average ?: 0.0,
+            .0
+        ) // from details and after set custom plus/minus
     }
 
     @Test
     fun `calc both semesters average with grade without grade in second semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
 
         coEvery {
             gradeRepository.getGrades(
@@ -251,7 +296,13 @@ class GradeAverageProviderTest {
                 false
             )
         } returns resourceFlow { secondGradeWithModifier to secondSummariesWithModifier }
-        coEvery { gradeRepository.getGrades(student, semesters[2], false) } returns resourceFlow {
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                false
+            )
+        } returns resourceFlow {
             listOf(getGrade(semesters[2].semesterId, "Język polski", .0, .0, .0)) to listOf(
                 getSummary(semesters[2].semesterId, "Język polski", 2.5)
             )
@@ -270,9 +321,9 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc both semesters average with no grade in second semester but with average in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
 
         coEvery {
             gradeRepository.getGrades(
@@ -287,7 +338,15 @@ class GradeAverageProviderTest {
                 semesters[2],
                 false
             )
-        } returns resourceFlow { emptyList<Grade>() to listOf(getSummary(24, "Język polski", .0)) }
+        } returns resourceFlow {
+            emptyList<Grade>() to listOf(
+                getSummary(
+                    24,
+                    "Język polski",
+                    .0
+                )
+            )
+        }
 
         val items = runBlocking {
             gradeAverageProvider.getGradesDetailsWithAverage(
@@ -302,9 +361,9 @@ class GradeAverageProviderTest {
 
     @Test
     fun `force calc average on no grades`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
 
         coEvery {
             gradeRepository.getGrades(
@@ -334,9 +393,9 @@ class GradeAverageProviderTest {
 
     @Test
     fun `force calc current semester average with default modifiers in scraper mode`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery {
             gradeRepository.getGrades(
@@ -346,21 +405,31 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { secondGradeWithModifier to secondSummariesWithModifier }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
+        assertEquals(
+            3.5,
+            items.single { it.subject == "Język polski" }.average,
+            .0
+        ) // from details and after set custom plus/minus
     }
 
     @Test
     fun `force calc current semester average with custom modifiers in scraper mode`() {
         val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .33
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeMinusModifierFlow } returns flowOf(.33)
+        every { preferencesRepository.gradePlusModifierFlow } returns flowOf(.33)
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery {
             gradeRepository.getGrades(
@@ -370,21 +439,31 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { secondGradeWithModifier to secondSummariesWithModifier }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
+        assertEquals(
+            3.5,
+            items.single { it.subject == "Język polski" }.average,
+            .0
+        ) // from details and after set custom plus/minus
     }
 
     @Test
     fun `force calc current semester average with custom modifiers in api mode`() {
         val student = student.copy(loginMode = Sdk.Mode.API.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeMinusModifier } returns .33  // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeMinusModifierFlow } returns flowOf(.33)  // useless in this mode
+        every { preferencesRepository.gradePlusModifierFlow } returns flowOf(.33)
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery {
             gradeRepository.getGrades(
@@ -394,21 +473,31 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { secondGradeWithModifier to secondSummariesWithModifier }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(
+            3.375,
+            items.single { it.subject == "Język polski" }.average,
+            .0
+        ) // (from details): 3.375
     }
 
     @Test
     fun `force calc current semester average with custom modifiers in hybrid mode`() {
         val student = student.copy(loginMode = Sdk.Mode.HYBRID.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeMinusModifier } returns .33 // useless in this mode
-        every { preferencesRepository.gradePlusModifier } returns .33
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeMinusModifierFlow } returns flowOf(.33) // useless in this mode
+        every { preferencesRepository.gradePlusModifierFlow } returns flowOf(.33)
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery {
             gradeRepository.getGrades(
@@ -418,16 +507,26 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { secondGradeWithModifier to secondSummariesWithModifier }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
+        assertEquals(
+            3.375,
+            items.single { it.subject == "Język polski" }.average,
+            .0
+        ) // (from details): 3.375
     }
 
     @Test
     fun `calc current semester average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -436,18 +535,28 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { secondGrades to secondSummaries }
 
-        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(2.9, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 2,9
+        assertEquals(
+            2.9,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // from summary: 2,9
         assertEquals(3.4, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,4
     }
 
     @Test
     fun `force calc current semester average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ONE_SEMESTER)
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -456,18 +565,28 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { secondGrades to secondSummaries }
 
-        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(2.5, items.single { it.subject == "Matematyka" }.average, .0) // from details: 2,5
+        assertEquals(
+            2.5,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // from details: 2,5
         assertEquals(3.0, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,0
     }
 
     @Test
     fun `force calc full year average when current is first`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -476,18 +595,32 @@ class GradeAverageProviderTest {
             )
         } returns resourceFlow { firstGrades to firstSummaries }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[1].semesterId,
+                true
+            ).getResult()
+        }
 
         assertEquals(2, items.size)
-        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summary): 3,5
-        assertEquals(3.5, items.single { it.subject == "Fizyka" }.average, .0) // (from summary): 3,5
+        assertEquals(
+            3.5,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // (from summary): 3,5
+        assertEquals(
+            3.5,
+            items.single { it.subject == "Fizyka" }.average,
+            .0
+        ) // (from summary): 3,5
     }
 
     @Test
     fun `calc full year average when current is first with load from cache sequence`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
             emit(Resource.Loading())
@@ -495,7 +628,13 @@ class GradeAverageProviderTest {
             emit(Resource.Success(firstGrades to firstSummaries))
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId, true).toList() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[1].semesterId,
+                true
+            ).toList()
+        }
 
         with(items[0]) {
             assertEquals(Status.LOADING, status)
@@ -511,40 +650,74 @@ class GradeAverageProviderTest {
         }
 
         assertEquals(2, items[2].dataOrNull?.size)
-        assertEquals(3.5, items[2].dataOrNull?.single { it.subject == "Matematyka" }?.average ?: 0.0, .0) // (from summary): 3,5
-        assertEquals(3.5, items[2].dataOrNull?.single { it.subject == "Fizyka" }?.average ?: 0.0, .0) // (from summary): 3,5
+        assertEquals(
+            3.5,
+            items[2].dataOrNull?.single { it.subject == "Matematyka" }?.average ?: 0.0,
+            .0
+        ) // (from summary): 3,5
+        assertEquals(
+            3.5,
+            items[2].dataOrNull?.single { it.subject == "Fizyka" }?.average ?: 0.0,
+            .0
+        ) // (from summary): 3,5
     }
 
     @Test
     fun `calc both semesters average`() {
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns resourceFlow {
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[1],
+                true
+            )
+        } returns resourceFlow {
             firstGrades to listOf(
                 getSummary(22, "Matematyka", 3.0),
                 getSummary(22, "Fizyka", 3.5)
             )
         }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns resourceFlow {
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                true
+            )
+        } returns resourceFlow {
             secondGrades to listOf(
                 getSummary(22, "Matematyka", 3.5),
                 getSummary(22, "Fizyka", 4.0)
             )
         }
 
-        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.25, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 3,0 + 3,5 → 3,25
-        assertEquals(3.75, items.single { it.subject == "Fizyka" }.average, .0) // (from summaries ↑): 3,5 + 4,0 → 3,75
+        assertEquals(
+            3.25,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // (from summaries ↑): 3,0 + 3,5 → 3,25
+        assertEquals(
+            3.75,
+            items.single { it.subject == "Fizyka" }.average,
+            .0
+        ) // (from summaries ↑): 3,5 + 4,0 → 3,75
     }
 
     @Test
     fun `calc both semesters average when current is second with load from cache sequence`() {
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
             emit(Resource.Loading())
             emit(
@@ -584,7 +757,13 @@ class GradeAverageProviderTest {
             )
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).toList() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).toList()
+        }
 
         with(items[0]) {
             assertEquals(Status.LOADING, status)
@@ -600,15 +779,23 @@ class GradeAverageProviderTest {
         }
 
         assertEquals(2, items[2].dataOrNull?.size)
-        assertEquals(3.25, items[2].dataOrNull?.single { it.subject == "Matematyka" }?.average ?: 0.0, .0) // (from summaries ↑): 3,0 + 3,5 → 3,25
-        assertEquals(3.75, items[2].dataOrNull?.single { it.subject == "Fizyka" }?.average ?: 0.0, .0) // (from summaries ↑): 3,5 + 4,0 → 3,75
+        assertEquals(
+            3.25,
+            items[2].dataOrNull?.single { it.subject == "Matematyka" }?.average ?: 0.0,
+            .0
+        ) // (from summaries ↑): 3,0 + 3,5 → 3,25
+        assertEquals(
+            3.75,
+            items[2].dataOrNull?.single { it.subject == "Fizyka" }?.average ?: 0.0,
+            .0
+        ) // (from summaries ↑): 3,5 + 4,0 → 3,75
     }
 
     @Test
     fun `force calc full year average`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -616,7 +803,13 @@ class GradeAverageProviderTest {
                 true
             )
         } returns resourceFlow { firstGrades to firstSummaries }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns resourceFlow {
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                true
+            )
+        } returns resourceFlow {
             secondGrades to listOf(
                 getSummary(22, "Matematyka", 1.1),
                 getSummary(22, "Fizyka", 7.26)
@@ -646,9 +839,9 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc all year average`() {
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -689,9 +882,9 @@ class GradeAverageProviderTest {
 
     @Test
     fun `force calc full year average when current is second with load from cache sequence`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
             emit(Resource.Loading())
@@ -718,7 +911,13 @@ class GradeAverageProviderTest {
             )
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).toList() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).toList()
+        }
 
         with(items[0]) {
             assertEquals(Status.LOADING, status)
@@ -734,15 +933,23 @@ class GradeAverageProviderTest {
         }
 
         assertEquals(2, items[2].dataOrNull?.size)
-        assertEquals(3.0, items[2].dataOrNull?.single { it.subject == "Matematyka" }?.average ?: 0.0, .0) // (from details): 3,5 + 2,5 → 3,0
-        assertEquals(3.25, items[2].dataOrNull?.single { it.subject == "Fizyka" }?.average ?: 0.0, .0) // (from details): 3,5  + 3,0 → 3,25
+        assertEquals(
+            3.0,
+            items[2].dataOrNull?.single { it.subject == "Matematyka" }?.average ?: 0.0,
+            .0
+        ) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(
+            3.25,
+            items[2].dataOrNull?.single { it.subject == "Fizyka" }?.average ?: 0.0,
+            .0
+        ) // (from details): 3,5  + 3,0 → 3,25
     }
 
     @Test
     fun `force calc both semesters average when no summaries`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
 
         coEvery {
             gradeRepository.getGrades(
@@ -773,14 +980,18 @@ class GradeAverageProviderTest {
             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
+        assertEquals(
+            3.25,
+            items.single { it.subject == "Fizyka" }.average,
+            .0
+        ) // (from details): 3,5 + 3,0 → 3,25
     }
 
     @Test
     fun `force calc full year average when no summaries`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
 
         coEvery {
             gradeRepository.getGrades(
@@ -820,33 +1031,59 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc both semesters average when missing summaries in both semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
 
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns resourceFlow {
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[1],
+                true
+            )
+        } returns resourceFlow {
             firstGrades to listOf(
                 getSummary(22, "Matematyka", 4.0)
             )
         }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns resourceFlow {
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                true
+            )
+        } returns resourceFlow {
             secondGrades to listOf(
                 getSummary(23, "Matematyka", 3.0)
             )
         }
 
-        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.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 4,0 + 3,0 → 3,5
-        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
+        assertEquals(
+            3.5,
+            items.single { it.subject == "Matematyka" }.average,
+            .0
+        ) // (from summaries ↑): 4,0 + 3,0 → 3,5
+        assertEquals(
+            3.25,
+            items.single { it.subject == "Fizyka" }.average,
+            .0
+        ) // (from details): 3,5  + 3,0 → 3,25
     }
 
     @Test
     fun `calc both semesters average when missing summary in second semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
 
         coEvery {
             gradeRepository.getGrades(
@@ -886,9 +1123,9 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc both semesters average when missing summary in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
 
         coEvery {
             gradeRepository.getGrades(
@@ -928,9 +1165,9 @@ class GradeAverageProviderTest {
 
     @Test
     fun `force calc full year average when missing summary in first semester`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
 
         coEvery {
             gradeRepository.getGrades(
@@ -970,11 +1207,17 @@ class GradeAverageProviderTest {
 
     @Test
     fun `force calc both semesters average with different average from all grades and from two semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
 
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns resourceFlow {
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[1],
+                true
+            )
+        } returns resourceFlow {
             listOf(
                 getGrade(22, "Fizyka", 5.0, weight = 2.0),
                 getGrade(22, "Fizyka", 6.0, weight = 2.0),
@@ -986,7 +1229,13 @@ class GradeAverageProviderTest {
                 getGrade(22, "Fizyka", 6.0, weight = 2.0)
             ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
         }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns resourceFlow {
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                true
+            )
+        } returns resourceFlow {
             listOf(
                 getGrade(23, "Fizyka", 5.0, weight = 1.0),
                 getGrade(23, "Fizyka", 5.0, weight = 2.0),
@@ -994,16 +1243,26 @@ class GradeAverageProviderTest {
             ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(5.2296, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → 5.229636363636364
+        assertEquals(
+            5.2296,
+            items.single { it.subject == "Fizyka" }.average,
+            .0001
+        ) // (from details): 5.72727272 + 4,732 → 5.229636363636364
     }
 
     @Test
     fun `force calc full year average with different average from all grades and from two semesters`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns resourceFlow {
             listOf(
@@ -1025,58 +1284,31 @@ class GradeAverageProviderTest {
             ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
         }
 
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
 
-        assertEquals(5.5429, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → .average()
+        assertEquals(
+            5.5429,
+            items.single { it.subject == "Fizyka" }.average,
+            .0001
+        ) // (from details): 5.72727272 + 4,732 → .average()
     }
 
     @Test
     fun `force calc both semesters average with different average from all grades and from two semesters with custom modifiers`() {
         val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
 
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .5
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeMinusModifierFlow } returns flowOf(.33)
+        every { preferencesRepository.gradePlusModifierFlow } returns flowOf(.5)
 
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        coEvery { semesterRepository.getSemesters(student) } returns semesters
-
-        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns resourceFlow {
-            listOf(
-                getGrade(22, "Fizyka", 5.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 5.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 4.0),
-                getGrade(22, "Fizyka", 6.0, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
-        }
-        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns resourceFlow {
-            listOf(
-                getGrade(23, "Fizyka", 5.0, weight = 1.0),
-                getGrade(23, "Fizyka", 5.0, weight = 2.0),
-                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
-            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
-        }
-
-        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
-
-        assertEquals(5.2636, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,8 → 5.26363636
-    }
-
-    @Test
-    fun `force calc full year average with different average from all grades and from two semesters with custom modifiers`() {
-        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
-
-        every { preferencesRepository.gradeAverageForceCalc } returns true
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
-        every { preferencesRepository.gradeMinusModifier } returns .33
-        every { preferencesRepository.gradePlusModifier } returns .5
-
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
         coEvery { semesterRepository.getSemesters(student) } returns semesters
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns resourceFlow {
@@ -1107,6 +1339,65 @@ class GradeAverageProviderTest {
             ).getResult()
         }
 
+        assertEquals(
+            5.2636,
+            items.single { it.subject == "Fizyka" }.average,
+            .0001
+        ) // (from details): 5.72727272 + 4,8 → 5.26363636
+    }
+
+    @Test
+    fun `force calc full year average with different average from all grades and from two semesters with custom modifiers`() {
+        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
+        every { preferencesRepository.gradeMinusModifierFlow } returns flowOf(.33)
+        every { preferencesRepository.gradePlusModifierFlow } returns flowOf(.5)
+
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.ALL_YEAR)
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[1],
+                true
+            )
+        } returns resourceFlow {
+            listOf(
+                getGrade(22, "Fizyka", 5.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 5.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
+        }
+        coEvery {
+            gradeRepository.getGrades(
+                student,
+                semesters[2],
+                true
+            )
+        } returns resourceFlow {
+            listOf(
+                getGrade(23, "Fizyka", 5.0, weight = 1.0),
+                getGrade(23, "Fizyka", 5.0, weight = 2.0),
+                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
+        }
+
+        val items = runBlocking {
+            gradeAverageProvider.getGradesDetailsWithAverage(
+                student,
+                semesters[2].semesterId,
+                true
+            ).getResult()
+        }
+
         assertEquals(
             5.5555,
             items.single { it.subject == "Fizyka" }.average,
@@ -1116,20 +1407,20 @@ class GradeAverageProviderTest {
 
     @Test
     fun `calc both semesters average when both summary have same average from vulcan and second semester has no grades`() {
-        every { preferencesRepository.gradeAverageForceCalc } returns false
-        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
-        every { preferencesRepository.isOptionalArithmeticAverage } returns false
+        every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(false)
+        every { preferencesRepository.gradeAverageModeFlow } returns flowOf(GradeAverageMode.BOTH_SEMESTERS)
+        every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns
-                resourceFlow { firstGrades to firstSummaries }
+            resourceFlow { firstGrades to firstSummaries }
         coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns
             resourceFlow { listOf<Grade>() to firstSummaries }
 
         val items = runBlocking {
             gradeAverageProvider.getGradesDetailsWithAverage(
-                student,
-                semesters[2].semesterId,
-                true
+                student = student,
+                semesterId = semesters[2].semesterId,
+                forceRefresh = true,
             ).getResult()
         }
 

From 220395622874c4115f39ff463b77dcfe0c23266f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 02:25:26 +0000
Subject: [PATCH 269/429] Bump androidx.lifecycle:lifecycle-livedata-ktx from
 2.6.0 to 2.6.1 (#2156)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1eddaecc..1d7a3bb8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -214,7 +214,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"

From 597d1d763e96d3523a549adbbdb344cbbe2aca8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 02:25:50 +0000
Subject: [PATCH 270/429] Bump androidx.activity:activity-ktx from 1.6.1 to
 1.7.0 (#2155)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1d7a3bb8..55ef9cb0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,7 +195,7 @@ dependencies {
 
     implementation "androidx.core:core-ktx:1.9.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
-    implementation "androidx.activity:activity-ktx:1.6.1"
+    implementation "androidx.activity:activity-ktx:1.7.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.5.5"
     implementation "androidx.annotation:annotation:1.6.0"

From 6398c9a09754bdc443231bc6a1a2844777141e84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 02:26:39 +0000
Subject: [PATCH 271/429] Bump io.coil-kt:coil from 2.2.2 to 2.3.0 (#2153)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 55ef9cb0..64414ff1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -236,7 +236,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.2.2"
+    implementation "io.coil-kt:coil:2.3.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.9.0'

From 97a7b34b99abd4d06b444ec2fe7abc4abcea7fdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 02:27:20 +0000
Subject: [PATCH 272/429] Bump com.google.firebase:firebase-bom from 31.2.3 to
 31.4.0 (#2151)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 64414ff1..cce704dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.2.3')
+    playImplementation platform('com.google.firebase:firebase-bom:31.4.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 9afb38d5e2286a598686344f2f349891dfa9e310 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 02:33:48 +0000
Subject: [PATCH 273/429] Bump room from 2.5.0 to 2.5.1 (#2150)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index cce704dd..fdf6fad5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ huaweiPublish {
 ext {
     work_manager = "2.8.0"
     android_hilt = "1.0.0"
-    room = "2.5.0"
+    room = "2.5.1"
     chucker = "3.5.2"
     mockk = "1.13.4"
     coroutines = "1.6.4"

From a1b9ae2826947583bb2d00126a7437506560869a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 02:35:15 +0000
Subject: [PATCH 274/429] Bump work_manager from 2.8.0 to 2.8.1 (#2152)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index fdf6fad5..ce7927bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -177,7 +177,7 @@ huaweiPublish {
 }
 
 ext {
-    work_manager = "2.8.0"
+    work_manager = "2.8.1"
     android_hilt = "1.0.0"
     room = "2.5.1"
     chucker = "3.5.2"

From 9981f458d00f481bcaf17742a02cc0537912a0fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 02:39:18 +0000
Subject: [PATCH 275/429] Bump androidx.fragment:fragment-ktx from 1.5.5 to
 1.5.6 (#2154)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ce7927bb..3fd11ccc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,7 +197,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.7.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.5"
+    implementation "androidx.fragment:fragment-ktx:1.5.6"
     implementation "androidx.annotation:annotation:1.6.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From 349307b6a3f186d3baa952cc8e1c977c9b6a049d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 29 Mar 2023 09:50:36 +0200
Subject: [PATCH 276/429] Remove deprecated code (#2157)

---
 .../wulkanowy/services/sync/SyncManager.kt    |  12 +++---------
 gradle/wrapper/gradle-wrapper.jar             | Bin 59821 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties      |   3 ++-
 gradlew                                       |  18 ++++++++++++++----
 gradlew.bat                                   |  15 +++++++++------
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index c1bed4dd..e0a136f9 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -4,18 +4,12 @@ import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.O
 import androidx.core.app.NotificationManagerCompat
 import androidx.lifecycle.asFlow
+import androidx.work.*
 import androidx.work.BackoffPolicy.EXPONENTIAL
-import androidx.work.Constraints
-import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy.KEEP
-import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
-import androidx.work.ExistingWorkPolicy
+import androidx.work.ExistingPeriodicWorkPolicy.UPDATE
 import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
-import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.PreferencesRepository
@@ -60,7 +54,7 @@ class SyncManager @Inject constructor(
             val serviceInterval = preferencesRepository.servicesInterval
 
             workManager.enqueueUniquePeriodicWork(
-                SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
+                SyncWorker::class.java.simpleName, if (restart) UPDATE else KEEP,
                 PeriodicWorkRequestBuilder<SyncWorker>(serviceInterval, MINUTES)
                     .setInitialDelay(10, MINUTES)
                     .setBackoffCriteria(EXPONENTIAL, 30, MINUTES)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 36987
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

delta 35297
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f42e62f3..e8be595e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c7873..65dcd68d 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..6689b85b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From bb7e927065446a9e4b7d6ded4736ec61485fdba3 Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Wed, 29 Mar 2023 22:14:29 +0200
Subject: [PATCH 277/429] Migrate to material3 (#1660)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Rafał Borcz <RafalBO99@outlook.com>
Co-authored-by: doteq <doteeqq@gmail.com>
Co-authored-by: Bartosz Bieniek <itsbk20@gmail.com>
---
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   2 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../repositories/PreferencesRepository.kt     |   7 -
 .../data/repositories/TimetableRepository.kt  |   6 +
 .../widgets/TimetableWidgetService.kt         |   8 +-
 .../github/wulkanowy/ui/base/BaseActivity.kt  |  15 +-
 .../wulkanowy/ui/base/BaseDialogFragment.kt   |  19 +
 .../github/wulkanowy/ui/base/ErrorDialog.kt   |  45 +--
 .../github/wulkanowy/ui/base/ThemeManager.kt  |  17 +-
 .../wulkanowy/ui/modules/Destination.kt       |   8 +
 .../accountdetails/AccountDetailsFragment.kt  |   3 +-
 .../account/accountedit/AccountEditDialog.kt  |  18 +-
 .../accountquick/AccountQuickDialog.kt        |  22 +-
 .../ui/modules/attendance/AttendanceDialog.kt |  24 +-
 .../modules/attendance/AttendanceFragment.kt  |   6 +-
 .../ui/modules/conference/ConferenceDialog.kt |  24 +-
 .../ui/modules/dashboard/DashboardFragment.kt |   3 +-
 .../adapters/DashboardGradesAdapter.kt        |   6 +-
 .../wulkanowy/ui/modules/exam/ExamDialog.kt   |  24 +-
 .../wulkanowy/ui/modules/exam/ExamFragment.kt |   2 +-
 .../ui/modules/grade/GradeFragment.kt         |   3 +-
 .../grade/details/GradeDetailsAdapter.kt      |   8 +-
 .../grade/details/GradeDetailsDialog.kt       |  40 ++-
 .../grade/summary/GradeSummaryFragment.kt     |   5 +-
 .../ui/modules/homework/HomeworkFragment.kt   |   2 +-
 .../modules/homework/add/HomeworkAddDialog.kt |  19 +-
 .../details/HomeworkDetailsAdapter.kt         |  18 -
 .../homework/details/HomeworkDetailsDialog.kt |  32 +-
 .../details/HomeworkDetailsPresenter.kt       |   8 -
 .../history/LuckyNumberHistoryFragment.kt     |   2 +-
 .../LuckyNumberWidgetConfigureActivity.kt     |  23 +-
 .../LuckyNumberWidgetConfigurePresenter.kt    |  17 +-
 .../LuckyNumberWidgetConfigureView.kt         |   2 -
 .../LuckyNumberWidgetProvider.kt              | 196 +++++------
 .../wulkanowy/ui/modules/main/MainActivity.kt |  38 +-
 .../ui/modules/main/MainPresenter.kt          |  11 -
 .../wulkanowy/ui/modules/main/MainView.kt     |   2 -
 .../mailboxchooser/MailboxChooserDialog.kt    |  20 +-
 .../message/send/SendMessageActivity.kt       |  27 +-
 .../modules/message/tab/MessageTabAdapter.kt  |  15 +-
 .../token/MobileDeviceTokenDialog.kt          |  19 +-
 .../wulkanowy/ui/modules/note/NoteDialog.kt   |  24 +-
 .../notifications/NotificationsFragment.kt    |   4 +-
 .../SchoolAnnouncementDialog.kt               |  27 +-
 .../notifications/NotificationsFragment.kt    |  10 +-
 .../ui/modules/settings/sync/SyncFragment.kt  |   7 +-
 .../ui/modules/timetable/TimetableAdapter.kt  |   8 +-
 .../ui/modules/timetable/TimetableDialog.kt   |  27 +-
 .../ui/modules/timetable/TimetableFragment.kt |   2 +-
 .../additional/AdditionalLessonsFragment.kt   |  12 +-
 .../add/AdditionalLessonAddDialog.kt          |  20 +-
 .../completed/CompletedLessonDialog.kt        |  26 +-
 .../completed/CompletedLessonsFragment.kt     |  13 +-
 .../TimetableWidgetConfigureActivity.kt       |  27 --
 .../TimetableWidgetConfigurePresenter.kt      |  19 +-
 .../TimetableWidgetConfigureView.kt           |   2 -
 .../timetablewidget/TimetableWidgetFactory.kt | 328 ++++++++----------
 .../TimetableWidgetProvider.kt                | 161 ++++-----
 .../wulkanowy/utils/LifecycleAwareVariable.kt |  13 +-
 .../io/github/wulkanowy/utils/RefreshUtils.kt |   5 +
 .../drawable-night/background_header_note.xml |   5 -
 .../background_grade_details_rounded.xml      |   5 +
 ...ackground_grade_details_weight_rounded.xml |   5 +
 ..._dark.xml => background_grade_rounded.xml} |   4 +-
 ...xml => background_grade_small_rounded.xml} |   6 +-
 .../res/drawable/background_header_note.xml   |   2 +-
 ... background_luckynumber_widget_button.xml} |   4 +-
 .../background_luckynumber_widget_dark.xml    |   6 -
 .../background_material_alert_dialog.xml      |  26 ++
 .../background_timetable_widget_avatar.xml    |   6 +
 .../background_widget_header_timetable.xml    |   7 -
 ...ackground_widget_header_timetable_dark.xml |   7 -
 .../background_widget_item_timetable.xml      |   6 +-
 .../drawable/background_widget_timetable.xml  |   6 +-
 app/src/main/res/drawable/ic_chevron_left.xml |  13 +-
 .../main/res/drawable/ic_chevron_right.xml    |  13 +-
 app/src/main/res/drawable/ic_history.xml      |   9 +
 .../main/res/drawable/ic_scale_balance.xml    |   7 +
 .../res/drawable/ic_timetable_widget_swap.xml |   9 +
 .../main/res/drawable/ic_widget_chevron.png   | Bin 130 -> 0 bytes
 .../main/res/drawable/ic_widget_chevron.xml   |   9 +
 .../img_luckynumber_widget_preview.png        | Bin 19550 -> 3702 bytes
 .../drawable/img_timetable_widget_preview.png | Bin 25538 -> 21111 bytes
 app/src/main/res/drawable/shape_badge.xml     |   9 +
 .../layout-v31/widget_timetable_preview.xml   |  96 +++++
 app/src/main/res/layout/activity_main.xml     |  19 +-
 .../main/res/layout/activity_send_message.xml |  24 +-
 .../main/res/layout/dialog_account_edit.xml   |  31 +-
 .../main/res/layout/dialog_account_quick.xml  |   2 +-
 .../main/res/layout/dialog_additional_add.xml | 115 +++---
 .../main/res/layout/dialog_ads_consent.xml    |   2 +-
 app/src/main/res/layout/dialog_attendance.xml |  58 ++--
 app/src/main/res/layout/dialog_conference.xml |  68 ++--
 app/src/main/res/layout/dialog_exam.xml       |  68 ++--
 app/src/main/res/layout/dialog_excuse.xml     |   2 +-
 app/src/main/res/layout/dialog_grade.xml      | 105 +++---
 app/src/main/res/layout/dialog_homework.xml   |  97 +++---
 .../main/res/layout/dialog_homework_add.xml   | 115 +++---
 .../res/layout/dialog_lesson_completed.xml    |  78 ++---
 .../main/res/layout/dialog_mobile_device.xml  |  19 +-
 app/src/main/res/layout/dialog_note.xml       |  71 ++--
 .../res/layout/dialog_school_announcement.xml |  53 ++-
 app/src/main/res/layout/dialog_timetable.xml  |  95 ++---
 .../res/layout/fragment_account_details.xml   |   4 +-
 .../main/res/layout/fragment_attendance.xml   |   3 +-
 .../layout/fragment_attendance_summary.xml    |   2 +-
 .../main/res/layout/fragment_conference.xml   |   2 +-
 .../main/res/layout/fragment_contributor.xml  |   2 +-
 .../main/res/layout/fragment_dashboard.xml    |   2 +-
 app/src/main/res/layout/fragment_exam.xml     |   2 +-
 app/src/main/res/layout/fragment_grade.xml    |   3 +-
 .../res/layout/fragment_grade_details.xml     |   2 +-
 .../res/layout/fragment_grade_statistics.xml  |   2 +-
 .../res/layout/fragment_grade_summary.xml     |   2 +-
 app/src/main/res/layout/fragment_homework.xml |   4 +-
 .../res/layout/fragment_login_advanced.xml    |  14 +-
 .../main/res/layout/fragment_login_form.xml   |  16 +-
 .../res/layout/fragment_login_recover.xml     |   6 +-
 .../main/res/layout/fragment_login_symbol.xml |   8 +-
 .../main/res/layout/fragment_logviewer.xml    |   2 +-
 .../main/res/layout/fragment_lucky_number.xml |   4 +-
 .../layout/fragment_lucky_number_history.xml  |   2 +-
 app/src/main/res/layout/fragment_message.xml  |   2 +-
 .../res/layout/fragment_message_preview.xml   |   2 +-
 .../main/res/layout/fragment_message_tab.xml  |   2 +-
 .../res/layout/fragment_mobile_device.xml     |   3 +-
 app/src/main/res/layout/fragment_note.xml     |   2 +-
 .../layout/fragment_notifications_center.xml  |   2 +-
 app/src/main/res/layout/fragment_school.xml   |   2 +-
 .../layout/fragment_school_announcement.xml   |   2 +-
 .../main/res/layout/fragment_student_info.xml |   2 +-
 app/src/main/res/layout/fragment_teacher.xml  |   2 +-
 .../main/res/layout/fragment_timetable.xml    |   2 +-
 .../layout/fragment_timetable_additional.xml  |  12 +-
 .../layout/fragment_timetable_completed.xml   |   2 +-
 .../res/layout/item_dashboard_account.xml     |   3 +-
 .../layout/item_dashboard_admin_message.xml   |   7 +-
 .../layout/item_dashboard_announcements.xml   |   5 +-
 .../res/layout/item_dashboard_conferences.xml |   5 +-
 .../main/res/layout/item_dashboard_exams.xml  |   5 +-
 .../main/res/layout/item_dashboard_grades.xml |   9 +-
 .../res/layout/item_dashboard_homework.xml    |   5 +-
 .../item_dashboard_horizontal_group.xml       |   4 -
 .../res/layout/item_dashboard_lessons.xml     |   8 +-
 .../main/res/layout/item_grade_details.xml    |   5 +-
 .../layout/item_homework_dialog_details.xml   |  38 +-
 .../layout/item_login_student_select_help.xml |   7 +-
 .../main/res/layout/item_message_chips.xml    |  16 +-
 .../res/layout/item_notifications_center.xml  |   5 +-
 .../main/res/layout/item_widget_timetable.xml | 173 +++++----
 .../res/layout/item_widget_timetable_dark.xml | 114 ------
 .../layout/item_widget_timetable_footer.xml   |  12 +
 .../layout/item_widget_timetable_small.xml    |  98 ------
 .../item_widget_timetable_small_dark.xml      |  97 ------
 .../res/layout/layout_preference_switch.xml   |   5 +
 .../res/layout/subitem_dashboard_grades.xml   |   4 +-
 .../layout/subitem_dashboard_small_grade.xml  |   3 +-
 .../main/res/layout/widget_luckynumber.xml    |  83 ++---
 .../res/layout/widget_luckynumber_dark.xml    |  67 ----
 app/src/main/res/layout/widget_timetable.xml  | 168 +++++----
 .../main/res/layout/widget_timetable_dark.xml |  99 ------
 .../main/res/menu/action_menu_dashboard.xml   |   6 +-
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   2 +-
 app/src/main/res/values-night-v31/styles.xml  |  65 ++++
 app/src/main/res/values-night/styles.xml      |  57 ++-
 app/src/main/res/values-v23/styles.xml        |   9 +-
 app/src/main/res/values-v26/styles.xml        |   8 -
 app/src/main/res/values-v27/styles.xml        |  16 +
 app/src/main/res/values-v28/styles.xml        |   9 -
 app/src/main/res/values-v29/styles.xml        |   9 -
 app/src/main/res/values-v31/styles.xml        |  60 ++++
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/colors.xml            |  53 ++-
 .../main/res/values/preferences_defaults.xml  |   1 -
 app/src/main/res/values/preferences_keys.xml  |   1 -
 app/src/main/res/values/strings.xml           |  83 +++++
 app/src/main/res/values/styles.xml            |  49 ++-
 .../res/xml/provider_widget_lucky_number.xml  |   8 +-
 .../res/xml/provider_widget_timetable.xml     |   5 +-
 179 files changed, 2019 insertions(+), 2372 deletions(-)
 delete mode 100644 app/src/main/res/drawable-night/background_header_note.xml
 create mode 100644 app/src/main/res/drawable/background_grade_details_rounded.xml
 create mode 100644 app/src/main/res/drawable/background_grade_details_weight_rounded.xml
 rename app/src/main/res/drawable/{background_widget_timetable_dark.xml => background_grade_rounded.xml} (74%)
 rename app/src/main/res/drawable/{background_widget_item_timetable_dark.xml => background_grade_small_rounded.xml} (51%)
 rename app/src/main/res/drawable/{background_luckynumber_widget.xml => background_luckynumber_widget_button.xml} (65%)
 delete mode 100644 app/src/main/res/drawable/background_luckynumber_widget_dark.xml
 create mode 100644 app/src/main/res/drawable/background_material_alert_dialog.xml
 create mode 100644 app/src/main/res/drawable/background_timetable_widget_avatar.xml
 delete mode 100644 app/src/main/res/drawable/background_widget_header_timetable.xml
 delete mode 100644 app/src/main/res/drawable/background_widget_header_timetable_dark.xml
 create mode 100644 app/src/main/res/drawable/ic_history.xml
 create mode 100644 app/src/main/res/drawable/ic_scale_balance.xml
 create mode 100644 app/src/main/res/drawable/ic_timetable_widget_swap.xml
 delete mode 100644 app/src/main/res/drawable/ic_widget_chevron.png
 create mode 100644 app/src/main/res/drawable/ic_widget_chevron.xml
 create mode 100644 app/src/main/res/drawable/shape_badge.xml
 create mode 100644 app/src/main/res/layout-v31/widget_timetable_preview.xml
 delete mode 100644 app/src/main/res/layout/item_widget_timetable_dark.xml
 create mode 100644 app/src/main/res/layout/item_widget_timetable_footer.xml
 delete mode 100644 app/src/main/res/layout/item_widget_timetable_small.xml
 delete mode 100644 app/src/main/res/layout/item_widget_timetable_small_dark.xml
 create mode 100644 app/src/main/res/layout/layout_preference_switch.xml
 delete mode 100644 app/src/main/res/layout/widget_luckynumber_dark.xml
 delete mode 100644 app/src/main/res/layout/widget_timetable_dark.xml
 create mode 100644 app/src/main/res/values-night-v31/styles.xml
 delete mode 100644 app/src/main/res/values-v26/styles.xml
 create mode 100644 app/src/main/res/values-v27/styles.xml
 delete mode 100644 app/src/main/res/values-v28/styles.xml
 delete mode 100644 app/src/main/res/values-v29/styles.xml
 create mode 100644 app/src/main/res/values-v31/styles.xml

diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
index b7b756b9..9c21d49d 100644
--- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
+    <background android:drawable="@color/colorIcon" />
     <foreground android:drawable="@drawable/ic_launcher_foreground_dev" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground_dev_mono" />
 </adaptive-icon>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3773093b..174c9a1f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -72,7 +72,7 @@
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:theme="@style/WulkanowyTheme.MessageSend"
+            android:theme="@style/WulkanowyTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index f6da6a63..348a4054 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -201,13 +201,6 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_timetable_show_timers
         )
 
-    var isHomeworkFullscreen: Boolean
-        get() = getBoolean(
-            R.string.pref_key_homework_fullscreen,
-            R.bool.pref_default_homework_fullscreen
-        )
-        set(value) = sharedPref.edit().putBoolean("homework_fullscreen", value).apply()
-
     val showSubjectsWithoutGrades: Boolean
         get() = getBoolean(
             R.string.pref_key_subjects_without_grades,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
index 3145c2a2..26e1f3ff 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
@@ -13,6 +13,7 @@ import io.github.wulkanowy.utils.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.sync.Mutex
+import java.time.Instant
 import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -164,6 +165,11 @@ class TimetableRepository @Inject constructor(
         timetableHeaderDb.insertAll(new uniqueSubtract old)
     }
 
+    fun getLastRefreshTimestamp(semester: Semester, start: LocalDate, end: LocalDate): Instant {
+        val refreshKey = getRefreshKey(cacheKey, semester, start, end)
+        return refreshHelper.getLastRefreshTimestamp(refreshKey)
+    }
+
     suspend fun saveAdditionalList(additionalList: List<TimetableAdditional>) =
         timetableAdditionalDb.insertAll(additionalList)
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index 45cd2b04..d48556fa 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
@@ -24,14 +23,13 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var semesterRepo: SemesterRepository
 
-    @Inject
-    lateinit var prefRepository: PreferencesRepository
-
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
         Timber.d("TimetableWidgetFactory created")
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, applicationContext, intent)
+        return TimetableWidgetFactory(
+            timetableRepo, studentRepo, semesterRepo, sharedPref, applicationContext, intent
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index 075557a5..7914df81 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -4,9 +4,9 @@ import android.app.ActivityManager
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import io.github.wulkanowy.R
@@ -30,6 +30,8 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
 
     protected var messageContainer: View? = null
 
+    protected var messageAnchor: View? = null
+
     abstract var presenter: T
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -48,6 +50,7 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG)
                 .setAction(R.string.all_details) { showErrorDetailsDialog(error) }
+                .apply { messageAnchor?.let { anchorView = it } }
                 .show()
         } else showMessage(text)
     }
@@ -57,12 +60,15 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
     }
 
     override fun showMessage(text: String) {
-        if (messageContainer != null) Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
-        else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
+        if (messageContainer != null) {
+            Snackbar.make(messageContainer!!, text, LENGTH_LONG)
+                .apply { messageAnchor?.let { anchorView = it } }
+                .show()
+        } else Toast.makeText(this, text, Toast.LENGTH_LONG).show()
     }
 
     override fun showExpiredDialog() {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.main_session_expired)
             .setMessage(R.string.main_session_relogin)
             .setPositiveButton(R.string.main_log_in) { _, _ -> presenter.onExpiredLoginSelected() }
@@ -74,6 +80,7 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         messageContainer?.let {
             Snackbar.make(it, R.string.error_password_change_required, LENGTH_LONG)
                 .setAction(R.string.all_change) { openInternetBrowser(redirectUrl) }
+                .apply { messageAnchor?.let { anchorView = it } }
                 .show()
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
index 25a53395..561d181a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -1,8 +1,14 @@
 package io.github.wulkanowy.ui.base
 
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
+import androidx.annotation.CallSuper
 import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
+import com.google.android.material.elevation.SurfaceColors
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
@@ -38,6 +44,19 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
+    @CallSuper
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        view.setBackgroundColor(SurfaceColors.SURFACE_3.getColor(requireContext()))
+    }
+
+    @CallSuper
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ) = binding.root
+
     override fun onResume() {
         super.onResume()
         analyticsHelper.setCurrentScreen(requireActivity(), this::class.simpleName)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index fe0e6469..679d904a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -4,13 +4,13 @@ import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.os.Bundle
+import android.view.View
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
 import androidx.core.os.bundleOf
 import androidx.core.view.isGone
-import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -20,7 +20,7 @@ import io.github.wulkanowy.utils.*
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ErrorDialog : DialogFragment() {
+class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
 
     @Inject
     lateinit var appInfo: AppInfo
@@ -28,6 +28,8 @@ class ErrorDialog : DialogFragment() {
     @Inject
     lateinit var preferencesRepository: PreferencesRepository
 
+    private lateinit var error: Throwable
+
     companion object {
         private const val ARGUMENT_KEY = "error"
 
@@ -36,32 +38,31 @@ class ErrorDialog : DialogFragment() {
         }
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val error = requireArguments().serializable<Throwable>(ARGUMENT_KEY)
-
-        val binding = DialogErrorBinding.inflate(layoutInflater)
-        binding.bindErrorDetails(error)
-
-        return getAlertDialog(binding, error).apply {
-            enableReportButtonIfErrorIsReportable(error)
-        }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        error = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    private fun getAlertDialog(binding: DialogErrorBinding, error: Throwable): AlertDialog {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return MaterialAlertDialogBuilder(requireContext()).apply {
             val errorStacktrace = error.stackTraceToString()
             setTitle(R.string.all_details)
-            setView(binding.root)
+            setView(DialogErrorBinding.inflate(layoutInflater).apply { binding = this }.root)
             setNeutralButton(R.string.about_feedback) { _, _ ->
                 openConfirmDialog { openEmailClient(errorStacktrace) }
             }
             setNegativeButton(android.R.string.cancel) { _, _ -> }
             setPositiveButton(android.R.string.copy) { _, _ -> copyErrorToClipboard(errorStacktrace) }
-        }.create()
+        }.create().apply {
+            setOnShowListener {
+                getButton(AlertDialog.BUTTON_NEUTRAL).isEnabled = error.isShouldBeReported()
+            }
+        }
     }
 
-    private fun DialogErrorBinding.bindErrorDetails(error: Throwable) {
-        return with(this) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        with(binding) {
             errorDialogHumanizedMessage.text = resources.getErrorString(error)
             errorDialogErrorMessage.text = error.localizedMessage
             errorDialogErrorMessage.isGone = error.localizedMessage.isNullOrBlank()
@@ -70,12 +71,6 @@ class ErrorDialog : DialogFragment() {
         }
     }
 
-    private fun AlertDialog.enableReportButtonIfErrorIsReportable(error: Throwable) {
-        setOnShowListener {
-            getButton(AlertDialog.BUTTON_NEUTRAL).isEnabled = error.isShouldBeReported()
-        }
-    }
-
     private fun copyErrorToClipboard(errorStacktrace: String) {
         val clip = ClipData.newPlainText("Error details", errorStacktrace)
         requireActivity().getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
@@ -83,7 +78,7 @@ class ErrorDialog : DialogFragment() {
     }
 
     private fun openConfirmDialog(callback: () -> Unit) {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.dialog_error_check_update)
             .setMessage(R.string.dialog_error_check_update_message)
             .setNeutralButton(R.string.about_feedback) { _, _ -> callback() }
@@ -113,8 +108,4 @@ class ErrorDialog : DialogFragment() {
             }
         )
     }
-
-    private fun showMessage(text: String) {
-        Toast.makeText(requireContext(), text, LENGTH_LONG).show()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
index e1c23457..f42f315c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ThemeManager.kt
@@ -6,15 +6,14 @@ import android.content.pm.PackageManager.GET_ACTIVITIES
 import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO
-import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES
+import com.google.android.material.color.DynamicColors
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.enums.AppTheme
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -28,18 +27,19 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
                 when (activity) {
                     is MainActivity -> activity.setTheme(R.style.WulkanowyTheme_Black)
                     is LoginActivity -> activity.setTheme(R.style.WulkanowyTheme_Login_Black)
-                    is SendMessageActivity -> activity.setTheme(R.style.WulkanowyTheme_MessageSend_Black)
                 }
             }
+        } else if (activity is TimetableWidgetConfigureActivity || activity is LuckyNumberWidgetConfigureActivity) {
+            DynamicColors.applyToActivityIfAvailable(activity)
         }
     }
 
     fun applyDefaultTheme() {
         AppCompatDelegate.setDefaultNightMode(
             when (preferencesRepository.appTheme) {
-                AppTheme.LIGHT -> MODE_NIGHT_NO
-                AppTheme.DARK, AppTheme.BLACK -> MODE_NIGHT_YES
-                AppTheme.SYSTEM -> MODE_NIGHT_FOLLOW_SYSTEM
+                AppTheme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
+                AppTheme.DARK, AppTheme.BLACK -> AppCompatDelegate.MODE_NIGHT_YES
+                AppTheme.SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
             }
         )
     }
@@ -52,7 +52,6 @@ class ThemeManager @Inject constructor(private val preferencesRepository: Prefer
             .let {
                 it == R.style.WulkanowyTheme_Black || it == R.style.WulkanowyTheme_NoActionBar
                     || it == R.style.WulkanowyTheme_Login || it == R.style.WulkanowyTheme_Login_Black
-                    || it == R.style.WulkanowyTheme_MessageSend || it == R.style.WulkanowyTheme_MessageSend_Black
             }
 
     @Suppress("DEPRECATION")
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
index 958be5a7..f0969fac 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
@@ -9,6 +9,7 @@ import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
 import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
+import io.github.wulkanowy.ui.modules.luckynumber.history.LuckyNumberHistoryFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
@@ -43,6 +44,7 @@ sealed class Destination {
         SCHOOL_ANNOUNCEMENT(SchoolAnnouncement),
         SCHOOL_AND_TEACHERS(SchoolAndTeachers),
         LUCKY_NUMBER(LuckyNumber),
+        LUCKY_NUMBER_HISTORY(LuckyNumberHistory),
         MORE(More),
         MESSAGE(Message),
         MOBILE_DEVICE(MobileDevice),
@@ -118,6 +120,12 @@ sealed class Destination {
         override val destinationFragment get() = LuckyNumberFragment.newInstance()
     }
 
+    @Serializable
+    object LuckyNumberHistory : Destination() {
+        override val destinationType get() = Type.LUCKY_NUMBER_HISTORY
+        override val destinationFragment get() = LuckyNumberHistoryFragment.newInstance()
+    }
+
     @Serializable
     object More : Destination() {
         override val destinationType get() = Type.MORE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
index 41b97b07..d6bc6154 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountdetails/AccountDetailsFragment.kt
@@ -9,6 +9,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
 import androidx.core.view.get
 import androidx.core.view.isVisible
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Student
@@ -114,7 +115,7 @@ class AccountDetailsFragment :
 
     override fun showLogoutConfirmDialog() {
         context?.let {
-            AlertDialog.Builder(it)
+            MaterialAlertDialogBuilder(it)
                 .setTitle(R.string.account_logout_student)
                 .setMessage(R.string.account_confirm)
                 .setPositiveButton(R.string.account_logout) { _, _ -> presenter.onLogoutConfirm() }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
index 6e2bc8c4..4229579c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditDialog.kt
@@ -1,11 +1,11 @@
 package io.github.wulkanowy.ui.modules.account.accountedit
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.GridLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.databinding.DialogAccountEditBinding
@@ -31,16 +31,12 @@ class AccountEditDialog : BaseDialogFragment<DialogAccountEditBinding>(), Accoun
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-    }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = DialogAccountEditBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogAccountEditBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
index d23978f5..2d2dccec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountquick/AccountQuickDialog.kt
@@ -1,11 +1,11 @@
 package io.github.wulkanowy.ui.modules.account.accountquick
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.databinding.DialogAccountQuickBinding
@@ -36,19 +36,17 @@ class AccountQuickDialog : BaseDialogFragment<DialogAccountQuickBinding>(), Acco
             }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(
+                DialogAccountQuickBinding.inflate(layoutInflater)
+                    .apply { binding = this }.root
+            )
+            .create()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogAccountQuickBinding.inflate(inflater).apply { binding = this }.root
-
-    @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         val studentsWithSemesters = requireArguments()
             .serializable<Array<StudentWithSemesters>>(STUDENTS_ARGUMENT_KEY).toList()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index eab24f91..c0026bee 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -1,21 +1,20 @@
 package io.github.wulkanowy.ui.modules.attendance
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.databinding.DialogAttendanceBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.descriptionRes
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
-class AttendanceDialog : DialogFragment() {
-
-    private var binding: DialogAttendanceBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class AttendanceDialog : BaseDialogFragment<DialogAttendanceBinding>() {
 
     private lateinit var attendance: Attendance
 
@@ -30,15 +29,14 @@ class AttendanceDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         attendance = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogAttendanceBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index 21f30b04..a73c2606 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -4,10 +4,10 @@ import android.content.DialogInterface.BUTTON_POSITIVE
 import android.os.Bundle
 import android.view.*
 import android.view.View.*
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ActionMode
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
@@ -124,7 +124,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
             attendanceExcuseButton.setOnClickListener { presenter.onExcuseButtonClick() }
 
-            attendanceNavContainer.elevation = requireContext().dpToPx(8f)
+            attendanceNavContainer.elevation = requireContext().dpToPx(3f)
         }
     }
 
@@ -228,7 +228,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
     override fun showExcuseDialog() {
         val dialogBinding = DialogExcuseBinding.inflate(LayoutInflater.from(context))
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.attendance_excuse_title)
             .setView(dialogBinding.root)
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt
index 7834b6e8..c532377e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/conference/ConferenceDialog.kt
@@ -1,21 +1,20 @@
 package io.github.wulkanowy.ui.modules.conference
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.Conference
 import io.github.wulkanowy.databinding.DialogConferenceBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
-class ConferenceDialog : DialogFragment() {
-
-    private var binding: DialogConferenceBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class ConferenceDialog : BaseDialogFragment<DialogConferenceBinding>() {
 
     private lateinit var conference: Conference
 
@@ -30,15 +29,14 @@ class ConferenceDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         conference = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogConferenceBinding.inflate(inflater).also { binding = it }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogConferenceBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
index cd66d6c2..ce17c763 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentDashboardBinding
@@ -148,7 +149,7 @@ class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragme
         val values = requireContext().resources.getStringArray(R.array.dashboard_tile_values)
         val selectedItemsState = values.map { value -> selectedItems.any { it.name == value } }
 
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.pref_dashboard_appearance_tiles_title)
             .setMultiChoiceItems(entries, selectedItemsState.toBooleanArray()) { _, _, _ -> }
             .setPositiveButton(android.R.string.ok) { dialog, _ ->
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardGradesAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardGradesAdapter.kt
index d00df9d4..d821de53 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardGradesAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardGradesAdapter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.dashboard.adapters
 
+import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
@@ -8,6 +9,7 @@ import io.github.wulkanowy.data.enums.GradeColorTheme
 import io.github.wulkanowy.databinding.SubitemDashboardGradesBinding
 import io.github.wulkanowy.databinding.SubitemDashboardSmallGradeBinding
 import io.github.wulkanowy.utils.getBackgroundColor
+import io.github.wulkanowy.utils.getCompatColor
 
 class DashboardGradesAdapter : RecyclerView.Adapter<DashboardGradesAdapter.ViewHolder>() {
 
@@ -37,7 +39,9 @@ class DashboardGradesAdapter : RecyclerView.Adapter<DashboardGradesAdapter.ViewH
 
                 with(subitemBinding.dashboardSmallGradeSubitemValue) {
                     text = it.entry
-                    setBackgroundResource(it.getBackgroundColor(gradeColorTheme))
+                    backgroundTintList = ColorStateList.valueOf(
+                        context.getCompatColor(it.getBackgroundColor(gradeColorTheme))
+                    )
                 }
 
                 dashboardGradesSubitemGradeContainer.addView(subitemBinding.root)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
index 876b563f..d452d74a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
@@ -1,23 +1,22 @@
 package io.github.wulkanowy.ui.modules.exam
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.databinding.DialogExamBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.openCalendarEventAdd
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 import java.time.LocalTime
 
-class ExamDialog : DialogFragment() {
-
-    private var binding: DialogExamBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class ExamDialog : BaseDialogFragment<DialogExamBinding>() {
 
     private lateinit var exam: Exam
 
@@ -32,15 +31,14 @@ class ExamDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         exam = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogExamBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogExamBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index 3d42bd00..0123e234 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -62,7 +62,7 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
             examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
             examNextButton.setOnClickListener { presenter.onNextWeek() }
 
-            examNavContainer.elevation = requireContext().dpToPx(8f)
+            examNavContainer.elevation = requireContext().dpToPx(3f)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index 15df47a1..7ce07eb6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -141,7 +142,7 @@ class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade
         val choices = semesters.map { getString(R.string.grade_semester, it.semesterName) }
             .toTypedArray()
 
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setSingleChoiceItems(choices, selectedIndex) { dialog, which ->
                 presenter.onSemesterSelected(which)
                 dialog.dismiss()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
index e5c3bb63..15b5db03 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
 import android.annotation.SuppressLint
+import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.view.LayoutInflater
 import android.view.View
@@ -17,9 +18,10 @@ import io.github.wulkanowy.databinding.HeaderGradeDetailsBinding
 import io.github.wulkanowy.databinding.ItemGradeDetailsBinding
 import io.github.wulkanowy.ui.base.BaseExpandableAdapter
 import io.github.wulkanowy.utils.getBackgroundColor
+import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.toFormattedString
 import timber.log.Timber
-import java.util.BitSet
+import java.util.*
 import javax.inject.Inject
 
 class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<RecyclerView.ViewHolder>() {
@@ -203,7 +205,9 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
         with(holder.binding) {
             gradeItemValue.run {
                 text = grade.entry
-                setBackgroundResource(grade.getBackgroundColor(gradeColorTheme))
+                backgroundTintList = ColorStateList.valueOf(
+                    context.getCompatColor(grade.getBackgroundColor(gradeColorTheme))
+                )
             }
             gradeItemDescription.text = when {
                 grade.description.isNotBlank() -> grade.description
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index a1ef2ec5..39f72f8b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -1,22 +1,23 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
+import android.app.Dialog
+import android.content.res.ColorStateList
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
-import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.enums.GradeColorTheme
 import io.github.wulkanowy.databinding.DialogGradeBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.*
 
-
-class GradeDetailsDialog : DialogFragment() {
-
-    private var binding: DialogGradeBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class GradeDetailsDialog : BaseDialogFragment<DialogGradeBinding>() {
 
     private lateinit var grade: Grade
 
@@ -38,16 +39,15 @@ class GradeDetailsDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         grade = requireArguments().serializable(ARGUMENT_KEY)
         gradeColorTheme = requireArguments().serializable(COLOR_THEME_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogGradeBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogGradeBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -55,10 +55,9 @@ class GradeDetailsDialog : DialogFragment() {
         with(binding) {
             gradeDialogSubject.text = grade.subject
 
-            gradeDialogColorAndWeightValue.run {
-                text = context.getString(R.string.grade_weight_value, grade.weight)
-                setBackgroundResource(grade.getGradeColor())
-            }
+            gradeDialogWeightValue.text = grade.weight
+            gradeDialogWeightLayout.backgroundTintList =
+                ColorStateList.valueOf(requireContext().getCompatColor(grade.getGradeColor()))
 
             gradeDialogDateValue.text = grade.date.toFormattedString()
             gradeDialogColorValue.text = getString(grade.colorStringId)
@@ -72,7 +71,12 @@ class GradeDetailsDialog : DialogFragment() {
 
             gradeDialogValue.run {
                 text = grade.entry
-                setBackgroundResource(grade.getBackgroundColor(gradeColorTheme))
+                backgroundTintList = ColorStateList.valueOf(
+                    ContextCompat.getColor(
+                        requireContext(),
+                        grade.getBackgroundColor(gradeColorTheme)
+                    )
+                )
             }
 
             gradeDialogTeacherValue.text = grade.teacher.ifBlank { getString(R.string.all_no_data) }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index 3810902f..abd0b13c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -7,6 +7,7 @@ import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.GradeSummary
@@ -118,7 +119,7 @@ class GradeSummaryFragment :
     }
 
     override fun showCalculatedAverageHelpDialog() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.grade_summary_calculated_average_help_dialog_title)
             .setMessage(R.string.grade_summary_calculated_average_help_dialog_message)
             .setPositiveButton(R.string.all_close) { _, _ -> }
@@ -126,7 +127,7 @@ class GradeSummaryFragment :
     }
 
     override fun showFinalAverageHelpDialog() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.grade_summary_final_average_help_dialog_title)
             .setMessage(R.string.grade_summary_final_average_help_dialog_message)
             .setPositiveButton(R.string.all_close) { _, _ -> }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index 9d5130e4..0381acf3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -67,7 +67,7 @@ class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment
 
             openAddHomeworkButton.setOnClickListener { presenter.onHomeworkAddButtonClicked() }
 
-            homeworkNavContainer.elevation = requireContext().dpToPx(8f)
+            homeworkNavContainer.elevation = requireContext().dpToPx(3f)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt
index c2aff2b1..c51370ea 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/add/HomeworkAddDialog.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.ui.modules.homework.add
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.widget.doOnTextChanged
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.DialogHomeworkAddBinding
@@ -21,20 +21,15 @@ class HomeworkAddDialog : BaseDialogFragment<DialogHomeworkAddBinding>(), Homewo
     @Inject
     lateinit var presenter: HomeworkAddPresenter
 
-    // todo: move it to presenter
+    //todo: move it to presenter
     private var date: LocalDate? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogHomeworkAddBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogHomeworkAddBinding.inflate(inflater).apply { binding = this }.root
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         presenter.onAttachView(this)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
index e03707a5..1ad2a0e3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
@@ -31,14 +31,8 @@ class HomeworkDetailsAdapter @Inject constructor() :
             attachments = value?.attachments.orEmpty()
         }
 
-    var isHomeworkFullscreen = false
-
     var onAttachmentClickListener: (url: String) -> Unit = {}
 
-    var onFullScreenClickListener = {}
-
-    var onFullScreenExitClickListener = {}
-
     var onDeleteClickListener: (homework: Homework) -> Unit = {}
 
     override fun getItemCount() = 1 + if (attachments.isNotEmpty()) attachments.size + 1 else 0
@@ -82,18 +76,6 @@ class HomeworkDetailsAdapter @Inject constructor() :
             homeworkDialogTeacher.text = homework?.teacher.ifNullOrBlank { noDataString }
             homeworkDialogContent.text = homework?.content.ifNullOrBlank { noDataString }
             homeworkDialogDelete.visibility = if (homework?.isAddedByUser == true) VISIBLE else GONE
-            homeworkDialogFullScreen.visibility = if (isHomeworkFullscreen) GONE else VISIBLE
-            homeworkDialogFullScreenExit.visibility = if (isHomeworkFullscreen) VISIBLE else GONE
-            homeworkDialogFullScreen.setOnClickListener {
-                homeworkDialogFullScreen.visibility = GONE
-                homeworkDialogFullScreenExit.visibility = VISIBLE
-                onFullScreenClickListener()
-            }
-            homeworkDialogFullScreenExit.setOnClickListener {
-                homeworkDialogFullScreen.visibility = VISIBLE
-                homeworkDialogFullScreenExit.visibility = GONE
-                onFullScreenExitClickListener()
-            }
             homeworkDialogDelete.setOnClickListener {
                 onDeleteClickListener(homework!!)
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
index 5e2cc65d..1f9bc881 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
@@ -1,14 +1,12 @@
 package io.github.wulkanowy.ui.modules.homework.details
 
 import android.annotation.SuppressLint
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
@@ -43,15 +41,14 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         homework = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogHomeworkBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -67,26 +64,11 @@ class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), Homew
             homeworkDialogClose.setOnClickListener { dismiss() }
         }
 
-        if (presenter.isHomeworkFullscreen) {
-            dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT)
-        } else {
-            dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT)
-        }
-
         with(binding.homeworkDialogRecycler) {
             layoutManager = LinearLayoutManager(context)
             adapter = detailsAdapter.apply {
                 onAttachmentClickListener = { context.openInternetBrowser(it, ::showMessage) }
-                onFullScreenClickListener = {
-                    dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT)
-                    presenter.isHomeworkFullscreen = true
-                }
-                onFullScreenExitClickListener = {
-                    dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT)
-                    presenter.isHomeworkFullscreen = false
-                }
                 onDeleteClickListener = { homework -> presenter.deleteHomework(homework) }
-                isHomeworkFullscreen = presenter.isHomeworkFullscreen
                 homework = this@HomeworkDetailsDialog.homework
             }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
index e76df6bd..84933f06 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
@@ -5,7 +5,6 @@ import io.github.wulkanowy.data.logResourceStatus
 import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.HomeworkRepository
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.ui.base.BasePresenter
@@ -19,15 +18,8 @@ class HomeworkDetailsPresenter @Inject constructor(
     studentRepository: StudentRepository,
     private val homeworkRepository: HomeworkRepository,
     private val analytics: AnalyticsHelper,
-    private val preferencesRepository: PreferencesRepository
 ) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository) {
 
-    var isHomeworkFullscreen
-        get() = preferencesRepository.isHomeworkFullscreen
-        set(value) {
-            preferencesRepository.isHomeworkFullscreen = value
-        }
-
     override fun onAttachView(view: HomeworkDetailsView) {
         super.onAttachView(view)
         view.initView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt
index 53f06cac..a78ce5dd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt
@@ -61,7 +61,7 @@ class LuckyNumberHistoryFragment :
             luckyNumberHistoryPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
             luckyNumberHistoryNextButton.setOnClickListener { presenter.onNextWeek() }
 
-            luckyNumberHistoryNavContainer.elevation = requireContext().dpToPx(8f)
+            luckyNumberHistoryNavContainer.elevation = requireContext().dpToPx(3f)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
index 024beff8..a2d23e54 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -1,16 +1,12 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.appwidget.AppWidgetManager.*
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 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.StudentWithSemesters
 import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
@@ -41,7 +37,6 @@ class LuckyNumberWidgetConfigureActivity :
         setContentView(
             ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root
         )
-
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
         }
@@ -56,22 +51,6 @@ class LuckyNumberWidgetConfigureActivity :
         configureAdapter.onClickListener = presenter::onItemSelect
     }
 
-    override fun showThemeDialog() {
-        var items = arrayOf(
-            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)
-            .setTitle(R.string.widget_timetable_theme_title)
-            .setOnDismissListener { presenter.onDismissThemeView() }
-            .setSingleChoiceItems(items, -1) { _, which ->
-                presenter.onThemeSelect(which)
-            }
-            .show()
-    }
-
     override fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long) {
         with(configureAdapter) {
             selectedId = selectedStudentId
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index cac648da..7e53dad0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -8,7 +8,6 @@ import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getThemeWidgetKey
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
@@ -32,20 +31,9 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
 
     fun onItemSelect(student: Student) {
         selectedStudent = student
-        view?.showThemeDialog()
-    }
-
-    fun onThemeSelect(index: Int) {
-        appWidgetId?.let {
-            sharedPref.putLong(getThemeWidgetKey(it), index.toLong())
-        }
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView() {
-        view?.finishView()
-    }
-
     private fun loadData() {
         resourceFlow { studentRepository.getSavedStudents(false) }.onEach {
             when (it) {
@@ -56,10 +44,7 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
                     } ?: -1
                     when {
                         it.data.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
+                        it.data.size == 1 -> onItemSelect(it.data.single().student)
                         else -> view?.updateData(it.data, selectedStudentId)
                     }
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
index b4556f7e..df13b993 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
@@ -7,8 +7,6 @@ interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun showThemeDialog()
-
     fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long)
 
     fun updateLuckyNumberWidget(widgetId: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
index e03e3e90..bafb2d7e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -2,14 +2,12 @@ package io.github.wulkanowy.ui.modules.luckynumberwidget
 
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
-import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
 import android.appwidget.AppWidgetProvider
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
-import android.view.View.GONE
-import android.view.View.VISIBLE
+import android.util.TypedValue.COMPLEX_UNIT_SP
+import android.view.View
 import android.widget.RemoteViews
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -17,7 +15,6 @@ import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.toFirstResult
@@ -41,16 +38,12 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
     lateinit var sharedPref: SharedPrefProvider
 
     companion object {
+        private const val LUCKY_NUMBER_WIDGET_MAX_SIZE = 196
 
-        const val LUCKY_NUMBER_PENDING_INTENT_ID = 200
+        private const val LUCKY_NUMBER_PENDING_INTENT_ID = 300
+        private const val LUCKY_NUMBER_HISTORY_PENDING_INTENT_ID = 301
 
         fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
-
-        fun getThemeWidgetKey(appWidgetId: Int) = "lucky_number_widget_theme_$appWidgetId"
-
-        fun getHeightWidgetKey(appWidgetId: Int) = "lucky_number_widget_height_$appWidgetId"
-
-        fun getWidthWidgetKey(appWidgetId: Int) = "lucky_number_widget_width_$appWidgetId"
     }
 
     override fun onUpdate(
@@ -59,107 +52,86 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
         appWidgetIds: IntArray?
     ) {
         super.onUpdate(context, appWidgetManager, appWidgetIds)
-        appWidgetIds?.forEach { appWidgetId ->
-            val luckyNumber =
-                getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
-            val appIntent = PendingIntent.getActivity(
-                context,
-                LUCKY_NUMBER_PENDING_INTENT_ID,
-                SplashActivity.getStartIntent(context, Destination.LuckyNumber),
-                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-            )
 
-            if (luckyNumber is Resource.Error) {
-                Timber.e("Error loading lucky number for widget", luckyNumber.error)
-            }
+        val appIntent = PendingIntent.getActivity(
+            context,
+            LUCKY_NUMBER_PENDING_INTENT_ID,
+            SplashActivity.getStartIntent(context, Destination.LuckyNumber),
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+        )
 
-            val remoteView =
-                RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context))
-                    .apply {
-                        setTextViewText(
-                            R.id.luckyNumberWidgetNumber,
-                            luckyNumber.dataOrNull?.luckyNumber?.toString() ?: "#"
-                        )
-                        setOnClickPendingIntent(R.id.luckyNumberWidgetContainer, appIntent)
-                    }
+        val historyIntent = PendingIntent.getActivity(
+            context,
+            LUCKY_NUMBER_HISTORY_PENDING_INTENT_ID,
+            SplashActivity.getStartIntent(context, Destination.LuckyNumberHistory),
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+        )
 
-            setStyles(remoteView, appWidgetId)
-            appWidgetManager.updateAppWidget(appWidgetId, remoteView)
+        appWidgetIds?.forEach { widgetId ->
+            val studentId = sharedPref.getLong(getStudentWidgetKey(widgetId), 0)
+            val luckyNumberResource = getLuckyNumber(studentId, widgetId)
+            val luckyNumber = luckyNumberResource.dataOrNull?.luckyNumber?.toString()
+            val remoteView = RemoteViews(context.packageName, R.layout.widget_luckynumber)
+                .apply {
+                    setTextViewText(R.id.luckyNumberWidgetValue, luckyNumber ?: "-")
+                    setOnClickPendingIntent(R.id.luckyNumberWidgetContainer, appIntent)
+                    setOnClickPendingIntent(R.id.luckyNumberWidgetHistoryButton, historyIntent)
+                }
+
+            resizeWidget(context, appWidgetManager.getAppWidgetOptions(widgetId), remoteView)
+            appWidgetManager.updateAppWidget(widgetId, remoteView)
+        }
+    }
+
+    override fun onAppWidgetOptionsChanged(
+        context: Context?,
+        appWidgetManager: AppWidgetManager?,
+        appWidgetId: Int,
+        newOptions: Bundle?
+    ) {
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
+
+        if (context == null || newOptions == null || appWidgetManager == null) {
+            return
+        }
+
+        val remoteView = RemoteViews(context.packageName, R.layout.widget_luckynumber)
+        resizeWidget(context, newOptions, remoteView)
+        appWidgetManager.partiallyUpdateAppWidget(appWidgetId, remoteView)
+    }
+
+    private fun resizeWidget(context: Context, options: Bundle, remoteViews: RemoteViews) {
+        val (width, height) = options.getWidgetSize(context)
+        val size = minOf(width, height, LUCKY_NUMBER_WIDGET_MAX_SIZE).toFloat()
+        resizeWidgetContents(size, remoteViews)
+        Timber.v("LuckyNumberWidget resized: ${width}x${height} ($size)")
+    }
+
+    private fun resizeWidgetContents(size: Float, remoteViews: RemoteViews) {
+        var historyButtonVisibility = View.VISIBLE
+        var luckyNumberTextSize = 72f
+
+        if (size < 150) {
+            luckyNumberTextSize = 44f
+            historyButtonVisibility = View.GONE
+        }
+        if (size < 75) {
+            luckyNumberTextSize = 26f
+        }
+
+        remoteViews.apply {
+            setTextViewTextSize(R.id.luckyNumberWidgetValue, COMPLEX_UNIT_SP, luckyNumberTextSize)
+            setViewVisibility(R.id.luckyNumberWidgetHistoryButton, historyButtonVisibility)
         }
     }
 
     override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
         super.onDeleted(context, appWidgetIds)
         appWidgetIds?.forEach { appWidgetId ->
-            with(sharedPref) {
-                delete(getHeightWidgetKey(appWidgetId))
-                delete(getStudentWidgetKey(appWidgetId))
-                delete(getThemeWidgetKey(appWidgetId))
-                delete(getWidthWidgetKey(appWidgetId))
-            }
+            sharedPref.delete(getStudentWidgetKey(appWidgetId))
         }
     }
 
-    override fun onAppWidgetOptionsChanged(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetId: Int,
-        newOptions: Bundle?
-    ) {
-        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
-
-        val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context))
-
-        setStyles(remoteView, appWidgetId, newOptions)
-        appWidgetManager.updateAppWidget(appWidgetId, remoteView)
-    }
-
-    private fun setStyles(views: RemoteViews, appWidgetId: Int, options: Bundle? = null) {
-        val width = options?.getInt(OPTION_APPWIDGET_MIN_WIDTH) ?: sharedPref.getLong(
-            getWidthWidgetKey(appWidgetId), 74
-        ).toInt()
-        val height = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: sharedPref.getLong(
-            getHeightWidgetKey(appWidgetId), 74
-        ).toInt()
-
-        with(sharedPref) {
-            putLong(getWidthWidgetKey(appWidgetId), width.toLong())
-            putLong(getHeightWidgetKey(appWidgetId), height.toLong())
-        }
-
-        val rows = getCellsForSize(height)
-        val cols = getCellsForSize(width)
-
-        Timber.d("New lucky number widget measurement: %dx%d", width, height)
-        Timber.d("Widget size: $cols x $rows")
-
-        when {
-            1 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = false)
-            1 == cols && 1 < rows -> views.setVisibility(imageTop = true, imageLeft = false)
-            1 < cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
-            1 == cols && 1 == rows -> views.setVisibility(imageTop = true, imageLeft = false)
-            2 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
-            else -> views.setVisibility(imageTop = false, imageLeft = false, title = true)
-        }
-    }
-
-    private fun RemoteViews.setVisibility(
-        imageTop: Boolean,
-        imageLeft: Boolean,
-        title: Boolean = false
-    ) {
-        setViewVisibility(R.id.luckyNumberWidgetImageTop, if (imageTop) VISIBLE else GONE)
-        setViewVisibility(R.id.luckyNumberWidgetImageLeft, if (imageLeft) VISIBLE else GONE)
-        setViewVisibility(R.id.luckyNumberWidgetTitle, if (title) VISIBLE else GONE)
-        setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-    }
-
-    private fun getCellsForSize(size: Int): Int {
-        var n = 2
-        while (74 * n - 30 < size) ++n
-        return n - 1
-    }
-
     private fun getLuckyNumber(studentId: Long, appWidgetId: Int) = runBlocking {
         try {
             val students = studentRepository.getSavedStudents()
@@ -181,22 +153,24 @@ class LuckyNumberWidgetProvider : AppWidgetProvider() {
                 Resource.Success<LuckyNumber?>(null)
             }
         } catch (e: Exception) {
-            if (e.cause !is NoCurrentStudentException) {
-                Timber.e(e, "An error has occurred in lucky number provider")
-            }
+            Timber.e(e, "An error has occurred in lucky number provider")
             Resource.Error(e)
         }
     }
 
-    private fun getCorrectLayoutId(appWidgetId: Int, context: Context): Int {
-        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val isSystemDarkMode =
-            context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+    private fun Bundle.getWidgetSize(context: Context): Pair<Int, Int> {
+        val minWidth = getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
+        val maxWidth = getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH)
+        val minHeight = getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)
+        val maxHeight = getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT)
 
-        return if (savedTheme == 1L || (savedTheme == 2L && isSystemDarkMode)) {
-            R.layout.widget_luckynumber_dark
+        val orientation = context.resources.configuration.orientation
+        val isPortrait = orientation == Configuration.ORIENTATION_PORTRAIT
+
+        return if (isPortrait) {
+            minWidth to maxHeight
         } else {
-            R.layout.widget_luckynumber
+            maxWidth to minHeight
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 51092376..091080a5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -2,14 +2,14 @@ package io.github.wulkanowy.ui.modules.main
 
 import android.content.Context
 import android.content.Intent
-import android.os.Build.VERSION_CODES.P
+import android.os.Build
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.ViewGroup.MarginLayoutParams
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
-import androidx.core.view.ViewCompat
-import androidx.core.view.isVisible
+import androidx.core.view.*
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
@@ -90,8 +90,16 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         super.onCreate(savedInstanceState)
         setContentView(ActivityMainBinding.inflate(layoutInflater).apply { binding = this }.root)
         setSupportActionBar(binding.mainToolbar)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+            binding.mainAppBar.isLifted = true
+        }
+        initializeFragmentContainer()
+
         this.savedInstanceState = savedInstanceState
         messageContainer = binding.mainMessageContainer
+        messageAnchor = binding.mainMessageContainer
         updateHelper.messageContainer = binding.mainFragmentContainer
         onBackCallback = onBackPressedDispatcher.addCallback(this, enabled = false) {
             presenter.onBackPressed()
@@ -187,6 +195,17 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         }
     }
 
+    private fun initializeFragmentContainer() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.mainFragmentContainer) { view, insets ->
+            val bottomInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+
+            view.updateLayoutParams<MarginLayoutParams> {
+                bottomMargin = if (binding.mainBottomNav.isVisible) 0 else bottomInsets.bottom
+            }
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+
     override fun onPreferenceStartFragment(
         caller: PreferenceFragmentCompat,
         pref: Preference
@@ -231,20 +250,9 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         showDialogFragment(AccountQuickDialog.newInstance(studentWithSemesters))
     }
 
-    override fun showActionBarElevation(show: Boolean) {
-        ViewCompat.setElevation(binding.mainToolbar, if (show) dpToPx(4f) else 0f)
-    }
-
     override fun showBottomNavigation(show: Boolean) {
         binding.mainBottomNav.isVisible = show
-
-        if (appInfo.systemVersion >= P) {
-            window.navigationBarColor = if (show) {
-                getThemeAttrColor(android.R.attr.navigationBarColor)
-            } else {
-                getThemeAttrColor(R.attr.colorSurface)
-            }
-        }
+        binding.mainFragmentContainer.requestApplyInsets()
     }
 
     override fun openMoreDestination(destination: Destination) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index d51cdac6..ae05ecf2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -14,9 +14,6 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.ui.modules.account.AccountView
 import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsView
-import io.github.wulkanowy.ui.modules.grade.GradeView
-import io.github.wulkanowy.ui.modules.message.MessageView
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersView
 import io.github.wulkanowy.ui.modules.studentinfo.StudentInfoView
 import io.github.wulkanowy.utils.AdsHelper
 import io.github.wulkanowy.utils.AnalyticsHelper
@@ -100,7 +97,6 @@ class MainPresenter @Inject constructor(
     fun onViewChange(destinationView: BaseView) {
         view?.apply {
             showBottomNavigation(shouldShowBottomNavigation(destinationView))
-            showActionBarElevation(shouldShowActionBarElevation(destinationView))
             currentViewTitle?.let { setViewTitle(it) }
             currentViewSubtitle?.let { setViewSubTitle(it.ifBlank { null }) }
             currentStackSize?.let {
@@ -110,13 +106,6 @@ class MainPresenter @Inject constructor(
         }
     }
 
-    private fun shouldShowActionBarElevation(destination: BaseView) = when (destination) {
-        is GradeView,
-        is MessageView,
-        is SchoolAndTeachersView -> false
-        else -> true
-    }
-
     private fun shouldShowBottomNavigation(destination: BaseView) = when (destination) {
         is AccountView,
         is StudentInfoView,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 03f9641d..62436f3b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -28,8 +28,6 @@ interface MainView : BaseView {
 
     fun showAccountPicker(studentWithSemesters: List<StudentWithSemesters>)
 
-    fun showActionBarElevation(show: Boolean)
-
     fun showBottomNavigation(show: Boolean)
 
     fun notifyMenuViewReselected()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
index 37f9a19b..8bd84f2b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/mailboxchooser/MailboxChooserDialog.kt
@@ -1,11 +1,11 @@
 package io.github.wulkanowy.ui.modules.message.mailboxchooser
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.databinding.DialogMailboxChooserBinding
@@ -37,19 +37,19 @@ class MailboxChooserDialog : BaseDialogFragment<DialogMailboxChooserBinding>(),
             }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(
+                DialogMailboxChooserBinding.inflate(layoutInflater).apply { binding = this }.root
+            )
+            .create()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogMailboxChooserBinding.inflate(inflater).apply { binding = this }.root
 
     @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         presenter.onAttachView(
             view = this,
             requireMailbox = requireArguments().getBoolean(REQUIRED_KEY, false),
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 14f3d718..28147fae 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.ui.modules.message.send
 
 import android.annotation.SuppressLint
-import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.graphics.Rect
+import android.os.Build
 import android.os.Bundle
 import android.text.Spanned
 import android.view.Menu
@@ -12,11 +12,14 @@ import android.view.MenuItem
 import android.view.TouchDelegate
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.core.text.parseAsHtml
 import androidx.core.text.toHtml
+import androidx.core.view.*
 import androidx.core.widget.doOnTextChanged
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Mailbox
@@ -24,8 +27,8 @@ import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.databinding.ActivitySendMessageBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog
-import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog.Companion.MAILBOX_KEY
 import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog.Companion.LISTENER_KEY
+import io.github.wulkanowy.ui.modules.message.mailboxchooser.MailboxChooserDialog.Companion.MAILBOX_KEY
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.nullableSerializable
@@ -99,6 +102,13 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         )
         setSupportActionBar(binding.sendMessageToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+            binding.sendAppBar.isLifted = true
+        }
+        initializeMessageContainer()
+
         messageContainer = binding.sendMessageContainer
 
         formRecipientsData = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
@@ -130,6 +140,17 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         }
     }
 
+    private fun initializeMessageContainer() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.sendMessageScroll) { view, insets ->
+            val bottomInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+
+            view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                bottomMargin = bottomInsets.bottom
+            }
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+
     private fun onMessageSubjectChange(text: CharSequence?) {
         formSubjectValue = text.toString()
         presenter.onMessageContentChange()
@@ -252,7 +273,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     }
 
     override fun showMessageBackupDialog() {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.message_title)
             .setMessage(presenter.getMessageBackupContent(presenter.getRecipientsNames()))
             .setPositiveButton(R.string.all_yes) { _, _ -> presenter.restoreMessageParts() }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
index 6df6153c..9792c708 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
+import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.graphics.Typeface
 import android.view.LayoutInflater
@@ -68,21 +69,23 @@ class MessageTabAdapter @Inject constructor() :
         }
     }
 
+    @SuppressLint("PrivateResource")
     private fun bindHeaderViewHolder(holder: HeaderViewHolder, position: Int) {
         val item = items[position] as MessageTabDataItem.FilterHeader
+        val context = holder.binding.root.context
 
         with(holder.binding) {
-            chipMailbox.text = item.selectedMailbox
-                ?: root.context.getString(R.string.message_chip_all_mailboxes)
+            chipMailbox.text =
+                item.selectedMailbox ?: context.getString(R.string.message_chip_all_mailboxes)
             chipMailbox.chipBackgroundColor = ColorStateList.valueOf(
                 if (item.selectedMailbox == null) {
-                    root.context.getCompatColor(R.color.mtrl_choice_chip_background_color)
-                } else root.context.getThemeAttrColor(android.R.attr.colorPrimary, 64)
+                    context.getCompatColor(R.color.m3_elevated_chip_background_color)
+                } else context.getThemeAttrColor(R.attr.colorPrimary, 64)
             )
             chipMailbox.setTextColor(
                 if (item.selectedMailbox == null) {
-                    root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
-                } else root.context.getThemeAttrColor(android.R.attr.colorPrimary)
+                    context.getThemeAttrColor(R.attr.colorOnSurfaceVariant)
+                } else context.getThemeAttrColor(R.attr.colorPrimary)
             )
             chipMailbox.setOnClickListener { onMailboxClickListener() }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
index eb420a6a..2cc2a2aa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
@@ -1,17 +1,17 @@
 package io.github.wulkanowy.ui.modules.mobiledevice.token
 
+import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.util.Base64
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.getSystemService
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
@@ -31,17 +31,14 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
         fun newInstance() = MobileDeviceTokenDialog()
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(
+                DialogMobileDeviceBinding.inflate(layoutInflater).apply { binding = this }.root
+            )
+            .create()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogMobileDeviceBinding.inflate(inflater).apply { binding = this }.root
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         presenter.onAttachView(this)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
index e46ab42c..0592e924 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
@@ -1,25 +1,24 @@
 package io.github.wulkanowy.ui.modules.note
 
 import android.annotation.SuppressLint
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.databinding.DialogNoteBinding
 import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
-class NoteDialog : DialogFragment() {
-
-    private var binding: DialogNoteBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class NoteDialog : BaseDialogFragment<DialogNoteBinding>() {
 
     private lateinit var note: Note
 
@@ -34,15 +33,14 @@ class NoteDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         note = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogNoteBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogNoteBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt
index 163ba8cd..0763d4fa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/notifications/NotificationsFragment.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.ui.modules.notifications
 import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.FragmentNotificationsBinding
@@ -41,7 +41,7 @@ class NotificationsFragment :
     }
 
     private fun showSettingsDialog() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.notifications_header_title)
             .setMessage(R.string.notifications_header_description)
             .setNegativeButton(R.string.notifications_skip) { dialog, _ ->
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
index e33a48f0..c1c58441 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementDialog.kt
@@ -1,21 +1,20 @@
 package io.github.wulkanowy.ui.modules.schoolannouncement
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.databinding.DialogSchoolAnnouncementBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.parseUonetHtml
 import io.github.wulkanowy.utils.serializable
 import io.github.wulkanowy.utils.toFormattedString
 
-class SchoolAnnouncementDialog : DialogFragment() {
-
-    private var binding: DialogSchoolAnnouncementBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class SchoolAnnouncementDialog : BaseDialogFragment<DialogSchoolAnnouncementBinding>() {
 
     private lateinit var announcement: SchoolAnnouncement
 
@@ -30,15 +29,17 @@ class SchoolAnnouncementDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         announcement = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogSchoolAnnouncementBinding.inflate(inflater).also { binding = it }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(
+                DialogSchoolAnnouncementBinding.inflate(layoutInflater)
+                    .apply { binding = this }.root
+            )
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
index 77a3c6cf..98ac1573 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
@@ -8,13 +8,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.thelittlefireman.appkillermanager.AppKillerManager
 import com.thelittlefireman.appkillermanager.exceptions.NoActionFoundException
 import dagger.hilt.android.AndroidEntryPoint
@@ -149,7 +149,7 @@ class NotificationsFragment : PreferenceFragmentCompat(),
     }
 
     override fun showFixSyncDialog() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.pref_notify_fix_sync_issues)
             .setMessage(R.string.pref_notify_fix_sync_issues_message)
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
@@ -177,7 +177,7 @@ class NotificationsFragment : PreferenceFragmentCompat(),
     }
 
     override fun openNotificationsPermissionDialog() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.notifications_header_title)
             .setMessage(R.string.notifications_header_description)
             .setPositiveButton(R.string.pref_notification_go_to_settings) { _, _ ->
@@ -191,7 +191,7 @@ class NotificationsFragment : PreferenceFragmentCompat(),
     }
 
     override fun openNotificationPiggyBackPermissionDialog() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(getString(R.string.pref_notification_piggyback_popup_title))
             .setMessage(getString(R.string.pref_notification_piggyback_popup_description))
             .setPositiveButton(getString(R.string.pref_notification_go_to_settings)) { _, _ ->
@@ -205,7 +205,7 @@ class NotificationsFragment : PreferenceFragmentCompat(),
     }
 
     override fun openNotificationExactAlarmSettings() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(getString(R.string.pref_notification_exact_alarm_popup_title))
             .setMessage(getString(R.string.pref_notification_exact_alarm_popup_descriptions))
             .setPositiveButton(getString(R.string.pref_notification_go_to_settings)) { _, _ ->
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
index 8477e322..2a804d9f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
@@ -75,7 +76,11 @@ class SyncFragment : PreferenceFragmentCompat(),
     }
 
     override fun showMessage(text: String) {
-        (activity as? BaseActivity<*, *>)?.showMessage(text)
+        Snackbar.make(requireView(), text, Snackbar.LENGTH_LONG)
+            .apply {
+                anchorView = requireActivity().findViewById(R.id.main_bottom_nav)
+                show()
+            }
     }
 
     override fun showExpiredDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
index 2f0d697f..d917e7d5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -160,7 +160,7 @@ class TimetableAdapter @Inject constructor() :
 
                 timetableSmallItemDescription.setTextColor(
                     root.context.getThemeAttrColor(
-                        if (lesson.canceled) R.attr.colorPrimary
+                        if (lesson.canceled) R.attr.colorTimetableCanceled
                         else R.attr.colorTimetableChange
                     )
                 )
@@ -185,7 +185,7 @@ class TimetableAdapter @Inject constructor() :
 
                 timetableItemDescription.setTextColor(
                     root.context.getThemeAttrColor(
-                        if (lesson.canceled) R.attr.colorPrimary
+                        if (lesson.canceled) R.attr.colorTimetableCanceled
                         else R.attr.colorTimetableChange
                     )
                 )
@@ -228,8 +228,8 @@ class TimetableAdapter @Inject constructor() :
     }
 
     private fun updateNumberAndSubjectCanceledColor(numberView: TextView, subjectView: TextView) {
-        numberView.setTextColor(numberView.context.getThemeAttrColor(R.attr.colorPrimary))
-        subjectView.setTextColor(subjectView.context.getThemeAttrColor(R.attr.colorPrimary))
+        numberView.setTextColor(numberView.context.getThemeAttrColor(R.attr.colorTimetableCanceled))
+        subjectView.setTextColor(subjectView.context.getThemeAttrColor(R.attr.colorTimetableCanceled))
     }
 
     private fun updateNumberColor(numberView: TextView, lesson: Timetable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index 4f5547d2..e8a85347 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -1,24 +1,24 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
+import android.app.Dialog
 import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.databinding.DialogTimetableBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.*
 import java.time.Instant
 
-class TimetableDialog : DialogFragment() {
-
-    private var binding: DialogTimetableBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class TimetableDialog : BaseDialogFragment<DialogTimetableBinding>() {
 
     private lateinit var lesson: Timetable
 
@@ -33,15 +33,14 @@ class TimetableDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         lesson = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogTimetableBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(DialogTimetableBinding.inflate(layoutInflater).apply { binding = this }.root)
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -82,12 +81,12 @@ class TimetableDialog : DialogFragment() {
                     if (canceled) {
                         timetableDialogChangesTitle.setTextColor(
                             requireContext().getThemeAttrColor(
-                                R.attr.colorPrimary
+                                R.attr.colorTimetableCanceled
                             )
                         )
                         timetableDialogChangesValue.setTextColor(
                             requireContext().getThemeAttrColor(
-                                R.attr.colorPrimary
+                                R.attr.colorTimetableCanceled
                             )
                         )
                     } else {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index e95d6f82..ebc16239 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -87,7 +87,7 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
             timetableNavDate.setOnClickListener { presenter.onPickDate() }
             timetableNextButton.setOnClickListener { presenter.onNextDay() }
 
-            timetableNavContainer.elevation = requireContext().dpToPx(8f)
+            timetableNavContainer.elevation = requireContext().dpToPx(3f)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
index 043fa1f7..faa833c2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.ui.modules.timetable.additional
 
 import android.os.Bundle
 import android.view.View
-import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
@@ -13,11 +13,7 @@ import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.additional.add.AdditionalLessonAddDialog
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.firstSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.openMaterialDatePicker
+import io.github.wulkanowy.utils.*
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -73,7 +69,7 @@ class AdditionalLessonsFragment :
 
             openAddAdditionalLessonButton.setOnClickListener { presenter.onAdditionalLessonAddButtonClicked() }
 
-            additionalLessonsNavContainer.elevation = requireContext().dpToPx(8f)
+            additionalLessonsNavContainer.elevation = requireContext().dpToPx(3f)
         }
     }
 
@@ -154,7 +150,7 @@ class AdditionalLessonsFragment :
     }
 
     override fun showDeleteLessonDialog(timetableAdditional: TimetableAdditional) {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(getString(R.string.additional_lessons_delete_title))
             .setItems(
                 arrayOf(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
index f82d6483..13471997 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/add/AdditionalLessonAddDialog.kt
@@ -1,10 +1,10 @@
 package io.github.wulkanowy.ui.modules.timetable.additional.add
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.widget.doOnTextChanged
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.TimeFormat
 import dagger.hilt.android.AndroidEntryPoint
@@ -29,16 +29,14 @@ class AdditionalLessonAddDialog : BaseDialogFragment<DialogAdditionalAddBinding>
         fun newInstance() = AdditionalLessonAddDialog()
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-    }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogAdditionalAddBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(
+                DialogAdditionalAddBinding.inflate(layoutInflater).apply { binding = this }.root
+            )
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
index ddd7488e..d937d4dd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -1,19 +1,18 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
+import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.databinding.DialogLessonCompletedBinding
-import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.utils.serializable
 
-class CompletedLessonDialog : DialogFragment() {
-
-    private var binding: DialogLessonCompletedBinding by lifecycleAwareVariable()
+@AndroidEntryPoint
+class CompletedLessonDialog : BaseDialogFragment<DialogLessonCompletedBinding>() {
 
     private lateinit var completedLesson: CompletedLesson
 
@@ -28,15 +27,16 @@ class CompletedLessonDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
         completedLesson = requireArguments().serializable(ARGUMENT_KEY)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ) = DialogLessonCompletedBinding.inflate(inflater).apply { binding = this }.root
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return MaterialAlertDialogBuilder(requireContext(), theme)
+            .setView(
+                DialogLessonCompletedBinding.inflate(layoutInflater).apply { binding = this }.root
+            )
+            .create()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
index 34a69e6a..77a7bbd5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -2,9 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.os.Bundle
 import android.view.View
-import android.view.View.GONE
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
+import android.view.View.*
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -14,12 +12,7 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.firstSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.getCompatDrawable
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.lastSchoolDayInSchoolYear
-import io.github.wulkanowy.utils.openMaterialDatePicker
+import io.github.wulkanowy.utils.*
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -73,7 +66,7 @@ class CompletedLessonsFragment :
             completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
             completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
 
-            completedLessonsNavContainer.elevation = requireContext().dpToPx(8f)
+            completedLessonsNavContainer.elevation = requireContext().dpToPx(3f)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
index 6ef6cfc9..672dbe72 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -2,14 +2,11 @@ package io.github.wulkanowy.ui.modules.timetablewidget
 
 import android.appwidget.AppWidgetManager.*
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-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.StudentWithSemesters
 import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
@@ -34,8 +31,6 @@ class TimetableWidgetConfigureActivity :
     @Inject
     lateinit var appInfo: AppInfo
 
-    private var dialog: AlertDialog? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
@@ -61,23 +56,6 @@ class TimetableWidgetConfigureActivity :
         configureAdapter.onClickListener = presenter::onItemSelect
     }
 
-    override fun showThemeDialog() {
-        var items = arrayOf(
-            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)
-            .setTitle(R.string.widget_timetable_theme_title)
-            .setOnDismissListener { presenter.onDismissThemeView() }
-            .setSingleChoiceItems(items, -1) { _, which ->
-                presenter.onThemeSelect(which)
-            }
-            .show()
-    }
-
     override fun updateData(data: List<StudentWithSemesters>, selectedStudentId: Long) {
         with(configureAdapter) {
             selectedId = selectedStudentId
@@ -110,9 +88,4 @@ class TimetableWidgetConfigureActivity :
     override fun openLoginView() {
         startActivity(LoginActivity.getStartIntent(this))
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        dialog?.dismiss()
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index dc2a7c6c..87e89336 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -8,7 +8,6 @@ import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
@@ -39,22 +38,9 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
 
     fun onItemSelect(student: Student) {
         selectedStudent = student
-
-        if (isFromProvider) registerStudent(selectedStudent)
-        else view?.showThemeDialog()
-    }
-
-    fun onThemeSelect(index: Int) {
-        appWidgetId?.let {
-            sharedPref.putLong(getThemeWidgetKey(it), index.toLong())
-        }
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView() {
-        view?.finishView()
-    }
-
     private fun loadData() {
         resourceFlow { studentRepository.getSavedStudents(false) }.onEach {
             when (it) {
@@ -65,10 +51,7 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
                     } ?: -1
                     when {
                         it.data.isEmpty() -> view?.openLoginView()
-                        it.data.size == 1 && !isFromProvider -> {
-                            selectedStudent = it.data.single().student
-                            view?.showThemeDialog()
-                        }
+                        it.data.size == 1 && !isFromProvider -> onItemSelect(it.data.single().student)
                         else -> view?.updateData(it.data, selectedStudentId)
                     }
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
index accdc28d..7740b9bb 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
@@ -11,8 +11,6 @@ interface TimetableWidgetConfigureView : BaseView {
 
     fun updateTimetableWidget(widgetId: Int)
 
-    fun showThemeDialog()
-
     fun setSuccessResult(widgetId: Int)
 
     fun finishView()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index 664086bc..9c5abe1c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -1,27 +1,25 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import android.annotation.SuppressLint
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.graphics.Paint.ANTI_ALIAS_FLAG
 import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.widget.AdapterView.INVALID_POSITION
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.dataOrNull
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.data.enums.TimetableMode
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.data.toFirstResult
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getCurrentThemeWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getTodayLastLessonEndDateTimeWidgetKey
@@ -29,13 +27,13 @@ import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
+import java.time.Instant
 import java.time.LocalDate
 
 class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
-    private val prefRepository: PreferencesRepository,
     private val sharedPref: SharedPrefProvider,
     private val context: Context,
     private val intent: Intent?
@@ -43,19 +41,22 @@ class TimetableWidgetFactory(
 
     private var lessons = emptyList<Timetable>()
 
-    private var savedCurrentTheme: Long? = null
-
-    private var primaryColor: Int? = null
+    private var timetableCanceledColor: Int? = null
 
     private var textColor: Int? = null
 
     private var timetableChangeColor: Int? = null
 
+    private var lastSyncInstant: Instant? = null
+
     override fun getLoadingView() = null
 
     override fun hasStableIds() = true
 
-    override fun getCount() = lessons.size
+    override fun getCount() = when {
+        lessons.isEmpty() -> 0
+        else -> lessons.size + 1
+    }
 
     override fun getViewTypeCount() = 2
 
@@ -70,195 +71,170 @@ class TimetableWidgetFactory(
             val date = LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(appWidgetId), 0))
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
-            updateTheme(appWidgetId)
-            lessons = getLessons(date, studentId)
-
-            val todayLastLessonEndTimestamp = lessons.maxOfOrNull { it.end }
-            if (date == LocalDate.now() && todayLastLessonEndTimestamp != null) {
-                sharedPref.putLong(
-                    key = getTodayLastLessonEndDateTimeWidgetKey(appWidgetId),
-                    value = todayLastLessonEndTimestamp.epochSecond,
-                    sync = true
-                )
-            }
-        }
-    }
-
-    private fun updateTheme(appWidgetId: Int) {
-        savedCurrentTheme = sharedPref.getLong(getCurrentThemeWidgetKey(appWidgetId), 0)
-
-        if (savedCurrentTheme == 0L) {
-            primaryColor = R.color.colorPrimary
-            textColor = android.R.color.black
-            timetableChangeColor = R.color.timetable_change_dark
-        } else {
-            primaryColor = R.color.colorPrimaryLight
-            textColor = android.R.color.white
-            timetableChangeColor = R.color.timetable_change_light
-        }
-    }
-
-    private fun getItemLayout(lesson: Timetable): Int {
-        return when {
-            prefRepository.showWholeClassPlan == TimetableMode.SMALL_OTHER_GROUP && !lesson.isStudentPlan -> {
-                if (savedCurrentTheme == 0L) R.layout.item_widget_timetable_small
-                else R.layout.item_widget_timetable_small_dark
-            }
-            savedCurrentTheme == 1L -> R.layout.item_widget_timetable_dark
-            else -> R.layout.item_widget_timetable
-        }
-    }
-
-    private fun getLessons(date: LocalDate, studentId: Long) = try {
-        runBlocking {
-            if (!studentRepository.isStudentSaved()) return@runBlocking emptyList<Timetable>()
-
-            val students = studentRepository.getSavedStudents()
-            val student = students.singleOrNull { it.student.id == studentId }?.student
-                ?: return@runBlocking emptyList<Timetable>()
-
-            val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, date, date, false)
-                .toFirstResult().dataOrNull?.lessons.orEmpty()
-                .sortedWith(compareBy({ it.number }, { !it.isStudentPlan }))
-                .filter {
-                    if (prefRepository.showWholeClassPlan == TimetableMode.ONLY_CURRENT_GROUP) {
-                        it.isStudentPlan
-                    } else true
+            runCatching {
+                runBlocking {
+                    val student = getStudent(studentId) ?: return@runBlocking
+                    val semester = semesterRepository.getCurrentSemester(student)
+                    lessons = getLessons(student, semester, date)
+                    lastSyncInstant =
+                        timetableRepository.getLastRefreshTimestamp(semester, date, date)
+                    if (date == LocalDate.now()) {
+                        updateTodayLastLessonEnd(appWidgetId)
+                    }
                 }
+            }.onFailure {
+                Timber.e(it, "An error has occurred in timetable widget factory")
+            }
         }
-    } catch (e: Exception) {
-        Timber.e(e, "An error has occurred in timetable widget factory")
-        emptyList()
     }
 
-    @SuppressLint("DefaultLocale")
+    private suspend fun getStudent(studentId: Long): Student? {
+        val students = studentRepository.getSavedStudents()
+        return students.singleOrNull { it.student.id == studentId }?.student
+    }
+
+    private suspend fun getLessons(
+        student: Student, semester: Semester, date: LocalDate
+    ): List<Timetable> {
+        val timetable = timetableRepository.getTimetable(student, semester, date, date, false)
+        val lessons = timetable.toFirstResult().dataOrNull?.lessons.orEmpty()
+        return lessons.sortedBy { it.number }
+    }
+
+    private fun updateTodayLastLessonEnd(appWidgetId: Int) {
+        val todayLastLessonEnd = lessons.maxOfOrNull { it.end } ?: return
+        val key = getTodayLastLessonEndDateTimeWidgetKey(appWidgetId)
+        sharedPref.putLong(key, todayLastLessonEnd.epochSecond, true)
+    }
+
+    companion object {
+        const val TIME_FORMAT_STYLE = "HH:mm"
+    }
+
     override fun getViewAt(position: Int): RemoteViews? {
-        if (position == INVALID_POSITION || lessons.getOrNull(position) == null) return null
-
-        val lesson = lessons[position]
-        return RemoteViews(context.packageName, getItemLayout(lesson)).apply {
-            setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
-            setTextViewText(R.id.timetableWidgetItemNumber, lesson.number.toString())
-            setTextViewText(
-                R.id.timetableWidgetItemTimeStart,
-                lesson.start.toFormattedString("HH:mm")
-            )
-            setTextViewText(
-                R.id.timetableWidgetItemTimeFinish,
-                lesson.end.toFormattedString("HH:mm")
-            )
-
-            updateDescription(this, lesson)
-
-            if (lesson.canceled) {
-                updateStylesCanceled(this)
-            } else {
-                updateStylesNotCanceled(this, lesson)
+        if (position == lessons.size) {
+            val synchronizationInstant = lastSyncInstant ?: Instant.MIN
+            val synchronizationText = getSynchronizationInfoText(synchronizationInstant)
+            return RemoteViews(context.packageName, R.layout.item_widget_timetable_footer).apply {
+                setTextViewText(R.id.timetableWidgetSynchronizationTime, synchronizationText)
             }
+        }
 
+        val lesson = lessons.getOrNull(position) ?: return null
+
+        val lessonStartTime = lesson.start.toFormattedString(TIME_FORMAT_STYLE)
+        val lessonEndTime = lesson.end.toFormattedString(TIME_FORMAT_STYLE)
+        val roomText = "${context.getString(R.string.timetable_room)} ${lesson.room}"
+
+        val remoteViews = RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
+            setTextViewText(R.id.timetableWidgetItemNumber, lesson.number.toString())
+            setTextViewText(R.id.timetableWidgetItemTimeStart, lessonStartTime)
+            setTextViewText(R.id.timetableWidgetItemTimeFinish, lessonEndTime)
+            setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
+            setTextViewText(R.id.timetableWidgetItemRoom, roomText)
+            setTextViewText(R.id.timetableWidgetItemTeacher, lesson.teacher)
+            setTextViewText(R.id.timetableWidgetItemDescription, lesson.info)
             setOnClickFillInIntent(R.id.timetableWidgetItemContainer, Intent())
         }
+
+        updateTheme()
+        clearLessonStyles(remoteViews)
+
+        when {
+            lesson.canceled -> applyCancelledLessonStyles(remoteViews)
+            lesson.changes or lesson.info.isNotBlank() -> applyChangedLessonStyles(
+                remoteViews, lesson
+            )
+        }
+
+        return remoteViews
     }
 
-    private fun updateDescription(remoteViews: RemoteViews, lesson: Timetable) {
-        with(remoteViews) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                setTextViewText(R.id.timetableWidgetItemDescription, lesson.info)
-                setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
-                setViewVisibility(R.id.timetableWidgetItemRoom, GONE)
-                setViewVisibility(R.id.timetableWidgetItemTeacher, GONE)
-            } else {
-                setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
-                setViewVisibility(R.id.timetableWidgetItemRoom, VISIBLE)
-                setViewVisibility(R.id.timetableWidgetItemTeacher, VISIBLE)
+    private fun updateTheme() {
+        when (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_YES -> {
+                textColor = android.R.color.white
+                timetableChangeColor = R.color.timetable_change_dark
+                timetableCanceledColor = R.color.timetable_canceled_dark
+            }
+
+            else -> {
+                textColor = android.R.color.black
+                timetableChangeColor = R.color.timetable_change_light
+                timetableCanceledColor = R.color.timetable_canceled_light
             }
         }
     }
 
-    private fun updateStylesCanceled(remoteViews: RemoteViews) {
-        with(remoteViews) {
-            setInt(
-                R.id.timetableWidgetItemSubject, "setPaintFlags",
-                STRIKE_THRU_TEXT_FLAG or ANTI_ALIAS_FLAG
-            )
-            setTextColor(R.id.timetableWidgetItemNumber, context.getCompatColor(primaryColor!!))
-            setTextColor(R.id.timetableWidgetItemSubject, context.getCompatColor(primaryColor!!))
-            setTextColor(
-                R.id.timetableWidgetItemDescription,
-                context.getCompatColor(primaryColor!!)
-            )
-        }
-    }
+    private fun clearLessonStyles(remoteViews: RemoteViews) {
+        val defaultTextColor = context.getCompatColor(textColor ?: 0)
 
-    private fun updateStylesNotCanceled(remoteViews: RemoteViews, lesson: Timetable) {
-        with(remoteViews) {
+        remoteViews.apply {
             setInt(R.id.timetableWidgetItemSubject, "setPaintFlags", ANTI_ALIAS_FLAG)
-            setTextColor(R.id.timetableWidgetItemSubject, context.getCompatColor(textColor!!))
-            setTextColor(
-                R.id.timetableWidgetItemDescription,
-                context.getCompatColor(timetableChangeColor!!)
-            )
-
-            updateNotCanceledLessonNumberColor(this, lesson)
-            updateNotCanceledSubjectColor(this, lesson)
-
-            val teacherChange = lesson.teacherOld.isNotBlank()
-            updateNotCanceledRoom(this, lesson, teacherChange)
-            updateNotCanceledTeacher(this, lesson, teacherChange)
+            setViewVisibility(R.id.timetableWidgetItemRoom, VISIBLE)
+            setViewVisibility(R.id.timetableWidgetItemTeacher, VISIBLE)
+            setViewVisibility(R.id.timetableWidgetItemIcon, GONE)
+            setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
+            setTextColor(R.id.timetableWidgetItemNumber, defaultTextColor)
+            setTextColor(R.id.timetableWidgetItemSubject, defaultTextColor)
+            setTextColor(R.id.timetableWidgetItemRoom, defaultTextColor)
+            setTextColor(R.id.timetableWidgetItemTeacher, defaultTextColor)
+            setTextColor(R.id.timetableWidgetItemDescription, defaultTextColor)
         }
     }
 
-    private fun updateNotCanceledLessonNumberColor(remoteViews: RemoteViews, lesson: Timetable) {
-        remoteViews.setTextColor(
-            R.id.timetableWidgetItemNumber, context.getCompatColor(
-                if (lesson.changes || (lesson.info.isNotBlank() && !lesson.canceled)) timetableChangeColor!!
-                else textColor!!
-            )
-        )
-    }
+    private fun applyCancelledLessonStyles(remoteViews: RemoteViews) {
+        val cancelledThemeColor = context.getCompatColor(timetableCanceledColor ?: 0)
+        val strikeThroughPaintFlags = STRIKE_THRU_TEXT_FLAG or ANTI_ALIAS_FLAG
 
-    private fun updateNotCanceledSubjectColor(remoteViews: RemoteViews, lesson: Timetable) {
-        remoteViews.setTextColor(
-            R.id.timetableWidgetItemSubject, context.getCompatColor(
-                if (lesson.subjectOld.isNotBlank() && lesson.subject != lesson.subjectOld) timetableChangeColor!!
-                else textColor!!
-            )
-        )
-    }
-
-    private fun updateNotCanceledRoom(
-        remoteViews: RemoteViews,
-        lesson: Timetable,
-        teacherChange: Boolean
-    ) {
-        with(remoteViews) {
-            if (lesson.room.isNotBlank()) {
-                setTextViewText(
-                    R.id.timetableWidgetItemRoom,
-                    if (teacherChange) lesson.room
-                    else "${context.getString(R.string.timetable_room)} ${lesson.room}"
-                )
-
-                setTextColor(
-                    R.id.timetableWidgetItemRoom, context.getCompatColor(
-                        if (lesson.roomOld.isNotBlank() && lesson.room != lesson.roomOld) timetableChangeColor!!
-                        else textColor!!
-                    )
-                )
-            } else setTextViewText(R.id.timetableWidgetItemRoom, "")
+        remoteViews.apply {
+            setInt(R.id.timetableWidgetItemSubject, "setPaintFlags", strikeThroughPaintFlags)
+            setTextColor(R.id.timetableWidgetItemNumber, cancelledThemeColor)
+            setTextColor(R.id.timetableWidgetItemSubject, cancelledThemeColor)
+            setTextColor(R.id.timetableWidgetItemDescription, cancelledThemeColor)
+            setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
+            setViewVisibility(R.id.timetableWidgetItemRoom, GONE)
+            setViewVisibility(R.id.timetableWidgetItemTeacher, GONE)
         }
     }
 
-    private fun updateNotCanceledTeacher(
-        remoteViews: RemoteViews,
-        lesson: Timetable,
-        teacherChange: Boolean
-    ) {
-        remoteViews.setTextViewText(
-            R.id.timetableWidgetItemTeacher,
-            if (teacherChange) lesson.teacher
-            else ""
-        )
+    private fun applyChangedLessonStyles(remoteViews: RemoteViews, lesson: Timetable) {
+        val changesTextColor = context.getCompatColor(timetableChangeColor ?: 0)
+
+        remoteViews.apply {
+            setTextColor(R.id.timetableWidgetItemNumber, changesTextColor)
+            setTextColor(R.id.timetableWidgetItemDescription, changesTextColor)
+            setViewVisibility(R.id.timetableWidgetItemIcon, VISIBLE)
+            setImageViewResource(R.id.timetableWidgetItemIcon, R.drawable.ic_timetable_widget_swap)
+        }
+
+        if (lesson.subject != lesson.subjectOld) {
+            remoteViews.setTextColor(R.id.timetableWidgetItemSubject, changesTextColor)
+        }
+
+        if (lesson.room != lesson.roomOld) {
+            remoteViews.setTextColor(R.id.timetableWidgetItemRoom, changesTextColor)
+        }
+
+        if (lesson.teacher != lesson.teacherOld) {
+            remoteViews.setTextColor(R.id.timetableWidgetItemTeacher, changesTextColor)
+        }
+
+        if (lesson.info.isNotBlank() && !lesson.changes) {
+            remoteViews.setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
+            remoteViews.setViewVisibility(R.id.timetableWidgetItemRoom, GONE)
+            remoteViews.setViewVisibility(R.id.timetableWidgetItemTeacher, GONE)
+        }
     }
+
+    private fun getSynchronizationInfoText(synchronizationInstant: Instant) =
+        synchronizationInstant.run {
+            val synchronizationTime = toFormattedString(TIME_FORMAT_STYLE)
+            val synchronizationDate = toFormattedString()
+            context.getString(
+                R.string.widget_timetable_last_synchronization,
+                synchronizationDate,
+                synchronizationTime,
+            )
+        }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 3ba2ae94..624ca30f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -8,10 +8,10 @@ import android.content.Context
 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 androidx.appcompat.content.res.AppCompatResources
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.core.graphics.drawable.toBitmap
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
@@ -70,11 +70,6 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             "timetable_widget_today_last_lesson_end_date_time_$appWidgetId"
 
         fun getStudentWidgetKey(appWidgetId: Int) = "timetable_widget_student_$appWidgetId"
-
-        fun getThemeWidgetKey(appWidgetId: Int) = "timetable_widget_theme_$appWidgetId"
-
-        fun getCurrentThemeWidgetKey(appWidgetId: Int) =
-            "timetable_widget_current_theme_$appWidgetId"
     }
 
     @OptIn(DelicateCoroutinesApi::class)
@@ -109,8 +104,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             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
+                sharedPref.getLong(getStudentWidgetKey(toggledWidgetId), 0), toggledWidgetId
             )
             val savedDate =
                 LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
@@ -122,8 +116,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             }
             if (!buttonType.isNullOrBlank()) {
                 analytics.logEvent(
-                    "changed_timetable_widget_day",
-                    "button" to buttonType
+                    "changed_timetable_widget_day", "button" to buttonType
                 )
             }
             updateWidget(context, toggledWidgetId, date, student)
@@ -137,49 +130,21 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             with(sharedPref) {
                 delete(getStudentWidgetKey(appWidgetId))
                 delete(getDateWidgetKey(appWidgetId))
-                delete(getThemeWidgetKey(appWidgetId))
-                delete(getCurrentThemeWidgetKey(appWidgetId))
             }
         }
     }
 
     private fun updateWidget(
-        context: Context,
-        appWidgetId: Int,
-        date: LocalDate,
-        student: Student?
+        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
-        var currentTheme = 0L
-        var layoutId = R.layout.widget_timetable
-
-        if (savedConfigureTheme == 1L || (savedConfigureTheme == 2L && isSystemDarkMode)) {
-            currentTheme = 1L
-            layoutId = R.layout.widget_timetable_dark
-        }
-
         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 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,
-            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)
-            }, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-
-        )
+        val adapterIntent = Intent(context, TimetableWidgetService::class.java).apply {
+            putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
+            action = appWidgetId.toString() //make Intent unique
+        }
         val appIntent = PendingIntent.getActivity(
             context,
             TIMETABLE_PENDING_INTENT_ID,
@@ -187,56 +152,41 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
         )
 
-        val remoteView = RemoteViews(context.packageName, layoutId).apply {
+        val formattedDate = date.toFormattedString("EEE, dd.MM").capitalise()
+        val remoteView = RemoteViews(context.packageName, R.layout.widget_timetable).apply {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
-            setTextViewText(
-                R.id.timetableWidgetDate,
-                date.toFormattedString("EEEE, dd.MM").capitalise()
-            )
-            setTextViewText(
-                R.id.timetableWidgetName,
-                student?.nickOrName ?: context.getString(R.string.all_no_data)
-            )
-
-            student?.let {
-                setImageViewBitmap(R.id.timetableWidgetAccount, context.createAvatarBitmap(it))
-            }
-
+            setTextViewText(R.id.timetableWidgetDate, formattedDate)
             setRemoteAdapter(R.id.timetableWidgetList, adapterIntent)
             setOnClickPendingIntent(R.id.timetableWidgetNext, nextNavIntent)
             setOnClickPendingIntent(R.id.timetableWidgetPrev, prevNavIntent)
             setOnClickPendingIntent(R.id.timetableWidgetDate, resetNavIntent)
-            setOnClickPendingIntent(R.id.timetableWidgetName, resetNavIntent)
-            setOnClickPendingIntent(R.id.timetableWidgetAccount, accountIntent)
             setPendingIntentTemplate(R.id.timetableWidgetList, appIntent)
         }
 
+        student?.let {
+            setupAccountView(context, student, remoteView, appWidgetId)
+        }
+
         with(sharedPref) {
-            putLong(getCurrentThemeWidgetKey(appWidgetId), currentTheme)
             putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
         }
 
         with(appWidgetManager) {
-            updateAppWidget(appWidgetId, remoteView)
+            partiallyUpdateAppWidget(appWidgetId, remoteView)
             notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
-            Timber.d("TimetableWidgetProvider updated")
         }
+
+        Timber.d("TimetableWidgetProvider updated")
     }
 
     private fun createNavIntent(
-        context: Context,
-        code: Int,
-        appWidgetId: Int,
-        buttonType: String
+        context: Context, code: Int, appWidgetId: Int, buttonType: String
     ) = PendingIntent.getBroadcast(
-        context,
-        code,
-        Intent(context, TimetableWidgetProvider::class.java).apply {
+        context, code, Intent(context, TimetableWidgetProvider::class.java).apply {
             action = ACTION_APPWIDGET_UPDATE
             putExtra(EXTRA_BUTTON_TYPE, buttonType)
             putExtra(EXTRA_TOGGLED_WIDGET_ID, appWidgetId)
-        },
-        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+        }, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
     )
 
     private suspend fun getStudent(studentId: Long, appWidgetId: Int) = try {
@@ -258,31 +208,6 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         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
-    }
-
     private fun getWidgetDefaultDateToLoad(appWidgetId: Int): LocalDate {
         val lastLessonEndTimestamp =
             sharedPref.getLong(getTodayLastLessonEndDateTimeWidgetKey(appWidgetId), 0)
@@ -299,4 +224,44 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             todayDate.nextOrSameSchoolDay
         }
     }
+
+    private fun setupAccountView(
+        context: Context,
+        student: Student,
+        remoteViews: RemoteViews,
+        appWidgetId: Int
+    ) {
+        val accountInitials = student.nickOrName
+            .split(" ")
+            .mapNotNull { it.firstOrNull() }.take(2)
+            .joinToString(separator = "").uppercase()
+
+        val accountPickerIntent = 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)
+            },
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+        )
+
+        // Create background bitmap
+        val avatarDrawableResource = R.drawable.background_timetable_widget_avatar
+        AppCompatResources.getDrawable(context, avatarDrawableResource)?.let { drawable ->
+            val screenDensity = context.resources.displayMetrics.density
+            val avatarSize = (48 * screenDensity).toInt()
+            val backgroundBitmap = DrawableCompat.wrap(drawable).run {
+                DrawableCompat.setTint(this, student.avatarColor.toInt())
+                toBitmap(avatarSize, avatarSize)
+            }
+            remoteViews.setImageViewBitmap(R.id.timetableWidgetAccountBackground, backgroundBitmap)
+        }
+
+        remoteViews.apply {
+            setTextViewText(R.id.timetableWidgetAccountInitials, accountInitials)
+            setOnClickPendingIntent(R.id.timetableWidgetAccount, accountPickerIntent)
+        }
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
index 032e2d28..76ce66dc 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.utils
 import android.os.Handler
 import android.os.Looper
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -29,18 +30,18 @@ class LifecycleAwareVariable<T : Any> : ReadWriteProperty<Fragment, T>, DefaultL
     }
 }
 
-class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActivity, T>,
+class LifecycleAwareVariableComponent<T : Any> : ReadWriteProperty<LifecycleOwner, T>,
     DefaultLifecycleObserver {
 
     private var _value: T? = null
 
-    override fun setValue(thisRef: AppCompatActivity, property: KProperty<*>, value: T) {
+    override fun setValue(thisRef: LifecycleOwner, property: KProperty<*>, value: T) {
         thisRef.lifecycle.removeObserver(this)
         _value = value
         thisRef.lifecycle.addObserver(this)
     }
 
-    override fun getValue(thisRef: AppCompatActivity, property: KProperty<*>) = _value
+    override fun getValue(thisRef: LifecycleOwner, property: KProperty<*>) = _value
         ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
 
     override fun onDestroy(owner: LifecycleOwner) {
@@ -53,4 +54,8 @@ class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActiv
 @Suppress("unused")
 fun <T : Any> Fragment.lifecycleAwareVariable() = LifecycleAwareVariable<T>()
 
-fun <T : Any> lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
+@Suppress("unused")
+fun <T : Any> DialogFragment.lifecycleAwareVariable() = LifecycleAwareVariableComponent<T>()
+
+@Suppress("unused")
+fun <T : Any> AppCompatActivity.lifecycleAwareVariable() = LifecycleAwareVariableComponent<T>()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
index 93e67be0..72129751 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/RefreshUtils.kt
@@ -49,4 +49,9 @@ class AutoRefreshHelper @Inject constructor(
     fun updateLastRefreshTimestamp(key: String) {
         sharedPref.putLong(key, Instant.now().toEpochMilli())
     }
+
+    fun getLastRefreshTimestamp(key: String): Instant {
+        val refreshTimestampMilli = sharedPref.getLong(key, 0)
+        return Instant.ofEpochMilli(refreshTimestampMilli)
+    }
 }
diff --git a/app/src/main/res/drawable-night/background_header_note.xml b/app/src/main/res/drawable-night/background_header_note.xml
deleted file mode 100644
index 6b594e7c..00000000
--- a/app/src/main/res/drawable-night/background_header_note.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorPrimaryLight" />
-    <corners android:radius="12dp" />
-</shape>
diff --git a/app/src/main/res/drawable/background_grade_details_rounded.xml b/app/src/main/res/drawable/background_grade_details_rounded.xml
new file mode 100644
index 00000000..e24088a0
--- /dev/null
+++ b/app/src/main/res/drawable/background_grade_details_rounded.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF" />
+    <corners android:topLeftRadius="8dp" android:topRightRadius="8dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_grade_details_weight_rounded.xml b/app/src/main/res/drawable/background_grade_details_weight_rounded.xml
new file mode 100644
index 00000000..4b210912
--- /dev/null
+++ b/app/src/main/res/drawable/background_grade_details_weight_rounded.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF" />
+    <corners android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_widget_timetable_dark.xml b/app/src/main/res/drawable/background_grade_rounded.xml
similarity index 74%
rename from app/src/main/res/drawable/background_widget_timetable_dark.xml
rename to app/src/main/res/drawable/background_grade_rounded.xml
index 6fe7d0ab..52c10c2f 100644
--- a/app/src/main/res/drawable/background_widget_timetable_dark.xml
+++ b/app/src/main/res/drawable/background_grade_rounded.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#BB191919" />
+    <solid android:color="#FFFFFF" />
     <corners android:radius="8dp" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/background_widget_item_timetable_dark.xml b/app/src/main/res/drawable/background_grade_small_rounded.xml
similarity index 51%
rename from app/src/main/res/drawable/background_widget_item_timetable_dark.xml
rename to app/src/main/res/drawable/background_grade_small_rounded.xml
index e432a648..dd50417f 100644
--- a/app/src/main/res/drawable/background_widget_item_timetable_dark.xml
+++ b/app/src/main/res/drawable/background_grade_small_rounded.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorWidgetTopBar" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="4dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_header_note.xml b/app/src/main/res/drawable/background_header_note.xml
index c21e55c6..8cf84a1c 100644
--- a/app/src/main/res/drawable/background_header_note.xml
+++ b/app/src/main/res/drawable/background_header_note.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="?colorPrimary" />
     <corners android:radius="12dp" />
 </shape>
diff --git a/app/src/main/res/drawable/background_luckynumber_widget.xml b/app/src/main/res/drawable/background_luckynumber_widget_button.xml
similarity index 65%
rename from app/src/main/res/drawable/background_luckynumber_widget.xml
rename to app/src/main/res/drawable/background_luckynumber_widget_button.xml
index 367c5527..66b1685f 100644
--- a/app/src/main/res/drawable/background_luckynumber_widget.xml
+++ b/app/src/main/res/drawable/background_luckynumber_widget_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#bbffffff" />
-    <corners android:radius="8dp" />
+    <solid android:color="#FFFFDAD5" />
+    <corners android:radius="20dp" />
 </shape>
diff --git a/app/src/main/res/drawable/background_luckynumber_widget_dark.xml b/app/src/main/res/drawable/background_luckynumber_widget_dark.xml
deleted file mode 100644
index cb094b57..00000000
--- a/app/src/main/res/drawable/background_luckynumber_widget_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#BB191919" />
-    <corners android:radius="8dp" />
-</shape>
diff --git a/app/src/main/res/drawable/background_material_alert_dialog.xml b/app/src/main/res/drawable/background_material_alert_dialog.xml
new file mode 100644
index 00000000..5ab8a350
--- /dev/null
+++ b/app/src/main/res/drawable/background_material_alert_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid
+                android:color="@color/m3_popupmenu_overlay_color"
+                tools:ignore="PrivateResource" />
+            <corners
+                android:bottomLeftRadius="28dp"
+                android:bottomRightRadius="28dp"
+                android:topLeftRadius="28dp"
+                android:topRightRadius="28dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/background_timetable_widget_avatar.xml b/app/src/main/res/drawable/background_timetable_widget_avatar.xml
new file mode 100644
index 00000000..7f64c4eb
--- /dev/null
+++ b/app/src/main/res/drawable/background_timetable_widget_avatar.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FF000000" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_widget_header_timetable.xml b/app/src/main/res/drawable/background_widget_header_timetable.xml
deleted file mode 100644
index 98eec700..00000000
--- a/app/src/main/res/drawable/background_widget_header_timetable.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorPrimary" />
-    <corners
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_widget_header_timetable_dark.xml b/app/src/main/res/drawable/background_widget_header_timetable_dark.xml
deleted file mode 100644
index 616a9127..00000000
--- a/app/src/main/res/drawable/background_widget_header_timetable_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorWidgetTopBar" />
-    <corners
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_widget_item_timetable.xml b/app/src/main/res/drawable/background_widget_item_timetable.xml
index 08854fba..09635758 100644
--- a/app/src/main/res/drawable/background_widget_item_timetable.xml
+++ b/app/src/main/res/drawable/background_widget_item_timetable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
+    <solid android:color="#FFFFFBFF" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_widget_timetable.xml b/app/src/main/res/drawable/background_widget_timetable.xml
index 2267587d..b589ad29 100644
--- a/app/src/main/res/drawable/background_widget_timetable.xml
+++ b/app/src/main/res/drawable/background_widget_timetable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#bbffffff" />
-    <corners android:radius="8dp" />
-</shape>
\ No newline at end of file
+    <solid android:color="#FFFFEDEA" />
+    <corners android:radius="28dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left.xml
index ee3ff4be..4250fae4 100644
--- a/app/src/main/res/drawable/ic_chevron_left.xml
+++ b/app/src/main/res/drawable/ic_chevron_left.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_right.xml b/app/src/main/res/drawable/ic_chevron_right.xml
index a6d73497..de5037cf 100644
--- a/app/src/main/res/drawable/ic_chevron_right.xml
+++ b/app/src/main/res/drawable/ic_chevron_right.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
new file mode 100644
index 00000000..f20e2094
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,21q-3.45,0 -6.012,-2.288Q3.425,16.425 3.05,13L5.1,13q0.35,2.6 2.312,4.3Q9.375,19 12,19q2.925,0 4.962,-2.038Q19,14.925 19,12t-2.038,-4.963Q14.925,5 12,5q-1.725,0 -3.225,0.8T6.25,8L9,8v2L3,10L3,4h2v2.35q1.275,-1.6 3.113,-2.475Q9.95,3 12,3q1.875,0 3.513,0.712 1.637,0.713 2.85,1.925 1.212,1.213 1.925,2.85Q21,10.125 21,12t-0.712,3.512q-0.713,1.638 -1.925,2.85 -1.213,1.213 -2.85,1.926Q13.875,21 12,21ZM14.8,16.2L11,12.4L11,7h2v4.6l3.2,3.2Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_scale_balance.xml b/app/src/main/res/drawable/ic_scale_balance.xml
new file mode 100644
index 00000000..c65467a6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_scale_balance.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M12,3C10.73,3 9.6,3.8 9.18,5H3V7H4.95L2,14C1.53,16 3,17 5.5,17C8,17 9.56,16 9,14L6.05,7H9.17C9.5,7.85 10.15,8.5 11,8.83V20H2V22H22V20H13V8.82C13.85,8.5 14.5,7.85 14.82,7H17.95L15,14C14.53,16 16,17 18.5,17C21,17 22.56,16 22,14L19.05,7H21V5H14.83C14.4,3.8 13.27,3 12,3M12,5A1,1 0 0,1 13,6A1,1 0 0,1 12,7A1,1 0 0,1 11,6A1,1 0 0,1 12,5M5.5,10.25L7,14H4L5.5,10.25M18.5,10.25L20,14H17L18.5,10.25Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_timetable_widget_swap.xml b/app/src/main/res/drawable/ic_timetable_widget_swap.xml
new file mode 100644
index 00000000..2f91489a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timetable_widget_swap.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="m7,20 l-5,-5 5,-5 1.4,1.425L5.825,14L13,14v2L5.825,16L8.4,18.575ZM17,14 L15.6,12.575L18.175,10L11,10L11,8h7.175L15.6,5.425 17,4l5,5Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_widget_chevron.png b/app/src/main/res/drawable/ic_widget_chevron.png
deleted file mode 100644
index 34345521a5b5f97b7a8bb543c3f86104ac914c4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4rT@hhU+WOo?>8N;0f>vadj{7`40nZ^Dlrj
zu#^P(1vC7s4-ZV7smH*;py=u17@~1LIYHu2Lnmjug|f0<VOmtz<7o@_@pL*GWiT*=
Ytz+<fJ+t^O0|Nttr>mdKI;Vst026U54FCWD

diff --git a/app/src/main/res/drawable/ic_widget_chevron.xml b/app/src/main/res/drawable/ic_widget_chevron.xml
new file mode 100644
index 00000000..2c88f818
--- /dev/null
+++ b/app/src/main/res/drawable/ic_widget_chevron.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.025,22 L6.25,20.225 14.475,12 6.25,3.775 8.025,2l10,10Z" />
+</vector>
diff --git a/app/src/main/res/drawable/img_luckynumber_widget_preview.png b/app/src/main/res/drawable/img_luckynumber_widget_preview.png
index 539b0a598422fe833ab445130c55c51373473568..267018550f11c15ad0a1c0ecefc14285a5e23d8b 100644
GIT binary patch
literal 3702
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
S&N47CFnGH9xvX<aXaWEi8_;zC

literal 19550
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
af8mmQcV?`ZJC%Wffx*+&&t;ucLK6VSlAzlF

diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.png b/app/src/main/res/drawable/img_timetable_widget_preview.png
index 8494301878a1bdcb838aee6ee82be8b42c3904cd..a81bcf361e5a22491599f8fb785a07ca1a42c37d 100755
GIT binary patch
literal 21111
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
bi-Ccg@uSalw&_c=6hVAXS3j3^P6<r_NbWqL

literal 25538
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
a7@WQ}cYo|FUBbY?z~JfX=d#Wzp$PyTIx6n~

diff --git a/app/src/main/res/drawable/shape_badge.xml b/app/src/main/res/drawable/shape_badge.xml
new file mode 100644
index 00000000..3153f592
--- /dev/null
+++ b/app/src/main/res/drawable/shape_badge.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="196dp"
+    android:height="196dp"
+    android:viewportWidth="174"
+    android:viewportHeight="174">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M71.54 4.658a32 32 0 0 1 31.068 0.013l11.9 6.614a32.03 32.03 0 0 0 6.735 2.793l13.089 3.749a32 32 0 0 1 21.958 21.978l3.738 13.092c0.669 2.344 1.605 4.605 2.787 6.737l6.604 11.906a32 32 0 0 1-0.013 31.068l-6.615 11.9c-1.184 2.132-2.121 4.391-2.792 6.735l-3.75 13.088c-3.043 10.624-11.351 18.926-21.977 21.959l-13.092 3.738a32 32 0 0 0-6.737 2.787l-11.906 6.604c-9.664 5.36-21.409 5.355-31.068-0.013l-11.9-6.615c-2.131-1.184-4.391-2.121-6.734-2.793l-13.089-3.749a32 32 0 0 1-21.959-21.977l-3.738-13.092a31.95 31.95 0 0 0-2.787-6.737l-6.604-11.906a32 32 0 0 1 0.013-31.068l6.614-11.9c1.185-2.131 2.122-4.391 2.793-6.735l3.749-13.088a32 32 0 0 1 21.978-21.959l13.092-3.738a31.95 31.95 0 0 0 6.737-2.787L71.54 4.658z" />
+</vector>
diff --git a/app/src/main/res/layout-v31/widget_timetable_preview.xml b/app/src/main/res/layout-v31/widget_timetable_preview.xml
new file mode 100644
index 00000000..bc556f50
--- /dev/null
+++ b/app/src/main/res/layout-v31/widget_timetable_preview.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/background_widget_timetable"
+    android:backgroundTint="?attr/colorSurface"
+    android:clipToOutline="true"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp"
+    android:theme="@style/Wulkanowy.Widget.Theme"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingVertical="16dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:lines="1"
+            android:text="Pon, 03.10"
+            android:textAppearance="?attr/textAppearanceHeadline5"
+            tools:ignore="HardcodedText" />
+
+        <ImageButton
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="12dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/all_prev"
+            android:rotation="180"
+            android:src="@drawable/ic_widget_chevron"
+            android:tint="?attr/colorPrimary"
+            app:tint="?attr/colorPrimary"
+            tools:ignore="UseAppTint" />
+
+        <ImageButton
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/all_next"
+            android:src="@drawable/ic_widget_chevron"
+            android:tint="?attr/colorPrimary"
+            app:tint="?attr/colorPrimary"
+            tools:ignore="UseAppTint" />
+
+        <TextView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="12dp"
+            android:background="@drawable/background_timetable_widget_avatar"
+            android:backgroundTint="?attr/colorPrimary"
+            android:contentDescription="@string/account_quick_manager"
+            android:gravity="center"
+            android:text="AW"
+            android:textAppearance="?attr/textAppearanceTitleLarge"
+            android:textColor="?attr/colorOnPrimary" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:showDividers="middle">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:layout_marginBottom="4dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/background_widget_item_timetable"
+            app:tint="?attr/backgroundColor" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:layout_marginBottom="4dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/background_widget_item_timetable"
+            app:tint="?attr/backgroundColor" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/background_widget_item_timetable"
+            app:tint="?attr/backgroundColor" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 11844e24..d14de50a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,24 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/main_toolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Surface"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/main_app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:contentInsetStartWithNavigation="0dp"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:fitsSystemWindows="true"
+        app:layout_constraintBaseline_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/main_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+    </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/main_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/main_bottom_nav"
-        app:layout_constraintTop_toBottomOf="@id/main_toolbar" />
+        app:layout_constraintTop_toBottomOf="@id/main_app_bar"
+        tools:layout="@layout/fragment_dashboard" />
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/main_message_container"
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index a8041d61..fac27d99 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -7,16 +7,18 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/sendMessageToolbar"
-        style="@style/Widget.MaterialComponents.Toolbar.Surface"
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/send_app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
-        app:layout_constraintBottom_toTopOf="@id/sendMessageScroll"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:fitsSystemWindows="true"
+        app:layout_constraintBaseline_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/sendMessageToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+    </com.google.android.material.appbar.AppBarLayout>
 
     <io.github.wulkanowy.materialchipsinput.ConsumedNestedScrollView
         android:id="@+id/sendMessageScroll"
@@ -26,7 +28,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar">
+        app:layout_constraintTop_toBottomOf="@id/send_app_bar">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -185,7 +187,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar"
+        app:layout_constraintTop_toBottomOf="@id/send_app_bar"
         tools:ignore="UseCompoundDrawables">
 
         <ImageView
@@ -214,5 +216,5 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sendMessageToolbar" />
+        app:layout_constraintTop_toBottomOf="@id/send_app_bar" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_account_edit.xml b/app/src/main/res/layout/dialog_account_edit.xml
index 9f617e44..2ab4ccc6 100644
--- a/app/src/main/res/layout/dialog_account_edit.xml
+++ b/app/src/main/res/layout/dialog_account_edit.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/accountEditDetailsHeader"
@@ -32,7 +27,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/accountEditDetailsNick"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
@@ -88,17 +83,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/accountEditDetailsSave"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_save"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -106,17 +100,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/accountEditDetailsCancel"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
+            android:layout_marginTop="24dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@android:string/cancel"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/accountEditDetailsSave"
diff --git a/app/src/main/res/layout/dialog_account_quick.xml b/app/src/main/res/layout/dialog_account_quick.xml
index 4095c91a..d8be4842 100644
--- a/app/src/main/res/layout/dialog_account_quick.xml
+++ b/app/src/main/res/layout/dialog_account_quick.xml
@@ -41,7 +41,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/account_quick_dialog_manger"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
+                style="@style/Widget.Material3.Button.TextButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
diff --git a/app/src/main/res/layout/dialog_additional_add.xml b/app/src/main/res/layout/dialog_additional_add.xml
index 54f031be..4be436d7 100644
--- a/app/src/main/res/layout/dialog_additional_add.xml
+++ b/app/src/main/res/layout/dialog_additional_add.xml
@@ -2,37 +2,35 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    android:minWidth="300dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:layout_height="match_parent">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minWidth="300dp"
-        android:orientation="vertical">
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp">
 
         <TextView
             android:id="@+id/addadditionalLessonHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
             android:text="@string/additional_lessons_add_title"
-            android:textSize="21sp"
-            android:textStyle="bold" />
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/additionalLessonDialogDate"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="28dp"
             android:hint="@string/all_date"
+            app:layout_constraintTop_toBottomOf="@id/addadditionalLessonHeader"
             app:startIconDrawable="@drawable/ic_calendar_all">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -45,22 +43,22 @@
                 tools:ignore="Deprecated" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
+        <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/additionalLessonDialogRepeat"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="6dp"
-            android:text="@string/additional_lessons_repeat" />
+            android:text="@string/additional_lessons_repeat"
+            app:layout_constraintTop_toBottomOf="@id/additionalLessonDialogDate" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/additionalLessonDialogStart"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="6dp"
             android:hint="@string/additional_lessons_start"
+            app:layout_constraintTop_toBottomOf="@id/additionalLessonDialogRepeat"
             app:startIconDrawable="@drawable/ic_all_clock">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -78,9 +76,9 @@
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
             android:hint="@string/additional_lessons_end"
+            app:layout_constraintTop_toBottomOf="@id/additionalLessonDialogStart"
             app:startIconDrawable="@drawable/ic_all_clock">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -98,59 +96,52 @@
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:hint="@string/all_subject">
+            android:hint="@string/all_subject"
+            app:layout_constraintTop_toBottomOf="@id/additionalLessonDialogEnd">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/additionalLessonDialogContentEdit"
                 android:layout_width="match_parent"
-                android:inputType="text"
                 android:layout_height="wrap_content"
+                android:inputType="text"
                 android:maxLines="1" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="end"
-            android:minHeight="52dp"
-            android:orientation="horizontal">
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/additionalLessonDialogClose"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="24dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/additionalLessonDialogAdd"
+            app:layout_constraintTop_toBottomOf="@id/additionalLessonDialogContent" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/additionalLessonDialogClose"
-                style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="0dp"
-                android:layout_marginLeft="0dp"
-                android:layout_marginBottom="8dp"
-                android:insetLeft="0dp"
-                android:insetTop="0dp"
-                android:insetRight="0dp"
-                android:insetBottom="0dp"
-                android:minWidth="88dp"
-                android:text="@string/all_close"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/additionalLessonDialogAdd"
-                style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginBottom="8dp"
-                android:insetLeft="0dp"
-                android:insetTop="0dp"
-                android:insetRight="0dp"
-                android:insetBottom="0dp"
-                android:minWidth="88dp"
-                android:text="@string/all_add"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/additionalLessonDialogAdd"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="24dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:text="@string/all_add"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/additionalLessonDialogContent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_ads_consent.xml b/app/src/main/res/layout/dialog_ads_consent.xml
index 81607478..118fb9c1 100644
--- a/app/src/main/res/layout/dialog_ads_consent.xml
+++ b/app/src/main/res/layout/dialog_ads_consent.xml
@@ -63,7 +63,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/ads_consent_cancel"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="24dp"
diff --git a/app/src/main/res/layout/dialog_attendance.xml b/app/src/main/res/layout/dialog_attendance.xml
index 08ed9d4a..d832490a 100644
--- a/app/src/main/res/layout/dialog_attendance.xml
+++ b/app/src/main/res/layout/dialog_attendance.xml
@@ -5,28 +5,21 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="8dp">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold"
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -36,12 +29,11 @@
             android:id="@+id/attendanceDialogSubjectTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_subject"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -51,13 +43,13 @@
             android:id="@+id/attendanceDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -68,12 +60,11 @@
             android:id="@+id/attendanceDialogDescriptionTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_description"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -83,13 +74,13 @@
             android:id="@+id/attendanceDialogDescriptionValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -99,12 +90,11 @@
             android:id="@+id/attendanceDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_date"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -114,13 +104,13 @@
             android:id="@+id/attendanceDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -130,12 +120,11 @@
             android:id="@+id/attendanceDialogNumberTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/attendance_number"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -145,13 +134,13 @@
             android:id="@+id/attendanceDialogNumberValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -159,17 +148,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/attendanceDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_conference.xml b/app/src/main/res/layout/dialog_conference.xml
index b6e811ae..72837b81 100644
--- a/app/src/main/res/layout/dialog_conference.xml
+++ b/app/src/main/res/layout/dialog_conference.xml
@@ -6,28 +6,20 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="8dp">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold"
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,12 +29,11 @@
             android:id="@+id/conferenceDialogHeaderTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
             android:text="@string/conference_place"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -52,13 +43,13 @@
             android:id="@+id/conferenceDialogHeaderValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -68,12 +59,11 @@
             android:id="@+id/conferenceDialogSubjectTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/conference_topic"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -83,13 +73,13 @@
             android:id="@+id/conferenceDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -99,12 +89,11 @@
             android:id="@+id/conferenceDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_date"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -114,13 +103,13 @@
             android:id="@+id/conferenceDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -130,12 +119,11 @@
             android:id="@+id/conferenceDialogPresentTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/conferences_present"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -145,13 +133,13 @@
             android:id="@+id/conferenceDialogPresentValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -161,12 +149,11 @@
             android:id="@+id/conferenceDialogAgendaTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/conference_agenda"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -176,13 +163,13 @@
             android:id="@+id/conferenceDialogAgendaValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -192,17 +179,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/conferenceDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_exam.xml b/app/src/main/res/layout/dialog_exam.xml
index 0d04b1fa..519d1531 100644
--- a/app/src/main/res/layout/dialog_exam.xml
+++ b/app/src/main/res/layout/dialog_exam.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.modules.exam.ExamDialog">
+    android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
@@ -27,8 +18,8 @@
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold"
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -42,8 +33,8 @@
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_subject"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -58,8 +49,9 @@
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -73,8 +65,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/exam_type"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -89,8 +81,9 @@
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -104,8 +97,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -120,8 +113,9 @@
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -166,8 +160,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/exam_entry_date"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -182,8 +176,9 @@
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -197,8 +192,8 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_description"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -213,8 +208,9 @@
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -222,10 +218,11 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/examDialogAddToCalendar"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="24dp"
             android:contentDescription="@string/all_add_to_calendar"
             android:insetLeft="0dp"
             android:insetTop="0dp"
@@ -234,21 +231,20 @@
             android:text="@string/all_add"
             app:icon="@drawable/ic_calendar_all"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintEnd_toStartOf="@+id/examDialogClose" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/examDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_excuse.xml b/app/src/main/res/layout/dialog_excuse.xml
index 4ed9294c..401aef31 100644
--- a/app/src/main/res/layout/dialog_excuse.xml
+++ b/app/src/main/res/layout/dialog_excuse.xml
@@ -6,7 +6,7 @@
     android:padding="20dp">
 
     <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index 94facb23..f47f6108 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -32,43 +32,57 @@
                     android:id="@+id/gradeDialogValue"
                     android:layout_width="match_parent"
                     android:layout_height="86dp"
-                    android:layout_marginStart="0dp"
                     android:layout_marginEnd="16dp"
-                    android:background="@color/grade_material_default"
+                    android:background="@drawable/background_grade_details_rounded"
+                    android:backgroundTint="@color/grade_material_default"
                     android:gravity="center"
                     android:textColor="@android:color/white"
                     android:textSize="30sp"
                     tools:text="6" />
 
-                <TextView
-                    android:id="@+id/gradeDialogColorAndWeightValue"
+                <LinearLayout
+                    android:id="@+id/gradeDialogWeightLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
-                    android:layout_marginStart="0dp"
                     android:layout_marginTop="2dp"
                     android:layout_marginEnd="16dp"
-                    android:background="@color/grade_black"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:minHeight="32dp"
-                    android:textColor="@android:color/white"
-                    android:textIsSelectable="true"
-                    android:textSize="14sp"
-                    tools:text="Waga: 1.00" />
+                    android:background="@drawable/background_grade_details_weight_rounded"
+                    android:backgroundTint="@color/grade_black"
+                    android:gravity="center_horizontal">
+
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="4dp"
+                        android:background="@drawable/ic_scale_balance" />
+
+                    <TextView
+                        android:id="@+id/gradeDialogWeightValue"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:maxLines="2"
+                        android:minHeight="32dp"
+                        android:textColor="@android:color/white"
+                        android:textIsSelectable="true"
+                        android:textSize="14sp"
+                        tools:text="1.00" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/gradeDialogHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
                 android:layout_marginEnd="14dp"
                 android:layout_marginRight="14dp"
                 android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:layout_toLeftOf="@+id/gradeDialogValueLayout"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
                 android:orientation="vertical">
 
                 <TextView
@@ -78,18 +92,19 @@
                     android:layout_gravity="start"
                     android:gravity="center_vertical"
                     android:text="@string/grade_header"
-                    android:textIsSelectable="true"
-                    android:textSize="21sp"
-                    android:textStyle="bold" />
+                    android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                    android:textColor="?attr/colorOnSurface"
+                    android:textIsSelectable="true" />
 
                 <TextView
                     android:id="@+id/gradeDialogDescriptionValue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/all_no_description"
                     android:layout_marginTop="8dp"
-                    android:textIsSelectable="true"
-                    android:textSize="16sp" />
+                    android:text="@string/all_no_description"
+                    android:textAppearance="?attr/textAppearanceBodyLarge"
+                    android:textColor="?attr/colorOnSurface"
+                    android:textIsSelectable="true" />
             </LinearLayout>
 
             <TextView
@@ -101,8 +116,8 @@
                 android:layout_alignParentLeft="true"
                 android:layout_marginTop="16dp"
                 android:text="@string/all_date"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="12sp" />
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="?attr/colorOnSurfaceVariant" />
 
             <TextView
                 android:id="@+id/gradeDialogDateValue"
@@ -114,8 +129,9 @@
                 android:layout_marginEnd="24dp"
                 android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:text="@string/all_date"
-                android:textIsSelectable="true"
-                android:textSize="16sp" />
+                android:textAppearance="?attr/textAppearanceBodyLarge"
+                android:textColor="?attr/colorOnSurface"
+                android:textIsSelectable="true" />
 
             <TextView
                 android:id="@+id/gradeDialogComment"
@@ -126,8 +142,8 @@
                 android:layout_alignParentLeft="true"
                 android:layout_marginTop="16dp"
                 android:text="@string/grade_comment"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="12sp" />
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="?attr/colorOnSurfaceVariant" />
 
             <TextView
                 android:id="@+id/gradeDialogCommentValue"
@@ -138,8 +154,9 @@
                 android:layout_alignParentLeft="true"
                 android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:text="@string/grade_comment"
-                android:textIsSelectable="true"
-                android:textSize="16sp" />
+                android:textAppearance="?attr/textAppearanceBodyLarge"
+                android:textColor="?attr/colorOnSurface"
+                android:textIsSelectable="true" />
 
             <TextView
                 android:id="@+id/gradeDialogTeacher"
@@ -150,8 +167,8 @@
                 android:layout_alignParentLeft="true"
                 android:layout_marginTop="16dp"
                 android:text="@string/all_teacher"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="12sp" />
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="?attr/colorOnSurfaceVariant" />
 
             <TextView
                 android:id="@+id/gradeDialogTeacherValue"
@@ -162,8 +179,9 @@
                 android:layout_alignParentLeft="true"
                 android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:text="@string/all_teacher"
-                android:textIsSelectable="true"
-                android:textSize="16sp" />
+                android:textAppearance="?attr/textAppearanceBodyLarge"
+                android:textColor="?attr/colorOnSurface"
+                android:textIsSelectable="true" />
 
             <TextView
                 android:id="@+id/gradeDialogColor"
@@ -174,8 +192,8 @@
                 android:layout_alignParentLeft="true"
                 android:layout_marginTop="16dp"
                 android:text="@string/all_color"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="12sp" />
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                android:textColor="?attr/colorOnSurfaceVariant" />
 
             <TextView
                 android:id="@+id/gradeDialogColorValue"
@@ -186,26 +204,25 @@
                 android:layout_alignParentLeft="true"
                 android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:text="@string/all_color"
-                android:textIsSelectable="true"
-                android:textSize="16sp" />
+                android:textAppearance="?attr/textAppearanceBodyLarge"
+                android:textColor="?attr/colorOnSurface"
+                android:textIsSelectable="true" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeDialogClose"
-                style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+                style="@style/Widget.Material3.Button.TextButton.Dialog"
                 android:layout_width="wrap_content"
                 android:layout_height="36dp"
                 android:layout_below="@+id/gradeDialogColorValue"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="36dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="24dp"
                 android:insetLeft="0dp"
                 android:insetTop="0dp"
                 android:insetRight="0dp"
                 android:insetBottom="0dp"
-                android:minWidth="88dp"
                 android:text="@string/all_close" />
         </RelativeLayout>
-
     </LinearLayout>
-
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index 341cec54..8c6cf0a7 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -1,71 +1,56 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/parent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:minWidth="300dp"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/homeworkDialogRecycler"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:minWidth="300dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:overScrollMode="ifContentScrolls"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toTopOf="@id/homeworkDialogClose"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
         tools:itemCount="1"
         tools:listitem="@layout/item_homework_dialog_details" />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@drawable/ic_all_divider" />
+        android:background="@drawable/ic_all_divider"
+        app:layout_constraintTop_toBottomOf="@id/homeworkDialogRecycler" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:minHeight="52dp"
-        android:orientation="horizontal">
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/homeworkDialogRead"
+        style="@style/Widget.Material3.Button.TextButton.Dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="24dp"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:text="@string/homework_mark_as_done"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/homeworkDialogClose" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/homeworkDialogRead"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"
-            android:layout_gravity="center_vertical"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            android:minWidth="88dp"
-            android:text="@string/homework_mark_as_done"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/homeworkDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-            android:layout_width="wrap_content"
-            android:layout_height="36dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:layout_gravity="center_vertical"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            android:minWidth="88dp"
-            android:text="@string/all_close"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</LinearLayout>
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/homeworkDialogClose"
+        style="@style/Widget.Material3.Button.TextButton.Dialog"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:text="@string/all_close"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_homework_add.xml b/app/src/main/res/layout/dialog_homework_add.xml
index 524f0db0..e0ff5b74 100644
--- a/app/src/main/res/layout/dialog_homework_add.xml
+++ b/app/src/main/res/layout/dialog_homework_add.xml
@@ -2,37 +2,35 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    android:minWidth="300dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:layout_height="match_parent">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minWidth="300dp"
-        android:orientation="vertical">
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp">
 
         <TextView
             android:id="@+id/addHomeworkHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
             android:text="@string/homework_add"
-            android:textSize="21sp"
-            android:textStyle="bold" />
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/homeworkDialogDate"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="28dp"
             android:hint="@string/all_date"
+            app:layout_constraintTop_toBottomOf="@id/addHomeworkHeader"
             app:startIconDrawable="@drawable/ic_calendar_all">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -48,12 +46,12 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/homeworkDialogSubject"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
-            android:hint="@string/all_subject">
+            android:hint="@string/all_subject"
+            app:layout_constraintTop_toBottomOf="@id/homeworkDialogDate">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/homeworkDialogSubjectEdit"
@@ -63,12 +61,12 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/homeworkDialogTeacher"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
-            android:hint="@string/all_teacher">
+            android:hint="@string/all_teacher"
+            app:layout_constraintTop_toBottomOf="@id/homeworkDialogSubject">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/homeworkDialogTeacherEdit"
@@ -78,13 +76,13 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/homeworkDialogContent"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:hint="@string/all_content">
+            android:hint="@string/all_content"
+            app:layout_constraintTop_toBottomOf="@id/homeworkDialogTeacher">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/homeworkDialogContentEdit"
@@ -92,43 +90,38 @@
                 android:layout_height="wrap_content" />
         </com.google.android.material.textfield.TextInputLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:minHeight="62dp">
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/homeworkDialogClose"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="24dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/homeworkDialogAdd"
+            app:layout_constraintTop_toBottomOf="@id/homeworkDialogContent" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/homeworkDialogClose"
-                style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="0dp"
-                android:layout_marginLeft="0dp"
-                android:layout_marginBottom="8dp"
-                android:insetLeft="0dp"
-                android:insetTop="0dp"
-                android:insetRight="0dp"
-                android:insetBottom="0dp"
-                android:minWidth="88dp"
-                android:text="@string/all_close"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/homeworkDialogAdd"
-                style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
-                android:layout_width="wrap_content"
-                android:layout_height="36dp"
-                android:layout_marginBottom="8dp"
-                android:insetLeft="0dp"
-                android:insetTop="0dp"
-                android:insetRight="0dp"
-                android:insetBottom="0dp"
-                android:minWidth="88dp"
-                android:text="@string/all_add"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/homeworkDialogAdd"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="24dp"
+            android:insetLeft="0dp"
+            android:insetTop="0dp"
+            android:insetRight="0dp"
+            android:insetBottom="0dp"
+            android:text="@string/all_add"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/homeworkDialogContent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
index 500cdb6f..3a1d3fd0 100644
--- a/app/src/main/res/layout/dialog_lesson_completed.xml
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,28 +8,20 @@
     tools:context=".ui.modules.timetable.completed.CompletedLessonDialog">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="8dp">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold"
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -38,12 +31,11 @@
             android:id="@+id/completedLessonDialogSubjectTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
             android:text="@string/timetable_lesson"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -53,13 +45,13 @@
             android:id="@+id/completedLessonDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -69,12 +61,11 @@
             android:id="@+id/completedLessonDialogTopicTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_topic"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,13 +75,13 @@
             android:id="@+id/completedLessonDialogTopicValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -100,12 +91,11 @@
             android:id="@+id/completedLessonDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -115,13 +105,13 @@
             android:id="@+id/completedLessonDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -131,12 +121,11 @@
             android:id="@+id/completedLessonDialogChangesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/timetable_changes"
+            android:textAppearance="?attr/textAppearanceBodySmall"
             android:textColor="?colorTimetableChange"
-            android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -146,14 +135,13 @@
             android:id="@+id/completedLessonDialogChangesValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -163,12 +151,11 @@
             android:id="@+id/completedLessonDialogAbsenceTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_absence"
-            android:textColor="?colorPrimary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?colorTimetableCanceled"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -178,14 +165,13 @@
             android:id="@+id/completedLessonDialogAbsenceValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
-            android:textColor="?colorPrimary"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?colorTimetableCanceled"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -195,12 +181,11 @@
             android:id="@+id/completedLessonDialogResourcesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_resources"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -210,14 +195,14 @@
             android:id="@+id/completedLessonDialogResourcesValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
+            android:autoLink="web"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
-            android:autoLink="web"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -225,17 +210,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index 043afb2a..9b81737f 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -7,18 +7,10 @@
     tools:context=".ui.modules.mobiledevice.token.MobileDeviceTokenDialog">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="292dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <ImageView
             android:id="@+id/mobileDeviceQr"
             android:layout_width="150dp"
@@ -119,17 +111,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/mobileDeviceDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_note.xml b/app/src/main/res/layout/dialog_note.xml
index 57a4ad82..9c8b18b3 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -1,32 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="8dp">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold"
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -36,12 +29,11 @@
             android:id="@+id/noteDialogCategoryTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_category"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -51,13 +43,13 @@
             android:id="@+id/noteDialogCategoryValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -67,12 +59,11 @@
             android:id="@+id/noteDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -82,13 +73,13 @@
             android:id="@+id/noteDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -98,12 +89,11 @@
             android:id="@+id/noteDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_date"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -113,13 +103,13 @@
             android:id="@+id/noteDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -129,12 +119,11 @@
             android:id="@+id/noteDialogPointsTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/note_points"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -144,13 +133,13 @@
             android:id="@+id/noteDialogPointsValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -160,12 +149,11 @@
             android:id="@+id/noteDialogContentTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_content"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -175,14 +163,14 @@
             android:id="@+id/noteDialogContentValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
+            android:lineSpacingMultiplier="1.2"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
-            android:lineSpacingMultiplier="1.2"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -190,17 +178,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/noteDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_school_announcement.xml b/app/src/main/res/layout/dialog_school_announcement.xml
index 96c11d4a..4e0ef556 100644
--- a/app/src/main/res/layout/dialog_school_announcement.xml
+++ b/app/src/main/res/layout/dialog_school_announcement.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -6,28 +7,20 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="8dp">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold"
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,12 +30,11 @@
             android:id="@+id/announcementDialogSubjectTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_subject"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -52,13 +44,13 @@
             android:id="@+id/announcementDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -68,12 +60,11 @@
             android:id="@+id/announcementDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/exam_entry_date"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -83,13 +74,13 @@
             android:id="@+id/announcementDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -99,12 +90,11 @@
             android:id="@+id/announcementDialogDescriptionTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_description"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -114,33 +104,32 @@
             android:id="@+id/announcementDialogDescriptionValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
-            tools:maxLines="5"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/announcementDialogDescriptionTitle"
+            tools:maxLines="5"
             tools:text="@tools:sample/lorem/random" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/announcementDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index 04a5c0c1..aeb01b3b 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -6,28 +6,20 @@
     android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="24dp"
         android:paddingEnd="8dp">
 
-        <View
-            android:layout_width="280dp"
-            android:layout_height="1dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <TextView
             android:id="@+id/allDetailsHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold"
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,12 +29,11 @@
             android:id="@+id/timetableDialogChangesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="28dp"
             android:layout_marginEnd="24dp"
             android:text="@string/timetable_changes"
+            android:textAppearance="?attr/textAppearanceBodySmall"
             android:textColor="?colorTimetableChange"
-            android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -52,14 +43,13 @@
             android:id="@+id/timetableDialogChangesValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -69,12 +59,11 @@
             android:id="@+id/timetableDialogLessonTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/timetable_lesson"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,13 +73,13 @@
             android:id="@+id/timetableDialogLessonValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -100,31 +89,29 @@
             android:id="@+id/timetableDialogLessonNewValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/timetableDialogLessonValue" />
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogLessonValue"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/timetableDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -134,13 +121,13 @@
             android:id="@+id/timetableDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -150,31 +137,29 @@
             android:id="@+id/timetableDialogTeacherNewValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherValue" />
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherValue"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/timetableDialogGroupTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/timetable_group"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -184,13 +169,13 @@
             android:id="@+id/timetableDialogGroupValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -200,12 +185,11 @@
             android:id="@+id/timetableDialogRoomTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/timetable_room"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -215,13 +199,13 @@
             android:id="@+id/timetableDialogRoomValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -231,31 +215,29 @@
             android:id="@+id/timetableDialogRoomNewValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomValue" />
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomValue"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/timetableDialogTimeTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="24dp"
             android:text="@string/timetable_time"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="12sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            android:textColor="?attr/colorOnSurfaceVariant"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -265,13 +247,13 @@
             android:id="@+id/timetableDialogTimeValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginEnd="24dp"
             android:paddingStart="0dp"
             android:paddingEnd="16dp"
             android:text="@string/all_no_data"
+            android:textAppearance="?attr/textAppearanceBodyLarge"
+            android:textColor="?attr/colorOnSurface"
             android:textIsSelectable="true"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -279,17 +261,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/timetableDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
-            android:layout_marginTop="36dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="24dp"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
-            android:minWidth="88dp"
             android:text="@string/all_close"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_account_details.xml b/app/src/main/res/layout/fragment_account_details.xml
index 0c904c07..0e42348d 100644
--- a/app/src/main/res/layout/fragment_account_details.xml
+++ b/app/src/main/res/layout/fragment_account_details.xml
@@ -51,7 +51,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/account_details_error_details"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
@@ -278,7 +278,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/accountDetailsLogout"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 4996b85d..14331120 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -65,7 +65,6 @@
             android:clickable="true"
             android:focusable="true"
             android:text="@string/attendance_excuse_title"
-            android:tint="?colorOnSecondary"
             android:visibility="gone"
             app:icon="@drawable/ic_all_done_all"
             tools:visibility="visible" />
@@ -106,7 +105,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/attendanceErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_attendance_summary.xml b/app/src/main/res/layout/fragment_attendance_summary.xml
index 613ea506..6b92e23f 100644
--- a/app/src/main/res/layout/fragment_attendance_summary.xml
+++ b/app/src/main/res/layout/fragment_attendance_summary.xml
@@ -118,7 +118,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/attendanceSummaryErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_conference.xml b/app/src/main/res/layout/fragment_conference.xml
index 730b46d5..887708bd 100644
--- a/app/src/main/res/layout/fragment_conference.xml
+++ b/app/src/main/res/layout/fragment_conference.xml
@@ -86,7 +86,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/conferenceErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_contributor.xml b/app/src/main/res/layout/fragment_contributor.xml
index 8b71ffed..d1902d88 100644
--- a/app/src/main/res/layout/fragment_contributor.xml
+++ b/app/src/main/res/layout/fragment_contributor.xml
@@ -25,7 +25,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/creatorSeeMore"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="32dp"
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index cf799ecc..30f85446 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -65,7 +65,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/dashboard_error_details"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index 0c62aab5..8dba5361 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -91,7 +91,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/examErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_grade.xml b/app/src/main/res/layout/fragment_grade.xml
index 989929d4..f76419d1 100644
--- a/app/src/main/res/layout/fragment_grade.xml
+++ b/app/src/main/res/layout/fragment_grade.xml
@@ -11,6 +11,7 @@
         android:layout_height="48dp"
         android:background="?colorSurface"
         android:visibility="invisible"
+        android:outlineProvider="none"
         app:tabMode="scrollable"
         app:tabSelectedTextColor="?colorPrimary"
         app:tabTextColor="@color/material_on_surface_emphasis_medium"
@@ -69,7 +70,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_grade_details.xml b/app/src/main/res/layout/fragment_grade_details.xml
index c1b88580..dc6b4272 100644
--- a/app/src/main/res/layout/fragment_grade_details.xml
+++ b/app/src/main/res/layout/fragment_grade_details.xml
@@ -86,7 +86,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeDetailsErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index 4cf541e4..d0ec8097 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -142,7 +142,7 @@
 
                                 <com.google.android.material.button.MaterialButton
                                     android:id="@+id/gradeStatisticsErrorDetails"
-                                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                    style="@style/Widget.Material3.Button.OutlinedButton"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_grade_summary.xml b/app/src/main/res/layout/fragment_grade_summary.xml
index a3425513..de2d0f3b 100644
--- a/app/src/main/res/layout/fragment_grade_summary.xml
+++ b/app/src/main/res/layout/fragment_grade_summary.xml
@@ -86,7 +86,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeSummaryErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index ae8270ab..9d339d91 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -93,7 +93,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/homeworkErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -110,6 +110,7 @@
 
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/openAddHomeworkButton"
+            style="@style/Widget.Material3.ExtendedFloatingActionButton.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
@@ -117,7 +118,6 @@
             android:clickable="true"
             android:focusable="true"
             android:text="@string/add_homework_title"
-            android:tint="?colorOnSecondary"
             app:icon="@drawable/ic_all_add" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index c7acaa70..43016db4 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -97,7 +97,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormUsernameLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -127,7 +127,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormPassLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -161,7 +161,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormHostLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -187,7 +187,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormTokenLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -212,7 +212,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormSymbolLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -229,7 +229,7 @@
 
                 <AutoCompleteTextView
                     android:id="@+id/loginFormSymbol"
-                    style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
+                    style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeActionLabel="@string/login_sign_in"
@@ -242,7 +242,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormPinLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index d1c997ff..1aea7066 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -62,7 +62,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/loginFormContactEmail"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
@@ -72,7 +72,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/loginFormFaq"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -83,7 +83,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/loginFormRecoverLinkSecond"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="16dp"
@@ -141,7 +141,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormUsernameLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -171,7 +171,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormPassLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -203,7 +203,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormRecoverLink"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="24dp"
@@ -217,7 +217,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormHostLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -241,7 +241,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormAdvancedButton"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
diff --git a/app/src/main/res/layout/fragment_login_recover.xml b/app/src/main/res/layout/fragment_login_recover.xml
index 028d6bc1..f2f143cf 100644
--- a/app/src/main/res/layout/fragment_login_recover.xml
+++ b/app/src/main/res/layout/fragment_login_recover.xml
@@ -64,7 +64,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginRecoverNameLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -94,7 +94,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginRecoverHostLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
@@ -181,7 +181,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginRecoverErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index f1c9be4a..d928d65f 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -66,7 +66,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/loginSymbolContactEmail"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
@@ -77,7 +77,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/loginSymbolFaq"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
@@ -132,7 +132,7 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginSymbolNameLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="24dp"
@@ -145,7 +145,7 @@
 
                 <AutoCompleteTextView
                     android:id="@+id/loginSymbolName"
-                    style="@style/Widget.MaterialComponents.TextInputEditText.OutlinedBox"
+                    style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeActionLabel="@string/login_sign_in"
diff --git a/app/src/main/res/layout/fragment_logviewer.xml b/app/src/main/res/layout/fragment_logviewer.xml
index e03124a4..4394f298 100644
--- a/app/src/main/res/layout/fragment_logviewer.xml
+++ b/app/src/main/res/layout/fragment_logviewer.xml
@@ -20,7 +20,7 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/logViewRefreshButton"
-        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        style="@style/Widget.Material3.FloatingActionButton.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout/fragment_lucky_number.xml b/app/src/main/res/layout/fragment_lucky_number.xml
index b2d4f40a..7c48523b 100644
--- a/app/src/main/res/layout/fragment_lucky_number.xml
+++ b/app/src/main/res/layout/fragment_lucky_number.xml
@@ -78,7 +78,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/luckyNumberHistoryButton"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -123,7 +123,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/luckyNumberErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_lucky_number_history.xml b/app/src/main/res/layout/fragment_lucky_number_history.xml
index a5698e2e..e139f5a5 100644
--- a/app/src/main/res/layout/fragment_lucky_number_history.xml
+++ b/app/src/main/res/layout/fragment_lucky_number_history.xml
@@ -82,7 +82,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/luckyNumberHistoryErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 5269d95e..b3dac0dd 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -29,6 +29,7 @@
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/openSendMessageButton"
+        style="@style/Widget.Material3.ExtendedFloatingActionButton.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
@@ -36,7 +37,6 @@
         android:clickable="true"
         android:focusable="true"
         android:text="@string/send_message_title"
-        android:tint="?colorOnSecondary"
         app:icon="@drawable/ic_menu_message_write" />
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 5980d820..c1e77ae2 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -50,7 +50,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/messagePreviewErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_message_tab.xml b/app/src/main/res/layout/fragment_message_tab.xml
index 3a30cff8..f17ec8df 100644
--- a/app/src/main/res/layout/fragment_message_tab.xml
+++ b/app/src/main/res/layout/fragment_message_tab.xml
@@ -86,7 +86,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/messageTabErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_mobile_device.xml b/app/src/main/res/layout/fragment_mobile_device.xml
index e97bd0c5..80af093c 100644
--- a/app/src/main/res/layout/fragment_mobile_device.xml
+++ b/app/src/main/res/layout/fragment_mobile_device.xml
@@ -89,7 +89,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/mobileDevicesErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
@@ -106,6 +106,7 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/mobileDeviceAddButton"
+        style="@style/Widget.Material3.FloatingActionButton.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index 969003cc..dc3b9ef2 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -86,7 +86,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/noteErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_notifications_center.xml b/app/src/main/res/layout/fragment_notifications_center.xml
index f59ce33c..ba2f0ff4 100644
--- a/app/src/main/res/layout/fragment_notifications_center.xml
+++ b/app/src/main/res/layout/fragment_notifications_center.xml
@@ -89,7 +89,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/notification_center_error_details"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_school.xml b/app/src/main/res/layout/fragment_school.xml
index 3f5dc6e2..a7c3551d 100644
--- a/app/src/main/res/layout/fragment_school.xml
+++ b/app/src/main/res/layout/fragment_school.xml
@@ -269,7 +269,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/schoolErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_school_announcement.xml b/app/src/main/res/layout/fragment_school_announcement.xml
index 800706ce..d1088126 100644
--- a/app/src/main/res/layout/fragment_school_announcement.xml
+++ b/app/src/main/res/layout/fragment_school_announcement.xml
@@ -89,7 +89,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/directorInformationErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_student_info.xml b/app/src/main/res/layout/fragment_student_info.xml
index f72fed2f..ffde6ddd 100644
--- a/app/src/main/res/layout/fragment_student_info.xml
+++ b/app/src/main/res/layout/fragment_student_info.xml
@@ -91,7 +91,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/student_info_error_details"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_teacher.xml b/app/src/main/res/layout/fragment_teacher.xml
index ef27d2c4..1253e312 100644
--- a/app/src/main/res/layout/fragment_teacher.xml
+++ b/app/src/main/res/layout/fragment_teacher.xml
@@ -85,7 +85,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/teacherErrorDetails"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index d2ba8152..eaab0b3a 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -105,7 +105,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/timetableErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_timetable_additional.xml b/app/src/main/res/layout/fragment_timetable_additional.xml
index ec25f9a0..e50fd6b5 100644
--- a/app/src/main/res/layout/fragment_timetable_additional.xml
+++ b/app/src/main/res/layout/fragment_timetable_additional.xml
@@ -1,14 +1,15 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".ui.modules.timetable.additional.AdditionalLessonsFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="50dp">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/additionalLessonsProgress"
@@ -96,7 +97,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/additionalLessonsErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
@@ -120,7 +121,6 @@
             android:clickable="true"
             android:focusable="true"
             android:text="@string/additional_lessons_add"
-            android:tint="?colorOnSecondary"
             app:icon="@drawable/ic_all_add" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -173,4 +173,4 @@
             app:srcCompat="@drawable/ic_chevron_right"
             app:tint="?colorPrimary" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
-</FrameLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index e089275d..8d647ff6 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -93,7 +93,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/completedLessonErrorDetails"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/item_dashboard_account.xml b/app/src/main/res/layout/item_dashboard_account.xml
index 6e5aca54..7ae0c84d 100644
--- a/app/src/main/res/layout/item_dashboard_account.xml
+++ b/app/src/main/res/layout/item_dashboard_account.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="12dp"
-    android:layout_marginVertical="6dp"
-    app:cardElevation="4dp">
+    android:layout_marginVertical="6dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/dashboard_account_item_content"
diff --git a/app/src/main/res/layout/item_dashboard_admin_message.xml b/app/src/main/res/layout/item_dashboard_admin_message.xml
index 67836561..e12241df 100644
--- a/app/src/main/res/layout/item_dashboard_admin_message.xml
+++ b/app/src/main/res/layout/item_dashboard_admin_message.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="12dp"
-    android:layout_marginVertical="6dp"
-    app:cardElevation="4dp">
+    android:layout_marginVertical="6dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/dashboard_admin_message_item_content"
@@ -60,7 +59,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/dashboard_admin_message_item_dismiss"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
+            style="@style/Widget.Material3.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
@@ -72,4 +71,4 @@
             app:layout_constraintTop_toBottomOf="@id/dashboard_admin_message_item_description"
             app:layout_constraintVertical_bias="0" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_dashboard_announcements.xml b/app/src/main/res/layout/item_dashboard_announcements.xml
index 19f72088..b9ddb757 100644
--- a/app/src/main/res/layout/item_dashboard_announcements.xml
+++ b/app/src/main/res/layout/item_dashboard_announcements.xml
@@ -8,8 +8,7 @@
     android:layout_marginVertical="6dp"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    app:cardElevation="4dp">
+    android:foreground="?selectableItemBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -117,4 +116,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dashboard_announcements_item_title" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_dashboard_conferences.xml b/app/src/main/res/layout/item_dashboard_conferences.xml
index 02d3edfc..b02b8e18 100644
--- a/app/src/main/res/layout/item_dashboard_conferences.xml
+++ b/app/src/main/res/layout/item_dashboard_conferences.xml
@@ -8,8 +8,7 @@
     android:layout_marginVertical="6dp"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    app:cardElevation="4dp">
+    android:foreground="?selectableItemBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -115,4 +114,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dashboard_conferences_item_title" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_dashboard_exams.xml b/app/src/main/res/layout/item_dashboard_exams.xml
index 9cc98d79..84302403 100644
--- a/app/src/main/res/layout/item_dashboard_exams.xml
+++ b/app/src/main/res/layout/item_dashboard_exams.xml
@@ -8,8 +8,7 @@
     android:layout_marginVertical="6dp"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    app:cardElevation="4dp">
+    android:foreground="?selectableItemBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -115,4 +114,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dashboard_exams_item_title" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_dashboard_grades.xml b/app/src/main/res/layout/item_dashboard_grades.xml
index 5cc9ce30..345d8a5e 100644
--- a/app/src/main/res/layout/item_dashboard_grades.xml
+++ b/app/src/main/res/layout/item_dashboard_grades.xml
@@ -6,8 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="12dp"
     android:layout_marginVertical="6dp"
-    android:foreground="?selectableItemBackground"
-    app:cardElevation="4dp">
+    android:foreground="?selectableItemBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -35,9 +34,9 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="10dp"
+            android:nestedScrollingEnabled="false"
             android:overScrollMode="never"
             android:scrollbars="none"
-            android:nestedScrollingEnabled="false"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dashboard_grades_item_title"
@@ -68,11 +67,11 @@
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
             android:drawablePadding="8dp"
+            android:gravity="center_vertical"
             android:text="@string/dashboard_grade_error"
             android:textColor="?colorError"
             android:textSize="14sp"
             android:visibility="gone"
-            android:gravity="center_vertical"
             app:drawableStartCompat="@drawable/ic_error"
             app:drawableTint="?colorError"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -93,4 +92,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dashboard_grades_item_title" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_dashboard_homework.xml b/app/src/main/res/layout/item_dashboard_homework.xml
index 975d66ef..b36afc57 100644
--- a/app/src/main/res/layout/item_dashboard_homework.xml
+++ b/app/src/main/res/layout/item_dashboard_homework.xml
@@ -8,8 +8,7 @@
     android:layout_marginVertical="6dp"
     android:clickable="true"
     android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    app:cardElevation="4dp">
+    android:foreground="?selectableItemBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -115,4 +114,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dashboard_homework_item_title" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_dashboard_horizontal_group.xml b/app/src/main/res/layout/item_dashboard_horizontal_group.xml
index 0c59d1eb..1c9246a1 100644
--- a/app/src/main/res/layout/item_dashboard_horizontal_group.xml
+++ b/app/src/main/res/layout/item_dashboard_horizontal_group.xml
@@ -13,7 +13,6 @@
         android:layout_width="0dp"
         android:layout_height="44dp"
         android:layout_marginVertical="4dp"
-        app:cardElevation="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/dashboard_horizontal_group_item_message_container"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -81,7 +80,6 @@
         android:layout_height="44dp"
         android:layout_marginVertical="4dp"
         android:layout_marginEnd="8dp"
-        app:cardElevation="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/dashboard_horizontal_group_item_attendance_container"
         app:layout_constraintStart_toEndOf="@id/dashboard_horizontal_group_item_lucky_container"
@@ -154,7 +152,6 @@
         android:layout_width="0dp"
         android:layout_height="44dp"
         android:layout_marginVertical="4dp"
-        app:cardElevation="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/dashboard_horizontal_group_item_message_container"
@@ -221,7 +218,6 @@
         android:layout_height="44dp"
         android:layout_marginVertical="4dp"
         android:visibility="gone"
-        app:cardElevation="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/dashboard_horizontal_group_item_message_container"
diff --git a/app/src/main/res/layout/item_dashboard_lessons.xml b/app/src/main/res/layout/item_dashboard_lessons.xml
index 9156c1a2..a40f17f2 100644
--- a/app/src/main/res/layout/item_dashboard_lessons.xml
+++ b/app/src/main/res/layout/item_dashboard_lessons.xml
@@ -5,11 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="12dp"
-    android:layout_marginVertical="6dp"
-    android:clickable="true"
-    android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    app:cardElevation="4dp">
+    android:layout_marginVertical="6dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -263,4 +259,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_title" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index 2f3bd2de..6849e929 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -20,11 +20,12 @@
             android:id="@+id/gradeItemValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/grade_material_default"
+            android:background="@drawable/background_grade_rounded"
+            android:backgroundTint="@color/grade_material_default"
             android:gravity="center"
             android:maxLength="5"
             android:minWidth="45dp"
-            android:minHeight="40dp"
+            android:minHeight="45dp"
             android:textColor="@android:color/white"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
diff --git a/app/src/main/res/layout/item_homework_dialog_details.xml b/app/src/main/res/layout/item_homework_dialog_details.xml
index 9d560ba5..1b1c1d39 100644
--- a/app/src/main/res/layout/item_homework_dialog_details.xml
+++ b/app/src/main/res/layout/item_homework_dialog_details.xml
@@ -13,16 +13,17 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/allDetailsHeader"
-            android:layout_width="0dp"
+            android:id="@+id/homework_dialog_header"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="0dp"
             android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
-            android:layout_weight="1"
             android:text="@string/all_details"
-            android:textSize="21sp"
-            android:textStyle="bold" />
+            android:textAppearance="?attr/textAppearanceHeadlineSmall"
+            android:textColor="?attr/colorOnSurface"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
             android:id="@+id/homework_dialog_delete"
@@ -35,29 +36,6 @@
             app:tint="?colorPrimary"
             tools:ignore="ContentDescription" />
 
-        <ImageButton
-            android:id="@+id/homework_dialog_full_screen"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:background="?selectableItemBackgroundBorderless"
-            android:padding="5dp"
-            app:srcCompat="@drawable/ic_fullscreen"
-            app:tint="?colorOnBackground"
-            tools:ignore="ContentDescription" />
-
-        <ImageButton
-            android:id="@+id/homework_dialog_full_screen_exit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:background="?selectableItemBackgroundBorderless"
-            android:padding="5dp"
-            android:visibility="gone"
-            app:srcCompat="@drawable/ic_fullscreen_exit"
-            app:tint="?colorOnBackground"
-            tools:ignore="ContentDescription" />
-
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/layout/item_login_student_select_help.xml b/app/src/main/res/layout/item_login_student_select_help.xml
index b6d81c7c..8b04aed2 100644
--- a/app/src/main/res/layout/item_login_student_select_help.xml
+++ b/app/src/main/res/layout/item_login_student_select_help.xml
@@ -9,7 +9,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/login_student_select_help_symbol"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -30,7 +30,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/login_student_select_help_mail"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -46,7 +46,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/login_student_select_help_discord"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -57,5 +57,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/login_student_select_help_mail"
         app:layout_constraintTop_toTopOf="@id/login_student_select_help_mail" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_message_chips.xml b/app/src/main/res/layout/item_message_chips.xml
index da2e2031..c1f36c4d 100644
--- a/app/src/main/res/layout/item_message_chips.xml
+++ b/app/src/main/res/layout/item_message_chips.xml
@@ -21,29 +21,23 @@
 
         <com.google.android.material.chip.Chip
             android:id="@+id/chip_mailbox"
-            style="@style/Widget.MaterialComponents.Chip.Action"
+            style="@style/Widget.Material3.Chip.Suggestion.Elevated"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/message_chip_all_mailboxes" />
 
         <com.google.android.material.chip.Chip
             android:id="@+id/chip_unread"
-            style="@style/Widget.MaterialComponents.Chip.Choice"
+            style="@style/Widget.Material3.Chip.Filter.Elevated"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/message_chip_only_unread"
-            app:checkedIcon="@drawable/ic_mtrl_chip_checked_black"
-            app:checkedIconEnabled="true"
-            app:checkedIconTint="@color/mtrl_choice_chip_text_color" />
+            android:text="@string/message_chip_only_unread" />
 
         <com.google.android.material.chip.Chip
             android:id="@+id/chip_attachments"
-            style="@style/Widget.MaterialComponents.Chip.Choice"
+            style="@style/Widget.Material3.Chip.Filter.Elevated"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/message_chip_only_with_attachments"
-            app:checkedIcon="@drawable/ic_mtrl_chip_checked_black"
-            app:checkedIconEnabled="true"
-            app:checkedIconTint="@color/mtrl_choice_chip_text_color" />
+            android:text="@string/message_chip_only_with_attachments" />
     </com.google.android.material.chip.ChipGroup>
 </HorizontalScrollView>
diff --git a/app/src/main/res/layout/item_notifications_center.xml b/app/src/main/res/layout/item_notifications_center.xml
index 16a7ae0c..a2a67748 100644
--- a/app/src/main/res/layout/item_notifications_center.xml
+++ b/app/src/main/res/layout/item_notifications_center.xml
@@ -5,8 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="8dp"
-    android:layout_marginTop="12dp"
-    app:cardElevation="4dp">
+    android:layout_marginTop="12dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -68,4 +67,4 @@
             tools:ignore="ContentDescription"
             tools:src="@tools:sample/avatars" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 899d7503..27c9db66 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -1,129 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/timetableWidgetItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="45dp"
-    android:orientation="vertical"
     android:background="@drawable/background_widget_item_timetable"
+    android:backgroundTint="?attr/backgroundColor"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="12dp"
+    android:theme="@style/Wulkanowy.Widget.Theme"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/timetableWidgetItemNumber"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingStart="6dp"
-        android:paddingLeft="6dp"
-        android:paddingTop="6dp"
-        android:paddingEnd="12dp"
-        android:paddingRight="12dp"
-        android:paddingBottom="6dp">
+        android:textAppearance="?attr/textAppearanceHeadline6"
+        android:textSize="24sp"
+        tools:text="1"
+        tools:textColor="?attr/colorTimetableChange" />
 
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:maxLength="2"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="28sp"
-            tools:text="5" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="@tools:sample/lorem" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeStart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="11:11" />
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            tools:text="08:00" />
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeFinish"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="12:00" />
+            android:layout_marginTop="4dp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
+            tools:text="09:45" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <TextView
-            android:id="@+id/timetableWidgetItemRoom"
+            android:id="@+id/timetableWidgetItemSubject"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="22"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_toEndOf="@id/timetableWidgetItemRoom"
-            android:layout_toRightOf="@id/timetableWidgetItemRoom"
             android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/timetable_change_dark"
-            android:textSize="13sp"
-            android:visibility="gone"
-            tools:text="Agata Kowalska - Błaszczyk"
-            tools:visibility="visible" />
+            android:lines="1"
+            android:textAppearance="?attr/textAppearanceTitleMedium"
+            tools:text="Programowanie aplikacji mobilnych i desktopowych" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/timetableWidgetItemRoom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                tools:text="Sala 213"
+                tools:textColor="?attr/colorTimetableChange" />
+
+            <TextView
+                android:id="@+id/timetableWidgetItemTeacher"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:ellipsize="end"
+                android:lines="1"
+                android:textAppearance="?attr/textAppearanceBodySmall"
+                tools:text="Dorota Nowak" />
+
+        </LinearLayout>
 
         <TextView
             android:id="@+id/timetableWidgetItemDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
-            android:textColor="@color/timetable_change_dark"
-            android:textSize="13sp"
+            android:textAppearance="?attr/textAppearanceBodySmall"
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
             tools:visibility="gone" />
-    </RelativeLayout>
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/timetableWidgetItemIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:contentDescription="@string/timetable_changes"
+        android:tint="?attr/colorTimetableChange"
+        app:tint="?attr/colorTimetableChange"
+        tools:ignore="UseAppTint"
+        tools:src="@drawable/ic_timetable_widget_swap" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml
deleted file mode 100644
index 06233244..00000000
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/timetableWidgetItemContainer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="45dp"
-    android:orientation="vertical"
-    android:background="@drawable/background_widget_item_timetable_dark"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="6dp"
-        android:paddingTop="6dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="6dp">
-
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="40dp"
-            android:minHeight="40dp"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:maxLength="2"
-            android:textColor="@android:color/white"
-            android:textSize="28sp"
-            tools:text="5" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="40dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="@tools:sample/lorem" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="11:11" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeFinish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="6dp"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="12:00" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemRoom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="10dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="22"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/timetableWidgetItemNumber"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_toEndOf="@id/timetableWidgetItemRoom"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/timetable_change_light"
-            android:textSize="13sp"
-            android:visibility="gone"
-            tools:text="Agata Kowalska - Błaszczyk"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginEnd="16dp"
-            android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:textColor="@color/timetable_change_light"
-            android:textSize="13sp"
-            tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone" />
-    </RelativeLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_footer.xml b/app/src/main/res/layout/item_widget_timetable_footer.xml
new file mode 100644
index 00000000..ef14da5d
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_timetable_footer.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/timetableWidgetSynchronizationTime"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="end"
+    android:padding="12dp"
+    android:textAlignment="textEnd"
+    android:textAppearance="?attr/textAppearanceBodySmall"
+    android:theme="@style/Wulkanowy.Widget.Theme"
+    tools:text="Synchronizacja 06.10.2022 o 17:57" />
diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml
deleted file mode 100644
index 1bf4072d..00000000
--- a/app/src/main/res/layout/item_widget_timetable_small.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@android:color/white"
-    android:orientation="vertical"
-    android:paddingStart="6dp"
-    android:paddingLeft="6dp"
-    android:paddingEnd="6dp"
-    android:paddingRight="6dp"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="wrap_content"
-            android:minWidth="40dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLength="2"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="5" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="13sp"
-            tools:text="11:11" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeFinish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="Sieci komputerowe" />
-
-
-        <TextView
-            android:id="@+id/timetableWidgetItemRoom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="22" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            tools:text="Agata" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColor="@android:color/black"
-            android:textSize="15sp"
-            android:visibility="visible"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDivider" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_small_dark.xml b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
deleted file mode 100644
index 50bbbd03..00000000
--- a/app/src/main/res/layout/item_widget_timetable_small_dark.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/colorWidgetBackground"
-    android:orientation="vertical"
-    android:paddingStart="6dp"
-    android:paddingLeft="6dp"
-    android:paddingEnd="6dp"
-    android:paddingRight="6dp"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="wrap_content"
-            android:minWidth="40dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLength="2"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="5" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeStart"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="13sp"
-            tools:text="11:11" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTimeFinish"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="Sieci komputerowe" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemRoom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="22" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            tools:text="Agata" />
-
-        <TextView
-            android:id="@+id/timetableWidgetItemDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            android:visibility="visible"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDividerInverse" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/layout_preference_switch.xml b/app/src/main/res/layout/layout_preference_switch.xml
new file mode 100644
index 00000000..c4f8a6c2
--- /dev/null
+++ b/app/src/main/res/layout/layout_preference_switch.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/subitem_dashboard_grades.xml b/app/src/main/res/layout/subitem_dashboard_grades.xml
index 9354be3d..c8165b95 100644
--- a/app/src/main/res/layout/subitem_dashboard_grades.xml
+++ b/app/src/main/res/layout/subitem_dashboard_grades.xml
@@ -23,7 +23,7 @@
         android:id="@+id/dashboard_grades_subitem_grade_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="2dp"
         android:layout_marginBottom="6dp"
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -36,4 +36,4 @@
             android:visibility="gone"
             tools:visibility="visible" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/subitem_dashboard_small_grade.xml b/app/src/main/res/layout/subitem_dashboard_small_grade.xml
index 986d9602..6800b72e 100644
--- a/app/src/main/res/layout/subitem_dashboard_small_grade.xml
+++ b/app/src/main/res/layout/subitem_dashboard_small_grade.xml
@@ -5,7 +5,8 @@
     android:layout_width="wrap_content"
     android:layout_height="20dp"
     android:layout_marginStart="4dp"
-    android:background="@color/grade_material_default"
+    android:background="@drawable/background_grade_small_rounded"
+    android:backgroundTint="@color/grade_material_default"
     android:gravity="center"
     android:maxLength="5"
     android:minWidth="20dp"
diff --git a/app/src/main/res/layout/widget_luckynumber.xml b/app/src/main/res/layout/widget_luckynumber.xml
index 360a1970..fc8acc60 100644
--- a/app/src/main/res/layout/widget_luckynumber.xml
+++ b/app/src/main/res/layout/widget_luckynumber.xml
@@ -1,63 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/luckyNumberWidgetContainer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/background_luckynumber_widget"
-    android:gravity="center"
-    android:padding="10dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:theme="@style/Wulkanowy.Widget.Theme"
     tools:context=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider">
 
     <ImageView
-        android:id="@+id/luckyNumberWidgetImageTop"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@id/luckyNumberWidgetNumber"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
-        android:contentDescription="@string/lucky_number_title"
-        android:gravity="center"
-        android:src="@drawable/ic_widget_clover"
-        android:visibility="gone"
-        tools:visibility="visible" />
+        android:adjustViewBounds="true"
+        android:importantForAccessibility="no"
+        android:scaleType="fitCenter"
+        android:src="@drawable/shape_badge"
+        android:tint="?attr/colorSurface"
+        app:tint="?attr/colorSurface"
+        tools:ignore="UseAppTint" />
 
     <TextView
-        android:id="@+id/luckyNumberWidgetTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="0dp"
-        android:gravity="center"
-        android:labelFor="@id/luckyNumberWidgetImageTop"
-        android:text="@string/lucky_number_title"
-        android:textAlignment="center"
-        android:textColor="#8c8c8c"
-        android:textSize="22sp"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/luckyNumberWidgetImageLeft"
+        android:id="@+id/luckyNumberWidgetValue"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/luckyNumberWidgetNumber"
-        android:contentDescription="@string/lucky_number_title"
-        android:src="@drawable/ic_widget_clover"
-        android:visibility="gone"
-        tools:visibility="visible" />
+        android:layout_gravity="center"
+        android:text="17"
+        android:textColor="?attr/colorPrimary"
+        android:textSize="72sp"
+        android:textStyle="bold"
+        tools:ignore="HardcodedText" />
 
-    <TextView
-        android:id="@+id/luckyNumberWidgetNumber"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/luckyNumberWidgetTitle"
-        android:layout_toEndOf="@id/luckyNumberWidgetImageLeft"
-        android:layout_toRightOf="@id/luckyNumberWidgetImageLeft"
-        android:gravity="center"
-        android:text="#"
-        android:textAlignment="center"
-        android:textColor="#404040"
-        android:textSize="34sp"
-        tools:ignore="HardcodedText"
-        tools:text="13" />
-</RelativeLayout>
+    <ImageButton
+        android:id="@+id/luckyNumberWidgetHistoryButton"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="left|bottom"
+        android:background="@drawable/background_luckynumber_widget_button"
+        android:backgroundTint="?attr/colorPrimaryContainer"
+        android:contentDescription="@string/lucky_number_history_button"
+        android:src="@drawable/ic_history"
+        android:tint="?attr/colorOnPrimaryContainer"
+        app:tint="?attr/colorOnPrimaryContainer"
+        tools:ignore="UseAppTint" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/widget_luckynumber_dark.xml b/app/src/main/res/layout/widget_luckynumber_dark.xml
deleted file mode 100644
index def110de..00000000
--- a/app/src/main/res/layout/widget_luckynumber_dark.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/luckyNumberWidgetContainer"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/background_luckynumber_widget_dark"
-    android:gravity="center"
-    android:padding="10dp"
-    tools:context=".ui.modules.luckynumberwidget.LuckyNumberWidgetProvider">
-
-    <ImageView
-        android:id="@+id/luckyNumberWidgetImageTop"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/luckyNumberWidgetNumber"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
-        android:contentDescription="@string/lucky_number_title"
-        android:gravity="center"
-        android:src="@drawable/ic_widget_clover"
-        android:tint="@android:color/white"
-        android:visibility="gone"
-        tools:visibility="visible"
-        tools:ignore="UseAppTint" />
-
-    <TextView
-        android:id="@+id/luckyNumberWidgetTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="0dp"
-        android:gravity="center"
-        android:labelFor="@id/luckyNumberWidgetImageTop"
-        android:text="@string/lucky_number_title"
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="22sp"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/luckyNumberWidgetImageLeft"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/luckyNumberWidgetNumber"
-        android:contentDescription="@string/lucky_number_title"
-        android:src="@drawable/ic_widget_clover"
-        android:tint="@android:color/white"
-        android:visibility="gone"
-        tools:visibility="visible"
-        tools:ignore="UseAppTint" />
-
-    <TextView
-        android:id="@+id/luckyNumberWidgetNumber"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/luckyNumberWidgetTitle"
-        android:layout_toEndOf="@id/luckyNumberWidgetImageLeft"
-        android:layout_toRightOf="@id/luckyNumberWidgetImageLeft"
-        android:gravity="center"
-        android:text="#"
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="34sp"
-        tools:ignore="HardcodedText"
-        tools:text="13" />
-</RelativeLayout>
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 059bb741..3abc488e 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -1,99 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/background_widget_timetable"
+    android:backgroundTint="?attr/colorSurface"
+    android:clipToOutline="true"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp"
+    android:theme="@style/Wulkanowy.Widget.Theme"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@drawable/background_widget_header_timetable">
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingVertical="16dp">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/timetableWidgetDate"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@id/timetableWidgetAccount"
-            android:layout_toEndOf="@id/timetableWidgetNext"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/timetableWidgetDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:maxLines="1"
-                android:textColor="@android:color/white"
-                android:textSize="15sp"
-                tools:text="Pon. 30.03.2019" />
-
-            <TextView
-                android:id="@+id/timetableWidgetName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:maxLines="1"
-                android:textColor="@android:color/white"
-                android:textSize="13sp"
-                tools:text="Jan Kowalski" />
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/timetableWidgetAccount"
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="4dp"
-            android:background="?android:selectableItemBackground"
-            android:contentDescription="@string/account_title"
-            android:src="@drawable/ic_widget_account" />
+            android:layout_marginStart="8dp"
+            android:layout_weight="1"
+            android:lines="1"
+            android:textAppearance="?attr/textAppearanceHeadline5"
+            tools:text="Pon, 12.05" />
 
         <ImageButton
             android:id="@+id/timetableWidgetPrev"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:backgroundTint="@color/colorPrimaryDark"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="12dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/all_prev"
+            android:rotation="180"
             android:src="@drawable/ic_widget_chevron"
-            tools:targetApi="lollipop" />
+            android:tint="?attr/colorPrimary"
+            app:tint="?attr/colorPrimary"
+            tools:ignore="UseAppTint" />
 
         <ImageButton
             android:id="@+id/timetableWidgetNext"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:backgroundTint="@color/colorPrimaryDark"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/all_next"
-            android:rotation="180"
             android:src="@drawable/ic_widget_chevron"
-            tools:targetApi="lollipop" />
-    </RelativeLayout>
+            android:tint="?attr/colorPrimary"
+            app:tint="?attr/colorPrimary"
+            tools:ignore="UseAppTint" />
 
-    <ListView
-        android:id="@+id/timetableWidgetList"
+        <FrameLayout
+            android:id="@+id/timetableWidgetAccount"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="12dp"
+            android:background="@drawable/background_timetable_widget_avatar"
+            android:backgroundTint="@android:color/transparent"
+            android:clickable="true"
+            android:clipToOutline="true"
+            android:contentDescription="@string/account_quick_manager"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackgroundBorderless"
+            android:importantForAccessibility="yes"
+            android:outlineProvider="background">
+
+            <ImageView
+                android:id="@+id/timetableWidgetAccountBackground"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:importantForAccessibility="no"
+                tools:src="@drawable/background_timetable_widget_avatar"
+                tools:tint="?attr/colorPrimary" />
+
+            <TextView
+                android:id="@+id/timetableWidgetAccountInitials"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textAppearance="?attr/textAppearanceTitleLarge"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                tools:text="AW" />
+        </FrameLayout>
+    </LinearLayout>
+
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="66dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="10dp"
-        android:divider="#00ffffff"
-        android:dividerHeight="4dp"
-        tools:listitem="@layout/item_widget_timetable" />
+        android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/timetableWidgetEmpty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/widget_timetable_no_items"
-        android:textColor="@android:color/black"
-        android:textSize="20sp"
-        android:translationY="28dp"
-        tools:visibility="invisible" />
-</FrameLayout>
+        <ListView
+            android:id="@+id/timetableWidgetList"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="4dp"
+            android:paddingBottom="16dp"
+            tools:listfooter="@layout/item_widget_timetable_footer"
+            tools:listitem="@layout/item_widget_timetable" />
+
+        <TextView
+            android:id="@+id/timetableWidgetEmpty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/widget_timetable_no_items"
+            android:textAppearance="?attr/textAppearanceBody1"
+            android:visibility="gone" />
+    </FrameLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
deleted file mode 100644
index 9c8b8c56..00000000
--- a/app/src/main/res/layout/widget_timetable_dark.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/background_widget_timetable_dark"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@drawable/background_widget_header_timetable_dark">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@id/timetableWidgetAccount"
-            android:layout_toEndOf="@id/timetableWidgetNext"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/timetableWidgetDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:maxLines="1"
-                android:textColor="@android:color/white"
-                android:textSize="15sp"
-                tools:text="Pon. 30.03.2019" />
-
-            <TextView
-                android:id="@+id/timetableWidgetName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:maxLines="1"
-                android:textColor="@android:color/white"
-                android:textSize="13sp"
-                tools:text="Jan Kowalski" />
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/timetableWidgetAccount"
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="4dp"
-            android:background="?android:selectableItemBackground"
-            android:contentDescription="@string/account_title"
-            android:src="@drawable/ic_widget_account" />
-
-        <ImageButton
-            android:id="@+id/timetableWidgetPrev"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="10dp"
-            android:backgroundTint="@color/colorWidgetNavButton"
-            android:contentDescription="@string/all_prev"
-            android:src="@drawable/ic_widget_chevron"
-            tools:targetApi="lollipop" />
-
-        <ImageButton
-            android:id="@+id/timetableWidgetNext"
-            android:layout_width="50dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:backgroundTint="@color/colorWidgetNavButton"
-            android:contentDescription="@string/all_next"
-            android:rotation="180"
-            android:src="@drawable/ic_widget_chevron"
-            tools:targetApi="lollipop" />
-    </RelativeLayout>
-
-    <ListView
-        android:id="@+id/timetableWidgetList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="66dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:divider="#00ffffff"
-        android:dividerHeight="4dp"
-        tools:listitem="@layout/item_widget_timetable_dark" />
-
-    <TextView
-        android:id="@+id/timetableWidgetEmpty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/widget_timetable_no_items"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:translationY="28dp"
-        tools:visibility="invisible" />
-</FrameLayout>
diff --git a/app/src/main/res/menu/action_menu_dashboard.xml b/app/src/main/res/menu/action_menu_dashboard.xml
index 13565a19..71203d32 100644
--- a/app/src/main/res/menu/action_menu_dashboard.xml
+++ b/app/src/main/res/menu/action_menu_dashboard.xml
@@ -6,13 +6,13 @@
         android:icon="@drawable/ic_settings_notifications"
         android:orderInCategory="1"
         android:title="@string/notifications_center_title"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="?colorControlNormal"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/dashboard_menu_tiles"
         android:icon="@drawable/ic_more_settings"
         android:orderInCategory="2"
         android:title="@string/pref_dashboard_appearance_tiles_title"
-        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:iconTint="?colorControlNormal"
         app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index da1bca12..a8699eec 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/colorPrimary" />
+    <background android:drawable="@color/colorIcon" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground_mono" />
 </adaptive-icon>
diff --git a/app/src/main/res/values-night-v31/styles.xml b/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 00000000..067a4353
--- /dev/null
+++ b/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,65 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="WulkanowyTheme" parent="@style/Theme.Material3.DynamicColors.Dark">
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+        <item name="colorPrimary">@color/material_dynamic_primary80</item>
+        <item name="colorOnPrimary">@color/material_dynamic_primary20</item>
+        <item name="colorPrimaryContainer">@color/material_dynamic_primary30</item>
+        <item name="colorOnPrimaryContainer">@color/material_dynamic_primary90</item>
+
+        <item name="colorSecondary">@color/material_dynamic_primary80</item>
+        <item name="colorOnSecondary">@color/material_dynamic_primary20</item>
+        <item name="colorSecondaryContainer">@color/material_dynamic_secondary30</item>
+        <item name="colorOnSecondaryContainer">@color/material_dynamic_secondary80</item>
+
+        <item name="colorTertiary">@color/material_dynamic_tertiary80</item>
+        <item name="colorOnTertiary">@color/material_dynamic_tertiary20</item>
+        <item name="colorTertiaryContainer">@color/material_dynamic_tertiary30</item>
+        <item name="colorOnTertiaryContainer">@color/material_dynamic_tertiary90</item>
+
+        <item name="android:colorBackground">@color/material_dynamic_neutral10</item>
+        <item name="colorOnBackground">@color/material_dynamic_neutral90</item>
+
+        <item name="colorSurface">@color/material_dynamic_neutral10</item>
+        <item name="colorOnSurface">@color/material_dynamic_neutral90</item>
+        <item name="colorSurfaceVariant">@color/material_dynamic_neutral_variant30</item>
+        <item name="colorOnSurfaceVariant">@color/material_dynamic_neutral_variant80</item>
+
+        <item name="colorOutline">@color/material_dynamic_neutral_variant60</item>
+        <item name="colorSurfaceInverse">@color/material_dynamic_neutral99</item>
+        <item name="colorOnSurfaceInverse">@color/material_dynamic_neutral10</item>
+        <item name="colorPrimaryInverse">@color/material_dynamic_primary40</item>
+        <item name="colorTimetableCanceled">@color/timetable_canceled_dark</item>
+        <item name="colorTimetableChange">@color/timetable_change_dark</item>
+        <item name="colorError">@color/colorErrorLight</item>
+        <item name="colorDivider">@color/colorDividerInverse</item>
+        <item name="colorSwipeRefresh">@color/material_dynamic_secondary20</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="android:windowBackground">?colorSurface</item>
+        <item name="android:textColor">@color/material_dynamic_neutral90</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
+        <item name="switchPreferenceCompatStyle">
+            @style/Preference.Wulkanowy.SwitchPreferenceCompat
+        </item>
+        <item name="alertDialogTheme">@style/WulkanowyTheme.PreferenceAlertDialog</item>
+    </style>
+
+    <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
+        <item name="colorSurface">@android:color/black</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+    </style>
+
+    <style name="Wulkanowy.Widget.Theme" parent="WulkanowyTheme">
+        <item name="colorSurface">@color/material_dynamic_secondary20</item>
+        <item name="colorPrimaryContainer">?attr/colorPrimary</item>
+        <item name="colorOnPrimaryContainer">?attr/colorSurface</item>
+        <item name="backgroundColor">@color/material_dynamic_neutral10</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 881d5bd4..7d2f0cfe 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,20 +1,41 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="WulkanowyTheme" parent="@style/Theme.MaterialComponents">
+    <style name="WulkanowyTheme" parent="@style/Theme.Material3.Dark">
         <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-        <item name="colorPrimary">@color/colorPrimaryLight</item>
-        <item name="colorSecondary">@color/colorPrimaryLight</item>
-        <item name="colorTimetableChange">@color/timetable_change_light</item>
+
+        <item name="colorPrimary">@color/colorPrimaryDark</item>
+        <item name="colorOnPrimary">@color/colorOnPrimaryDark</item>
+        <item name="colorPrimaryContainer">@color/colorPrimaryContainerDark</item>
+        <item name="colorOnPrimaryContainer">@color/colorOnPrimaryContainerDark</item>
+
+        <item name="colorSecondary">@color/colorPrimaryDark</item>
+        <item name="colorOnSecondary">@color/colorOnPrimaryDark</item>
+        <item name="colorSecondaryContainer">@color/colorPrimaryContainerDark</item>
+        <item name="colorOnSecondaryContainer">@color/colorOnPrimaryContainerDark</item>
+
+        <item name="colorTertiary">@color/colorPrimaryDark</item>
+        <item name="colorOnTertiary">@color/colorOnPrimaryDark</item>
+        <item name="colorTertiaryContainer">@color/colorPrimaryContainerDark</item>
+        <item name="colorOnTertiaryContainer">@color/colorOnPrimaryContainerDark</item>
+
+        <item name="colorSurface">@color/colorSurfaceDark</item>
+        <item name="colorTimetableCanceled">@color/timetable_canceled_dark</item>
+        <item name="colorTimetableChange">@color/timetable_change_dark</item>
         <item name="colorError">@color/colorErrorLight</item>
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="colorSwipeRefresh">@color/colorSwipeRefreshDark</item>
         <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:navigationBarColor">@color/colorNavigationBarLight</item>
-        <item name="android:statusBarColor">@color/colorStatusBarLight</item>
+        <item name="android:navigationBarColor">@color/colorNavigationBarDark</item>
+        <item name="android:statusBarColor">@color/colorStatusBarDark</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
+        <item name="switchPreferenceCompatStyle">
+            @style/Preference.Wulkanowy.SwitchPreferenceCompat
+        </item>
+        <item name="alertDialogTheme">@style/WulkanowyTheme.PreferenceAlertDialog</item>
     </style>
 
     <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
@@ -34,21 +55,19 @@
         <item name="android:statusBarColor">?colorSurface</item>
     </style>
 
-    <style name="WulkanowyTheme.MessageSend" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:navigationBarColor">?colorSurface</item>
-        <item name="android:statusBarColor">#1C1C1C</item>
-    </style>
-
-    <style name="WulkanowyTheme.MessageSend.Black" parent="WulkanowyTheme.Black">
-        <item name="android:navigationBarColor">?colorSurface</item>
-        <item name="android:statusBarColor">@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>
+    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.Material3.Dark.Dialog">
+        <item name="colorPrimary">@color/colorPrimaryDark</item>
+        <item name="colorSecondary">@color/colorPrimaryDark</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:windowBackground">@drawable/background_material_alert_dialog</item>
+    </style>
+
+    <style name="Wulkanowy.Widget.Theme" parent="WulkanowyTheme">
+        <item name="colorSurface">@color/widget_container_dark</item>
+        <item name="colorPrimaryContainer">?attr/colorPrimary</item>
+        <item name="colorOnPrimaryContainer">?attr/colorSurface</item>
+        <item name="backgroundColor">@color/widget_list_item_dark</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 840f5357..95450ae1 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -3,6 +3,11 @@
 
     <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:statusBarColor">@color/colorStatusBarLight</item>
     </style>
-</resources>
\ No newline at end of file
+
+    <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:statusBarColor">?colorSurface</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v26/styles.xml b/app/src/main/res/values-v26/styles.xml
deleted file mode 100644
index 3fb0a5dd..00000000
--- a/app/src/main/res/values-v26/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:statusBarColor">@android:color/darker_gray</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 00000000..1cbe9791
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,16 @@
+<resources>
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
+        <item name="android:navigationBarColor">@color/colorNavigationBarLight</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:statusBarColor">@color/colorStatusBarLight</item>
+    </style>
+
+    <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar">
+        <item name="android:statusBarColor">?colorSurface</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:navigationBarColor">?colorSurface</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v28/styles.xml b/app/src/main/res/values-v28/styles.xml
deleted file mode 100644
index a936566f..00000000
--- a/app/src/main/res/values-v28/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v29/styles.xml b/app/src/main/res/values-v29/styles.xml
deleted file mode 100644
index a936566f..00000000
--- a/app/src/main/res/values-v29/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:navigationBarColor">@android:color/white</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 00000000..cffb284e
--- /dev/null
+++ b/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,60 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
+
+    <style name="BaseWulkanowyTheme" parent="@style/Theme.Material3.DynamicColors.Light">
+        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+        <item name="colorPrimary">@color/material_dynamic_primary40</item>
+        <item name="colorOnPrimary">@color/material_dynamic_primary100</item>
+        <item name="colorPrimaryContainer">@color/material_dynamic_primary90</item>
+        <item name="colorOnPrimaryContainer">@color/material_dynamic_primary10</item>
+
+        <item name="colorSecondary">@color/material_dynamic_secondary40</item>
+        <item name="colorOnSecondary">@color/material_dynamic_secondary100</item>
+        <item name="colorSecondaryContainer">@color/material_dynamic_secondary90</item>
+        <item name="colorOnSecondaryContainer">@color/material_dynamic_secondary10</item>
+
+        <item name="colorTertiary">@color/material_dynamic_tertiary40</item>
+        <item name="colorOnTertiary">@color/material_dynamic_tertiary100</item>
+        <item name="colorTertiaryContainer">@color/material_dynamic_tertiary90</item>
+        <item name="colorOnTertiaryContainer">@color/material_dynamic_tertiary10</item>
+
+        <item name="android:colorBackground">@color/material_dynamic_neutral99</item>
+        <item name="colorOnBackground">@color/material_dynamic_neutral10</item>
+
+        <item name="colorSurface">@color/material_dynamic_neutral_variant99</item>
+        <item name="colorOnSurface">@color/material_dynamic_neutral10</item>
+        <item name="colorSurfaceVariant">@color/material_dynamic_neutral_variant90</item>
+        <item name="colorOnSurfaceVariant">@color/material_dynamic_neutral_variant30</item>
+
+        <item name="colorOutline">@color/material_dynamic_neutral_variant50</item>
+        <item name="colorSurfaceInverse">@color/material_dynamic_neutral20</item>
+        <item name="colorOnSurfaceInverse">@color/material_dynamic_neutral95</item>
+        <item name="colorPrimaryInverse">@color/material_dynamic_primary80</item>
+        <item name="colorTimetableCanceled">@color/timetable_canceled_light</item>
+        <item name="colorTimetableChange">@color/timetable_change_light</item>
+        <item name="colorError">@color/colorError</item>
+        <item name="colorDivider">@color/colorDivider</item>
+        <item name="colorSwipeRefresh">@color/material_dynamic_secondary90</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="android:textColor">@color/material_dynamic_neutral10</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
+        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
+        <item name="switchPreferenceCompatStyle">
+            @style/Preference.Wulkanowy.SwitchPreferenceCompat
+        </item>
+        <item name="alertDialogTheme">@style/WulkanowyTheme.PreferenceAlertDialog</item>
+    </style>
+
+    <style name="Wulkanowy.Widget.Theme" parent="WulkanowyTheme">
+        <item name="colorSurface">@color/material_dynamic_secondary95</item>
+        <item name="colorOnPrimaryContainer">?attr/colorPrimary</item>
+        <item name="backgroundColor">@color/material_dynamic_neutral99</item>
+    </style>
+
+    <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar" />
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d4ed6e97..8986f357 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -2,6 +2,7 @@
 <resources>
     <attr name="colorDivider" format="color" />
     <attr name="colorSwipeRefresh" format="color" />
+    <attr name="colorTimetableCanceled" format="color" />
     <attr name="colorTimetableChange" format="color" />
     <attr name="colorMessageMedium" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f3112b10..ac1b1c19 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,22 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#d32f2f</color>
-    <color name="colorPrimaryLight">#e57373</color>
-    <color name="colorPrimaryDark">#9a0007</color>
+    <color name="colorIcon">#d32f2f</color>
+    <color name="colorPrimary">#B91B21</color>
+    <color name="colorOnPrimary">#FFFFFF</color>
+    <color name="colorPrimaryContainer">#FFDAD5</color>
+    <color name="colorOnPrimaryContainer">#410003</color>
+    <color name="colorSurface">#FCFCFC</color>
+    <color name="colorOnSurface">#201A1A</color>
+    <color name="colorSurfaceVariant">#F4DDDB</color>
+    <color name="colorOnSurfaceVariant">#534341</color>
+    <color name="colorOutline">#857371</color>
+    <color name="colorSurfaceInverse">#352F2F</color>
+    <color name="colorOnSurfaceInverse">#FAEEEE</color>
+    <color name="colorPrimaryInverse">#FFB3AA</color>
+
+    <color name="colorPrimaryDark">#FFB3AA</color>
+    <color name="colorOnPrimaryDark">#680006</color>
+    <color name="colorPrimaryContainerDark">#93000E</color>
+    <color name="colorOnPrimaryContainerDark">#FFDAD5</color>
+    <color name="colorSurfaceDark">#201A1A</color>
+    <color name="colorOnSurfaceDark">#ECE0E0</color>
+    <color name="colorSurfaceVariantDark">#534341</color>
+    <color name="colorOnSurfaceVariantDark">#D7C1BF</color>
+    <color name="colorOutlineDark">#9F8C8A</color>
+    <color name="colorSurfaceInverseDark">#ECE0E0</color>
+    <color name="colorOnSurfaceInverseDark">#201A1A</color>
+    <color name="colorPrimaryInverseDark">#B91B21</color>
+
+    <color name="colorPrimaryDarker">#9a0007</color>
     <color name="colorError">#ff5722</color>
     <color name="colorErrorLight">#e84853</color>
 
-    <color name="colorNavigationBarLight">#2D2D2D</color>
-    <color name="colorNavigationBarBlack">#1E1E1E</color>
+    <color name="colorNavigationBarLight">#f5e8e9</color>
+    <color name="colorNavigationBarDark">#312624</color>
+    <color name="colorNavigationBarBlack">#150e0e</color>
 
-    <color name="colorStatusBarLight">#1C1C1C</color>
-    <color name="colorStatusBarBlack">#0D0D0D</color>
+    <color name="colorStatusBarLight">#f5e5e6</color>
+    <color name="colorStatusBarDark">#342826</color>
+    <color name="colorStatusBarBlack">#181010</color>
 
     <color name="dashboard_message_medium_light">#FFD980</color>
     <color name="dashboard_message_medium_dark">#ffd54f</color>
 
-    <color name="timetable_change_light">#ffd54f</color>
-    <color name="timetable_change_dark">#ff8f00</color>
+    <color name="timetable_canceled_light">#d32f2f</color>
+    <color name="timetable_canceled_dark">#e57373</color>
+    <color name="timetable_change_light">#ff8f00</color>
+    <color name="timetable_change_dark">#ffd54f</color>
 
     <color name="colorDivider">#1f000000</color>
     <color name="colorDividerInverse">#1fffffff</color>
@@ -24,6 +53,12 @@
     <color name="colorSwipeRefreshDark">#ff383838</color>
     <color name="colorSwipeRefresh">#ffffffff</color>
 
+    <color name="widget_primary_color_light">#FF944841</color>
+    <color name="widget_container">#FFEDEA</color>
+    <color name="widget_container_dark">#462527</color>
+    <color name="widget_list_item">#FFFBFF</color>
+    <color name="widget_list_item_dark">#201A19</color>
+
     <color name="note_positive">#a0c431</color>
     <color name="note_negative">#d43f3f</color>
 
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index 9c092ec5..6c81100d 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -23,7 +23,6 @@
     <string name="pref_default_timetable_show_whole_class">no</string>
     <string name="pref_default_grade_sorting_mode">alphabetic</string>
     <bool name="pref_default_timetable_show_timers">false</bool>
-    <bool name="pref_default_homework_fullscreen">false</bool>
     <bool name="pref_default_subjects_without_grades">false</bool>
     <bool name="pref_default_optional_arithmetic_average">false</bool>
     <string name="pref_default_last_sync_date">0</string>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 739c1877..716639c0 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -28,7 +28,6 @@
     <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
     <string name="pref_key_timetable_show_groups">show_groups_in_plan</string>
     <string name="pref_key_timetable_show_timers">timetable_show_timers</string>
-    <string name="pref_key_homework_fullscreen">homework_fullscreen</string>
     <string name="pref_key_subjects_without_grades">subjects_without_grades</string>
     <string name="pref_key_optional_arithmetic_average">optional_arithmetic_average</string>
     <string name="pref_key_message_draft">message_draft</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8fbe9b0..4e53fd2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <!--Activity/Fragment title-->
     <string name="login_title">Login</string>
     <string name="main_title">Wulkanowy</string>
@@ -27,8 +28,12 @@
     <string name="dashboard_title">Dashboard</string>
     <string name="notifications_center_title">Notifications center</string>
     <string name="menu_order_title">Menu configuartion</string>
+
+
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Sign in with the student or parent account</string>
     <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
@@ -78,11 +83,15 @@
     <string name="login_other_search_locations">Other search locations</string>
     <string name="login_no_active_student">No active students found</string>
     <string name="login_symbol_enter">Enter a different symbol</string>
+
+
     <!--Notifications-->
     <string name="notifications_header_title">Enable notifications</string>
     <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
     <string name="notifications_skip">Skip</string>
     <string name="notifications_enable">Enable</string>
+
+
     <!--Main-->
     <string name="main_account_picker">Account manager</string>
     <string name="main_log_in">Log in</string>
@@ -91,6 +100,8 @@
     <string name="main_support_title">Application support</string>
     <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
     <string name="main_support_positive">Enable ads</string>
+
+
     <!--Grade-->
     <string name="grade_header">Grade</string>
     <string name="grade_semester">Semester %d</string>
@@ -153,6 +164,8 @@
         <item quantity="one">You received %1$d final grade</item>
         <item quantity="other">You received %1$d final grades</item>
     </plurals>
+
+
     <!--Timetable-->
     <string name="timetable_lesson">Lesson</string>
     <string name="timetable_room">Room</string>
@@ -188,6 +201,8 @@
         <item quantity="one">%d change</item>
         <item quantity="other">%d changes</item>
     </plurals>
+
+
     <!--Completed lessons-->
     <string name="completed_lessons_title">Completed lessons</string>
     <string name="completed_lessons_button">Show completed lessons</string>
@@ -195,6 +210,8 @@
     <string name="completed_lessons_topic">Topic</string>
     <string name="completed_lessons_absence">Absence</string>
     <string name="completed_lessons_resources">Resources</string>
+
+
     <!--Additional lessons-->
     <string name="additional_lessons_title">Additional lessons</string>
     <string name="additional_lessons_button">Show additional lessons</string>
@@ -210,6 +227,8 @@
     <string name="additional_lessons_start">Start time</string>
     <string name="additional_lessons_end">End time</string>
     <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
+
+
     <!--Attendance-->
     <string name="attendance_summary_button">Attendance summary</string>
     <string name="attendance_absence_school">Absent for school reasons</string>
@@ -242,8 +261,12 @@
         <item quantity="one">%d attendance</item>
         <item quantity="other">%d attendance</item>
     </plurals>
+
+
     <!--Attendance summary-->
     <string name="attendance_summary_total">Total</string>
+
+
     <!--Exam-->
     <string name="exam_no_items">No exams this week</string>
     <string name="exam_type">Type</string>
@@ -260,6 +283,8 @@
         <item quantity="one">%d exam</item>
         <item quantity="other">%d exams</item>
     </plurals>
+
+
     <!--Message-->
     <string name="message_inbox">Inbox</string>
     <string name="message_sent">Sent</string>
@@ -313,6 +338,8 @@
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
     <string name="message_mailbox_chooser_title">Choose mailbox</string>
+
+
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
     <string name="note_points">Points</string>
@@ -328,6 +355,8 @@
         <item quantity="one">You received %1$d note</item>
         <item quantity="other">You received %1$d notes</item>
     </plurals>
+
+
     <!--Praise-->
     <plurals name="praise_number_item">
         <item quantity="one">%d praise</item>
@@ -341,6 +370,8 @@
         <item quantity="one">You received %1$d praise</item>
         <item quantity="other">You received %1$d praises</item>
     </plurals>
+
+
     <!--Neutral notes-->
     <plurals name="neutral_note_number_item">
         <item quantity="one">%d neutral note</item>
@@ -354,6 +385,8 @@
         <item quantity="one">You received %1$d neutral note</item>
         <item quantity="other">You received %1$d neutral notes</item>
     </plurals>
+
+
     <!--Homework-->
     <string name="homework_no_items">No info about homework</string>
     <string name="homework_mark_as_done">Mark as done</string>
@@ -374,6 +407,8 @@
         <item quantity="one">%d homework</item>
         <item quantity="other">%d homework</item>
     </plurals>
+
+
     <!--Lucky number-->
     <string name="lucky_number_title">Lucky number</string>
     <string name="lucky_number_header">Today\'s lucky number is</string>
@@ -381,9 +416,13 @@
     <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
     <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
     <string name="lucky_number_history_button">Show history</string>
+
+
     <!--Lucky number history-->
     <string name="lucky_number_history_title">Lucky number history</string>
     <string name="lucky_number_history_empty">No info about lucky numbers</string>
+
+
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile devices</string>
     <string name="mobile_devices_no_items">No devices</string>
@@ -393,8 +432,12 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
+
+
     <!--School and teachers-->
     <string name="schoolandteachers_title">School and teachers</string>
+
+
     <!--School-->
     <string name="school_title">School</string>
     <string name="school_no_info">No info about school</string>
@@ -405,10 +448,14 @@
     <string name="school_pedagogue">Name of pedagogue</string>
     <string name="school_address_button">Show on map</string>
     <string name="school_telephone_button">Call</string>
+
+
     <!--Teacher-->
     <string name="teachers_title">Teachers</string>
     <string name="teacher_no_items">No info about teachers</string>
     <string name="teacher_no_subject">No subject</string>
+
+
     <!--Conference-->
     <string name="conferences_title">Conferences</string>
     <string name="conference_no_items">No info about conferences</string>
@@ -428,6 +475,8 @@
     <string name="conference_agenda">Agenda</string>
     <string name="conference_place">Place</string>
     <string name="conference_topic">Topic</string>
+
+
     <!--Director information-->
     <string name="school_announcement_title">School announcements</string>
     <string name="school_announcement_no_items">No school announcements</string>
@@ -443,6 +492,8 @@
         <item quantity="one">You have %1$d new school announcement</item>
         <item quantity="other">You have %1$d new school announcements</item>
     </plurals>
+
+
     <!--Account-->
     <string name="account_add_new">Add account</string>
     <string name="account_logout">Logout</string>
@@ -457,6 +508,8 @@
     <string name="account_contact">Contact</string>
     <string name="account_address">Residence details</string>
     <string name="account_personal_data">Personal information</string>
+
+
     <!--About-->
     <string name="about_version">App version</string>
     <string name="about_contributor">Contributors</string>
@@ -480,11 +533,17 @@
     <string name="about_licenses">Licenses</string>
     <string name="about_licenses_summary">Licenses of libraries used in the application</string>
     <string name="about_feedback_template" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nIdentyfikator instalacji: %4$s\nTreść zgłoszenia:</string>
+
+
     <!--Licenses-->
     <string name="license_dialog_title">License</string>
+
+
     <!--Contributor-->
     <string name="contributor_avatar_description">Avatar</string>
     <string name="contributor_see_more">See more on GitHub</string>
+
+
     <!--Student info-->
     <string name="student_info_empty">No info about student or student family</string>
     <string name="student_info_first_name">Name</string>
@@ -507,13 +566,19 @@
     <string name="student_info_female">Female</string>
     <string name="student_info_last_name">Last name</string>
     <string name="student_info_guardian">Guardian</string>
+
+
     <!--Account edit-->
     <string name="account_edit_nick_hint">Nick</string>
     <string name="account_edit_header">Add nick</string>
     <string name="account_edit_avatar_title">Choose avatar color</string>
+
+
     <!--Log viewer-->
     <string name="logviewer_share">Share logs</string>
     <string name="logviewer_refresh">Refresh</string>
+
+
     <!--Dashboard-->
     <string name="dashboard_timetable_title">Lessons</string>
     <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
@@ -566,9 +631,13 @@
     </plurals>
     <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
     <string name="dashboard_horizontal_group_no_data">None</string>
+
+
     <!--Error dialog-->
     <string name="dialog_error_check_update">Check for updates</string>
     <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
+
+
     <!--Generic-->
     <string name="all_content">Content</string>
     <string name="all_retry">Retry</string>
@@ -597,12 +666,17 @@
     <string name="all_change">Change</string>
     <string name="all_add_to_calendar">Add to calendar</string>
     <string name="all_cancel">Cancel</string>
+
+
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
     <string name="widget_timetable_theme_title">Choose theme</string>
     <string name="widget_timetable_theme_light">Light</string>
     <string name="widget_timetable_theme_dark">Dark</string>
     <string name="widget_timetable_theme_system">System Theme</string>
+
+
     <!--Preferences-->
     <string name="pref_view_header">App</string>
     <string name="pref_view_list">Default view</string>
@@ -695,6 +769,8 @@
     <string name="pref_advanced_category">Advanced</string>
     <string name="pref_about_category_summary">App version, contributors, social portals</string>
     <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+
+
     <!--Notification Channels-->
     <string name="channel_new_grades">New grades</string>
     <string name="channel_new_homework">New homework</string>
@@ -709,6 +785,8 @@
     <string name="channel_debug">Debug</string>
     <string name="channel_change_timetable">Timetable change</string>
     <string name="channel_new_attendance">New attendance</string>
+
+
     <!--Colors-->
     <string name="all_black">Black</string>
     <string name="all_red">Red</string>
@@ -716,15 +794,20 @@
     <string name="all_green">Green</string>
     <string name="all_purple">Purple</string>
     <string name="all_empty_color">No color</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>
     <string name="update_download_success_button">Restart</string>
     <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+
     <!--Menu order-->
     <string name="menu_order_confirm_title">Application restart</string>
     <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
     <string name="menu_order_confirm_restart">Restart</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7cd0f725..b0bf2819 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,19 +2,35 @@
 
     <style name="WulkanowyTheme" parent="BaseWulkanowyTheme" />
 
-    <style name="BaseWulkanowyTheme" parent="@style/Theme.MaterialComponents.Light">
+    <style name="BaseWulkanowyTheme" parent="@style/Theme.Material3.Light">
         <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
         <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorOnPrimary">@android:color/white</item>
+        <item name="colorPrimaryContainer">@color/colorPrimaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/colorOnPrimaryContainer</item>
         <item name="colorSecondary">@color/colorPrimary</item>
         <item name="colorOnSecondary">@android:color/white</item>
-        <item name="colorTimetableChange">@color/timetable_change_dark</item>
+        <item name="colorSecondaryContainer">@color/colorPrimaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/colorOnPrimaryContainer</item>
+        <item name="colorTertiary">@color/colorPrimary</item>
+        <item name="colorOnTertiary">@android:color/white</item>
+        <item name="colorTertiaryContainer">@color/colorPrimaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/colorOnPrimaryContainer</item>
+        <item name="colorSurface">@color/colorSurface</item>
+        <item name="colorTimetableCanceled">@color/timetable_canceled_light</item>
+        <item name="colorTimetableChange">@color/timetable_change_light</item>
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
         <item name="colorSwipeRefresh">@color/colorSwipeRefresh</item>
         <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
-        <item name="android:statusBarColor">@android:color/darker_gray</item>
         <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
+        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
+        <item name="switchPreferenceCompatStyle">
+            @style/Preference.Wulkanowy.SwitchPreferenceCompat
+        </item>
+        <item name="alertDialogTheme">@style/WulkanowyTheme.PreferenceAlertDialog</item>
     </style>
 
     <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
@@ -24,26 +40,26 @@
     </style>
 
     <style name="WulkanowyTheme.SplashScreen" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/colorPrimaryDark</item>
+        <item name="windowSplashScreenBackground">@color/colorPrimaryDarker</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash_logo</item>
         <item name="postSplashScreenTheme">@style/WulkanowyTheme.NoActionBar</item>
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
     </style>
 
-    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Light.Dialog">
+    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.Material3.Light.Dialog">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorSecondary">@color/colorPrimary</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:windowBackground">@drawable/background_material_alert_dialog</item>
     </style>
 
-    <style name="Widget.Wulkanowy.Chip.Choice" parent="Widget.MaterialComponents.Chip.Choice">
-        <item name="materialThemeOverlay">@style/ThemeOverlay.Wulkanowy.Chip.Choice</item>
-    </style>
-
-    <style name="ThemeOverlay.Wulkanowy.Chip.Choice" parent="">
-        <item name="elevationOverlayEnabled">false</item>
+    <style name="Wulkanowy.Widget.Theme" parent="WulkanowyTheme">
+        <item name="colorPrimary">@color/widget_primary_color_light</item>
+        <item name="colorSurface">@color/widget_container</item>
+        <item name="colorOnPrimaryContainer">?attr/colorPrimary</item>
+        <item name="backgroundColor">@color/widget_list_item</item>
     </style>
 
     <style name="WulkanowyTheme.TextAppearanceBottomNavigation">
@@ -52,5 +68,14 @@
 
     <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar" />
 
-    <style name="WulkanowyTheme.MessageSend" parent="WulkanowyTheme.NoActionBar" />
+    <style name="Preference.Wulkanowy.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
+        <item name="android:widgetLayout">@layout/layout_preference_switch</item>
+    </style>
+
+    <style name="WulkanowyTheme.PreferenceAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="dialogCornerRadius">28dp</item>
+        <item name="cornerFamily">rounded</item>
+        <item name="android:background">@drawable/background_material_alert_dialog</item>
+        <item name="android:layout" tools:ignore="PrivateResource">@layout/m3_alert_dialog</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/xml/provider_widget_lucky_number.xml b/app/src/main/res/xml/provider_widget_lucky_number.xml
index 064f2057..330bd53f 100644
--- a/app/src/main/res/xml/provider_widget_lucky_number.xml
+++ b/app/src/main/res/xml/provider_widget_lucky_number.xml
@@ -4,11 +4,13 @@
     android:configure="io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity"
     android:initialLayout="@layout/widget_luckynumber"
     android:minWidth="110dp"
-    android:minHeight="40dp"
-    android:minResizeWidth="40dp"
+    android:minHeight="110dp"
     android:minResizeHeight="40dp"
     android:previewImage="@drawable/img_luckynumber_widget_preview"
+    android:previewLayout="@layout/widget_luckynumber"
     android:resizeMode="horizontal|vertical"
+    android:targetCellWidth="2"
+    android:targetCellHeight="2"
     android:updatePeriodMillis="3600000"
     android:widgetCategory="home_screen"
-    tools:targetApi="jelly_bean_mr1" />
+    tools:targetApi="s" />
diff --git a/app/src/main/res/xml/provider_widget_timetable.xml b/app/src/main/res/xml/provider_widget_timetable.xml
index 5392dd50..3cdad0c8 100644
--- a/app/src/main/res/xml/provider_widget_timetable.xml
+++ b/app/src/main/res/xml/provider_widget_timetable.xml
@@ -8,7 +8,10 @@
     android:minResizeWidth="250dp"
     android:minResizeHeight="110dp"
     android:previewImage="@drawable/img_timetable_widget_preview"
+    android:previewLayout="@layout/widget_timetable_preview"
     android:resizeMode="horizontal|vertical"
+    android:targetCellWidth="3"
+    android:targetCellHeight="2"
     android:updatePeriodMillis="3600000"
     android:widgetCategory="home_screen"
-    tools:targetApi="jelly_bean_mr1" />
+    tools:targetApi="s" />

From 8d2d7922f94bf7a15607aaad1bdb49234cb3f610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 29 Mar 2023 22:23:42 +0200
Subject: [PATCH 278/429] Fix collapse garde subject when grade is unread
 (#2158)

---
 .../github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index 38bae376..2d63aae4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -15,6 +15,7 @@ import io.github.wulkanowy.utils.changeModifier
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import javax.inject.Inject
 
@@ -77,7 +78,7 @@ class GradeAverageProvider @Inject constructor(
                 )
             }
         }
-    }
+    }.distinctUntilChanged()
 
     private fun calculateCombinedAverage(
         student: Student,

From 7aa65e98ce3393a6e5a1e615d5ddc4ef0743a17c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Apr 2023 20:30:27 +0000
Subject: [PATCH 279/429] Bump com.android.tools:desugar_jdk_libs from 2.0.2 to
 2.0.3 (#2162)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3fd11ccc..e96d9b80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ ext {
 dependencies {
     implementation "io.github.wulkanowy:sdk:1.9.2"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"

From cb914fe32b862fe5ab2f6aba597410e0bc2af916 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Apr 2023 20:30:56 +0000
Subject: [PATCH 280/429] Bump com.google.android.gms:play-services-ads from
 21.5.0 to 22.0.0 (#2161)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e96d9b80..a0bc17aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -249,7 +249,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-config-ktx'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:21.5.0'
+    playImplementation 'com.google.android.gms:play-services-ads:22.0.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.8.1.300'

From a7cf54897ac6d05c042a2b7e39a138d01adccac7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Apr 2023 20:32:06 +0000
Subject: [PATCH 281/429] Bump kotlin_version from 1.8.10 to 1.8.20 (#2160)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c14e0dbd..2aa3f758 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.8.10'
+        kotlin_version = '1.8.20'
         about_libraries = '10.6.1'
         hilt_version = "2.45"
     }

From 253e55f70e63e7fe24e75669c01a84a4a3448fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 5 Apr 2023 22:33:01 +0200
Subject: [PATCH 282/429] New Crowdin updates (#2159)

---
 app/src/main/res/values-cs/strings.xml     | 1 +
 app/src/main/res/values-da-rDK/strings.xml | 1 +
 app/src/main/res/values-de/strings.xml     | 1 +
 app/src/main/res/values-es-rES/strings.xml | 1 +
 app/src/main/res/values-pl/strings.xml     | 1 +
 app/src/main/res/values-ru/strings.xml     | 1 +
 app/src/main/res/values-sk/strings.xml     | 1 +
 app/src/main/res/values-uk/strings.xml     | 1 +
 8 files changed, 8 insertions(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1897a48b..bedb491b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -682,6 +682,7 @@
     <string name="all_cancel">Zrušit</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Žádné lekce</string>
+    <string name="widget_timetable_last_synchronization">Synchronizováno %1$s v %2$s</string>
     <string name="widget_timetable_theme_title">Vybrat motiv</string>
     <string name="widget_timetable_theme_light">Světlý</string>
     <string name="widget_timetable_theme_dark">Tmavý</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 3875b3d9..ebec11b2 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -594,6 +594,7 @@
     <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
     <string name="widget_timetable_theme_title">Choose theme</string>
     <string name="widget_timetable_theme_light">Light</string>
     <string name="widget_timetable_theme_dark">Dark</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c03181e4..1e1785bf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -594,6 +594,7 @@
     <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Keine Lektionen</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
     <string name="widget_timetable_theme_title">Thema wählen</string>
     <string name="widget_timetable_theme_light">Licht</string>
     <string name="widget_timetable_theme_dark">Dunkel</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 3875b3d9..ebec11b2 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -594,6 +594,7 @@
     <string name="all_cancel">Cancel</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
     <string name="widget_timetable_theme_title">Choose theme</string>
     <string name="widget_timetable_theme_light">Light</string>
     <string name="widget_timetable_theme_dark">Dark</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7f0c3291..f797a4dc 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -682,6 +682,7 @@
     <string name="all_cancel">Anuluj</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
+    <string name="widget_timetable_last_synchronization">Zsynchronizowano %1$s o %2$s</string>
     <string name="widget_timetable_theme_title">Wybierz motyw</string>
     <string name="widget_timetable_theme_light">Jasny</string>
     <string name="widget_timetable_theme_dark">Ciemny</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 42e1e0bb..7a42e388 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -682,6 +682,7 @@
     <string name="all_cancel">Отменить</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
     <string name="widget_timetable_theme_light">Светлая</string>
     <string name="widget_timetable_theme_dark">Тёмная</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8979a95f..cde3178b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -682,6 +682,7 @@
     <string name="all_cancel">Zrušiť</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Žiadne lekcie</string>
+    <string name="widget_timetable_last_synchronization">Synchronizované %1$s v %2$s</string>
     <string name="widget_timetable_theme_title">Vybrať motív</string>
     <string name="widget_timetable_theme_light">Svetlý</string>
     <string name="widget_timetable_theme_dark">Tmavý</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 0c736904..9602aabb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -682,6 +682,7 @@
     <string name="all_cancel">Скасувати</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Немаэ уроків</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
     <string name="widget_timetable_theme_title">Увібрати тему</string>
     <string name="widget_timetable_theme_light">Яскрава</string>
     <string name="widget_timetable_theme_dark">Темна</string>

From c67d2d767d1b037c571efea34787838b92c2fec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 6 Apr 2023 01:28:47 +0200
Subject: [PATCH 283/429] Set error tint to password toggle icon when error
 occured (#2163)

---
 .../ui/modules/login/form/LoginFormFragment.kt        | 11 +++++------
 .../io/github/wulkanowy/utils/ContextExtension.kt     |  6 ++----
 app/src/main/res/layout/fragment_login_form.xml       |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index a0e7608d..bbc38219 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -15,12 +15,7 @@ import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.hideSoftInput
-import io.github.wulkanowy.utils.openEmailClient
-import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.setOnEditorDoneSignIn
-import io.github.wulkanowy.utils.showSoftInput
+import io.github.wulkanowy.utils.*
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -149,12 +144,14 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     override fun setErrorPassRequired(focus: Boolean) {
         with(binding.loginFormPassLayout) {
             error = getString(R.string.error_field_required)
+            setEndIconTintList(requireContext().getAttrColorStateList(R.attr.colorError))
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
         with(binding.loginFormPassLayout) {
             error = getString(R.string.login_invalid_password)
+            setEndIconTintList(requireContext().getAttrColorStateList(R.attr.colorError))
         }
     }
 
@@ -162,6 +159,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         with(binding) {
             loginFormUsernameLayout.error = " "
             loginFormPassLayout.error = " "
+            loginFormPassLayout.setEndIconTintList(requireContext().getAttrColorStateList(R.attr.colorError))
             loginFormHostLayout.error = " "
             loginFormErrorBox.text = message ?: getString(R.string.login_incorrect_password_default)
             loginFormErrorBox.isVisible = true
@@ -181,6 +179,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
 
     override fun clearPassError() {
         binding.loginFormPassLayout.error = null
+        binding.loginFormPassLayout.setEndIconTintList(null)
         binding.loginFormErrorBox.isVisible = false
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index cc4c5aaa..77f3eb64 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -6,7 +6,6 @@ import android.content.res.ColorStateList
 import android.graphics.*
 import android.text.TextPaint
 import android.util.DisplayMetrics.DENSITY_DEFAULT
-import android.widget.ImageView
 import androidx.annotation.*
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
@@ -14,7 +13,6 @@ import androidx.core.graphics.applyCanvas
 import androidx.core.graphics.drawable.RoundedBitmapDrawable
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import androidx.core.graphics.drawable.toBitmap
-import androidx.core.widget.ImageViewCompat
 
 
 @ColorInt
@@ -89,6 +87,6 @@ fun Context.createNameInitialsDrawable(
         .apply { isCircular = true }
 }
 
-fun ImageView.setTint(@ColorInt color: Int) {
-    ImageViewCompat.setImageTintList(this, ColorStateList.valueOf(color))
+fun Context.getAttrColorStateList(@AttrRes color: Int): ColorStateList {
+    return ColorStateList.valueOf(getThemeAttrColor(color))
 }
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 1aea7066..fac3960e 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -180,12 +180,12 @@
                 android:layout_marginEnd="24dp"
                 android:layout_marginRight="24dp"
                 android:hint="@string/login_password_hint"
+                app:endIconMode="password_toggle"
                 app:errorEnabled="true"
                 app:errorIconDrawable="@null"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout"
-                app:passwordToggleEnabled="true">
+                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/loginFormPass"

From 8752607433db58cc770a5c4cfc1aedab8493befe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 6 Apr 2023 01:29:46 +0200
Subject: [PATCH 284/429] Use segmented toggle buttons instead of option group
 in grades statistics (#2164)

---
 .../statistics/GradeStatisticsAdapter.kt      |  4 ++-
 .../layout/item_grade_statistics_header.xml   | 26 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
index fd0ac547..3fce8d57 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
@@ -116,7 +116,9 @@ class GradeStatisticsAdapter @Inject constructor() :
             }
         )
 
-        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
+        binding.gradeStatisticsTypeSwitch.addOnButtonCheckedListener { _, checkedId, isChecked ->
+            if (!isChecked) return@addOnButtonCheckedListener
+
             currentDataType = when (checkedId) {
                 R.id.gradeStatisticsTypePartial -> GradeStatisticsItem.DataType.PARTIAL
                 R.id.gradeStatisticsTypeSemester -> GradeStatisticsItem.DataType.SEMESTER
diff --git a/app/src/main/res/layout/item_grade_statistics_header.xml b/app/src/main/res/layout/item_grade_statistics_header.xml
index 92f522ba..cc35f606 100644
--- a/app/src/main/res/layout/item_grade_statistics_header.xml
+++ b/app/src/main/res/layout/item_grade_statistics_header.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:context=".ui.modules.grade.statistics.GradeStatisticsAdapter">
 
     <HorizontalScrollView
         android:layout_width="wrap_content"
@@ -12,36 +14,38 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <RadioGroup
+        <com.google.android.material.button.MaterialButtonToggleGroup
             android:id="@+id/gradeStatisticsTypeSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingStart="16dp"
             android:paddingTop="5dp"
-            android:paddingEnd="16dp">
+            android:paddingEnd="16dp"
+            app:selectionRequired="true"
+            app:singleSelection="true">
 
-            <com.google.android.material.radiobutton.MaterialRadioButton
+            <Button
                 android:id="@+id/gradeStatisticsTypePartial"
+                style="?attr/materialButtonOutlinedStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:checked="true"
-                android:tag="partial"
                 android:text="@string/grade_statistics_partial" />
 
-            <com.google.android.material.radiobutton.MaterialRadioButton
+            <Button
                 android:id="@+id/gradeStatisticsTypeSemester"
+                style="?attr/materialButtonOutlinedStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:tag="annual"
                 android:text="@string/grade_statistics_semester" />
 
-            <com.google.android.material.radiobutton.MaterialRadioButton
+            <Button
                 android:id="@+id/gradeStatisticsTypePoints"
+                style="?attr/materialButtonOutlinedStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:tag="points"
                 android:text="@string/grade_statistics_points" />
-        </RadioGroup>
+        </com.google.android.material.button.MaterialButtonToggleGroup>
     </HorizontalScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>

From bce2c39ccc0801e7831ed9936aa76b287fb435eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 6 Apr 2023 10:13:34 +0200
Subject: [PATCH 285/429] Disable error dialog for admin messages (#2165)

---
 .../wulkanowy/ui/modules/dashboard/DashboardPresenter.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index 22b0d267..ac2c896d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -606,7 +606,7 @@ class DashboardPresenter @Inject constructor(
                     }
                     is Resource.Error -> {
                         Timber.i("Loading dashboard admin message result: An exception occurred")
-                        errorHandler.dispatch(it.error)
+                        Timber.e(it.error)
                         updateData(
                             dashboardItem = DashboardItem.AdminMessages(
                                 adminMessage = null,
@@ -748,7 +748,7 @@ class DashboardPresenter @Inject constructor(
             itemsLoadedList.find { it.type == DashboardItem.Type.ACCOUNT }?.error != null
         val isGeneralError =
             filteredItems.none { it.error == null } && filteredItems.isNotEmpty() || isAccountItemError
-        val firstError = itemsLoadedList.mapNotNull { it.error }.firstOrNull()
+        val firstError = itemsLoadedList.firstNotNullOfOrNull { it.error }
 
         val filteredOriginalLoadedList =
             dashboardItemLoadedList.filterNot { it.type == DashboardItem.Type.ACCOUNT }

From 2c9434766861adbc5f7d5d497a4caac12a8c852b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 16:29:14 +0000
Subject: [PATCH 286/429] Bump androidx.core:core-ktx from 1.9.0 to 1.10.0
 (#2167)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a0bc17aa..edb0ca36 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -193,7 +193,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.9.0"
+    implementation "androidx.core:core-ktx:1.10.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.7.0"
     implementation "androidx.appcompat:appcompat:1.6.1"

From 327e61bbdd0c3dbc37da1029c2aad4aae804b444 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 16:29:50 +0000
Subject: [PATCH 287/429] Bump about_libraries from 10.6.1 to 10.6.2 (#2166)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2aa3f758..d53632fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.20'
-        about_libraries = '10.6.1'
+        about_libraries = '10.6.2'
         hilt_version = "2.45"
     }
     repositories {

From 6978ad11ebab55ffb221b060ba82443e9612929d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 05:11:17 +0000
Subject: [PATCH 288/429] Bump com.google.firebase:firebase-crashlytics-gradle
 from 2.9.4 to 2.9.5 (#2174)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d53632fe..ad23becd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.8.1.300'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929"

From e7054bb5b94c716f76e997fc4542d56ca981ffef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 05:11:45 +0000
Subject: [PATCH 289/429] Bump com.google.firebase:firebase-bom from 31.4.0 to
 31.5.0 (#2173)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index edb0ca36..0cc3592f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.4.0')
+    playImplementation platform('com.google.firebase:firebase-bom:31.5.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From de8b38dd9ca1a5ab5b2b4618b8d406031c2e8b19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 05:12:06 +0000
Subject: [PATCH 290/429] Bump org.robolectric:robolectric from 4.9.2 to 4.10
 (#2169)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0cc3592f..c5c8992c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -265,7 +265,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.9.2'
+    testImplementation 'org.robolectric:robolectric:4.10'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"

From 1f30cc1f902b25cf2b56cc17a8b896d73ec946ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 05:12:24 +0000
Subject: [PATCH 291/429] Bump mockk from 1.13.4 to 1.13.5 (#2170)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c5c8992c..d0199a0e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.5.1"
     chucker = "3.5.2"
-    mockk = "1.13.4"
+    mockk = "1.13.5"
     coroutines = "1.6.4"
 }
 

From 623f0339e692a362a03e202d3767cba8f7b6c9ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 05:21:17 +0000
Subject: [PATCH 292/429] Bump com.fredporciuncula:flow-preferences from 1.9.0
 to 1.9.1 (#2172)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d0199a0e..b8d4e1ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,7 +239,7 @@ dependencies {
     implementation "io.coil-kt:coil:2.3.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
-    implementation 'com.fredporciuncula:flow-preferences:1.9.0'
+    implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
     playImplementation platform('com.google.firebase:firebase-bom:31.5.0')

From b1d22843b59cbcabca741bdb8cdb9d92c2cc3d9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 21:29:42 +0000
Subject: [PATCH 293/429] Bump androidx.core:core-splashscreen from 1.0.0 to
 1.0.1 (#2180)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b8d4e1ca..77b3d8c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -194,7 +194,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.10.0"
-    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.7.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.5.6"

From b2af5ed57de63a39cd392c3db3c93b91fd7690a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 21:30:39 +0000
Subject: [PATCH 294/429] Bump com.squareup.okhttp3:logging-interceptor from
 4.10.0 to 4.11.0 (#2177)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 77b3d8c4..2a1d5888 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -230,7 +230,7 @@ dependencies {
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.10.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.11.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"

From 56d7e94946dca8536764050fdcf0080df10e9cd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 21:31:46 +0000
Subject: [PATCH 295/429] Bump com.huawei.agconnect:agcp from 1.8.1.300 to
 1.9.0.300 (#2179)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ad23becd..b8813f89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.huawei.agconnect:agcp:1.8.1.300'
+        classpath 'com.huawei.agconnect:agcp:1.9.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"

From 4fedb74005e3a3cb02d6792f7e156ec62149c189 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 21:32:02 +0000
Subject: [PATCH 296/429] Bump kotlin_version from 1.8.20 to 1.8.21 (#2182)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b8813f89..3c8552d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.8.20'
+        kotlin_version = '1.8.21'
         about_libraries = '10.6.2'
         hilt_version = "2.45"
     }

From f7fa89638a4e0e55ce56b2f7e254816c1b9b82b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 21:32:49 +0000
Subject: [PATCH 297/429] Bump com.huawei.agconnect:agconnect-crash from
 1.8.1.300 to 1.9.0.300 (#2178)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2a1d5888..77a17a29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -252,7 +252,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:22.0.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.8.1.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From 4be66637526c7ef1a77194c87532a52c4dbf4b1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 21:50:34 +0000
Subject: [PATCH 298/429] Bump
 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter (#2175)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 77a17a29..732de13c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -229,7 +229,7 @@ dependencies {
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
+    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
     implementation "com.squareup.okhttp3:logging-interceptor:4.11.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"

From b1a5a77559df78866d7d194771485ec8746557e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 21:50:48 +0000
Subject: [PATCH 299/429] Bump androidx.fragment:fragment-ktx from 1.5.6 to
 1.5.7 (#2176)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 732de13c..f54d80cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,7 +197,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.7.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.6"
+    implementation "androidx.fragment:fragment-ktx:1.5.7"
     implementation "androidx.annotation:annotation:1.6.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From b195fda026d7d262a3a1c408bcc2fdd11e01527c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 22:02:43 +0000
Subject: [PATCH 300/429] Bump androidx.activity:activity-ktx from 1.7.0 to
 1.7.1 (#2181)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f54d80cb..79cb37ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,7 +195,7 @@ dependencies {
 
     implementation "androidx.core:core-ktx:1.10.0"
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.7.0"
+    implementation "androidx.activity:activity-ktx:1.7.1"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.5.7"
     implementation "androidx.annotation:annotation:1.6.0"

From f8431d7ad6d10b67594599015bd5f6c9d5a45ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 7 May 2023 23:21:59 +0200
Subject: [PATCH 301/429] SDK update (#2168)

---
 .gitignore                                    |  1 +
 app/build.gradle                              |  2 +-
 .../io/github/wulkanowy/data/DataModule.kt    |  2 -
 .../github/wulkanowy/data/db/entities/Exam.kt |  1 +
 .../data/mappers/ConferenceMapper.kt          |  6 +-
 .../wulkanowy/data/mappers/ExamMapper.kt      |  2 +-
 .../wulkanowy/data/mappers/MessageMapper.kt   |  2 +-
 .../data/mappers/MobileDeviceMapper.kt        |  2 +-
 .../data/mappers/RegisterUserMapper.kt        | 31 +++----
 .../wulkanowy/data/mappers/StudentMapper.kt   | 37 --------
 .../wulkanowy/data/mappers/TimetableMapper.kt | 16 ++--
 .../wulkanowy/data/pojos/RegisterUser.kt      | 11 ++-
 .../data/repositories/AppCreatorRepository.kt |  1 -
 .../data/repositories/AttendanceRepository.kt |  2 +-
 .../data/repositories/ExamRepository.kt       |  2 +-
 .../data/repositories/NoteRepository.kt       |  2 +-
 .../data/repositories/SemesterRepository.kt   |  2 +-
 .../data/repositories/StudentRepository.kt    | 36 ++++----
 .../data/repositories/TeacherRepository.kt    |  2 +-
 .../data/repositories/TimetableRepository.kt  |  2 +-
 .../ui/modules/login/LoginErrorHandler.kt     | 14 ++--
 .../login/advanced/LoginAdvancedFragment.kt   |  8 +-
 .../login/advanced/LoginAdvancedPresenter.kt  | 84 ++++---------------
 .../login/advanced/LoginAdvancedView.kt       |  1 -
 .../modules/login/form/LoginFormFragment.kt   |  4 +
 .../modules/login/form/LoginFormPresenter.kt  |  3 +
 .../ui/modules/login/form/LoginFormView.kt    |  2 +
 .../LoginStudentSelectFragment.kt             |  1 -
 .../io/github/wulkanowy/utils/SdkExtension.kt | 11 ++-
 .../main/res/layout/fragment_login_form.xml   |  1 -
 .../io/github/wulkanowy/TestEnityCreator.kt   |  2 +-
 .../data/mappers/AttendanceMapperKtTest.kt    |  4 +-
 .../repositories/AttendanceRepositoryTest.kt  | 12 +--
 .../data/repositories/ExamRemoteTest.kt       | 13 ++-
 .../data/repositories/GradeRepositoryTest.kt  | 33 ++++++--
 .../repositories/MessageRepositoryTest.kt     |  2 +-
 .../MobileDeviceRepositoryTest.kt             | 17 ++--
 .../repositories/SemesterRepositoryTest.kt    |  3 +-
 .../data/repositories/StudentTest.kt          | 81 ------------------
 .../repositories/TimetableRepositoryTest.kt   | 80 ++++++++++++++----
 .../domain/GetMailboxByStudentUseCaseTest.kt  |  2 +-
 .../modules/grade/GradeAverageProviderTest.kt |  2 +-
 .../login/form/LoginFormPresenterTest.kt      | 23 ++++-
 .../LoginStudentSelectPresenterTest.kt        | 16 +++-
 44 files changed, 260 insertions(+), 321 deletions(-)
 delete mode 100644 app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
 delete mode 100644 app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt

diff --git a/.gitignore b/.gitignore
index cd5ff714..921bd0a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,3 +119,4 @@ Thumbs.db
 app/src/release/agconnect-services.json
 app/src/release/agconnect-credentials.json
 .idea/deploymentTargetDropDown.xml
+.idea/kotlinc.xml
diff --git a/app/build.gradle b/app/build.gradle
index 79cb37ff..22de4b8b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.9.2"
+    implementation "io.github.wulkanowy:sdk:14267a9a"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
index e538b2b2..c9e4990f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
@@ -20,7 +20,6 @@ import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.RemoteConfigHelper
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -81,7 +80,6 @@ internal class DataModule {
             .readTimeout(30, TimeUnit.SECONDS)
             .build()
 
-    @OptIn(ExperimentalSerializationApi::class)
     @Singleton
     @Provides
     fun provideRetrofit(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
index 50299e60..2292c3e6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
@@ -22,6 +22,7 @@ data class Exam(
 
     val subject: String,
 
+    @Deprecated("not available anymore")
     val group: String,
 
     val type: String,
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt
index 17a9e5cd..add6439d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/ConferenceMapper.kt
@@ -10,9 +10,9 @@ fun List<SdkConference>.mapToEntities(semester: Semester) = map {
         diaryId = semester.diaryId,
         agenda = it.agenda,
         conferenceId = it.id,
-        date = it.dateZoned.toInstant(),
+        date = it.date.toInstant(),
         presentOnConference = it.presentOnConference,
-        subject = it.subject,
-        title = it.title
+        subject = it.topic,
+        title = it.place,
     )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt
index bdb5efbb..173dfebf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/ExamMapper.kt
@@ -11,7 +11,7 @@ fun List<SdkExam>.mapToEntities(semester: Semester) = map {
         date = it.date,
         entryDate = it.entryDate,
         subject = it.subject,
-        group = it.group,
+        group = "",
         type = it.type,
         description = it.description,
         teacher = it.teacher,
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
index 6fc5dc95..a26d7665 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MessageMapper.kt
@@ -26,7 +26,7 @@ fun List<SdkMessage>.mapToEntities(
         messageId = it.id,
         correspondents = it.correspondents,
         subject = it.subject.trim(),
-        date = it.dateZoned.toInstant(),
+        date = it.date.toInstant(),
         folderId = it.folderId,
         unread = it.unread,
         unreadBy = it.unreadBy,
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
index 1a1c501f..1f4178fa 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/MobileDeviceMapper.kt
@@ -9,7 +9,7 @@ import io.github.wulkanowy.sdk.pojo.Token as SdkToken
 fun List<SdkDevice>.mapToEntities(student: Student) = map {
     MobileDevice(
         userLoginId = student.userLoginId,
-        date = it.createDateZoned.toInstant(),
+        date = it.createDate.toInstant(),
         deviceId = it.id,
         name = it.name
     )
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
index 2dfd7e06..bcf26a5e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
@@ -3,22 +3,24 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.pojos.*
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.mapper.mapSemesters
 import java.time.Instant
-import io.github.wulkanowy.sdk.scrapper.register.RegisterStudent as SdkRegisterStudent
-import io.github.wulkanowy.sdk.scrapper.register.RegisterUser as SdkRegisterUser
+import io.github.wulkanowy.sdk.pojo.RegisterStudent as SdkRegisterStudent
+import io.github.wulkanowy.sdk.pojo.RegisterUser as SdkRegisterUser
 
-fun SdkRegisterUser.mapToPojo(password: String) = RegisterUser(
+fun SdkRegisterUser.mapToPojo(password: String?) = RegisterUser(
     email = email,
     login = login,
     password = password,
-    baseUrl = baseUrl,
+    scrapperBaseUrl = scrapperBaseUrl,
+    loginMode = loginMode,
     loginType = loginType,
     symbols = symbols.map { registerSymbol ->
         RegisterSymbol(
             symbol = registerSymbol.symbol,
             error = registerSymbol.error,
+            hebeBaseUrl = registerSymbol.hebeBaseUrl,
+            keyId = registerSymbol.keyId,
+            privatePem = registerSymbol.privatePem,
             userName = registerSymbol.userName,
             schools = registerSymbol.schools.map {
                 RegisterUnit(
@@ -42,14 +44,13 @@ fun SdkRegisterUser.mapToPojo(password: String) = RegisterUser(
                                 classId = registerSubject.classId,
                                 isParent = registerSubject.isParent,
                                 semesters = registerSubject.semesters
-                                    .mapSemesters()
                                     .mapToEntities(registerSubject.studentId),
                             )
                         },
                 )
             }
         )
-    }
+    },
 )
 
 fun RegisterStudent.mapToStudentWithSemesters(
@@ -68,17 +69,17 @@ fun RegisterStudent.mapToStudentWithSemesters(
         classId = classId,
         studentId = studentId,
         symbol = symbol.symbol,
-        loginType = user.loginType.name,
+        loginType = user.loginType?.name.orEmpty(),
         schoolName = unit.schoolName,
         schoolShortName = unit.schoolShortName,
         schoolSymbol = unit.schoolId,
         studentName = "$studentName $studentSurname",
-        loginMode = Sdk.Mode.SCRAPPER.name,
-        scrapperBaseUrl = user.baseUrl,
-        mobileBaseUrl = "",
-        certificateKey = "",
-        privateKey = "",
-        password = user.password,
+        loginMode = user.loginMode.name,
+        scrapperBaseUrl = user.scrapperBaseUrl.orEmpty(),
+        mobileBaseUrl = symbol.hebeBaseUrl.orEmpty(),
+        certificateKey = symbol.keyId.orEmpty(),
+        privateKey = symbol.privatePem.orEmpty(),
+        password = user.password.orEmpty(),
         isCurrent = false,
         registrationDate = Instant.now(),
     ).apply {
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
deleted file mode 100644
index a2110d7f..00000000
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.github.wulkanowy.data.mappers
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
-import java.time.Instant
-import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
-
-fun List<SdkStudent>.mapToEntities(password: String = "", colors: List<Long>) = map {
-    StudentWithSemesters(
-        student = Student(
-            email = it.email,
-            password = password,
-            isParent = it.isParent,
-            symbol = it.symbol,
-            studentId = it.studentId,
-            userLoginId = it.userLoginId,
-            userName = it.userName,
-            studentName = it.studentName + " " + it.studentSurname,
-            schoolSymbol = it.schoolSymbol,
-            schoolShortName = it.schoolShortName,
-            schoolName = it.schoolName,
-            className = it.className,
-            classId = it.classId,
-            scrapperBaseUrl = it.scrapperBaseUrl,
-            loginType = it.loginType.name,
-            isCurrent = false,
-            registrationDate = Instant.now(),
-            mobileBaseUrl = it.mobileBaseUrl,
-            privateKey = it.privateKey,
-            certificateKey = it.certificateKey,
-            loginMode = it.loginMode.name,
-        ).apply {
-            avatarColor = colors.random()
-        },
-        semesters = it.semesters.mapToEntities(it.studentId)
-    )
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt
index e55aa3cf..ee525e10 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/TimetableMapper.kt
@@ -5,10 +5,10 @@ import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
 import io.github.wulkanowy.data.db.entities.TimetableHeader
 import io.github.wulkanowy.data.pojos.TimetableFull
-import io.github.wulkanowy.sdk.pojo.TimetableFull as SdkTimetableFull
+import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetableFull
 import io.github.wulkanowy.sdk.pojo.TimetableDayHeader as SdkTimetableHeader
-import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
-import io.github.wulkanowy.sdk.pojo.TimetableAdditional as SdkTimetableAdditional
+import io.github.wulkanowy.sdk.pojo.Lesson as SdkLesson
+import io.github.wulkanowy.sdk.pojo.LessonAdditional as SdkTimetableAdditional
 
 fun SdkTimetableFull.mapToEntities(semester: Semester) = TimetableFull(
     lessons = lessons.mapToEntities(semester),
@@ -16,13 +16,13 @@ fun SdkTimetableFull.mapToEntities(semester: Semester) = TimetableFull(
     headers = headers.mapToEntities(semester)
 )
 
-fun List<SdkTimetable>.mapToEntities(semester: Semester) = map {
+fun List<SdkLesson>.mapToEntities(semester: Semester) = map {
     Timetable(
         studentId = semester.studentId,
         diaryId = semester.diaryId,
         number = it.number,
-        start = it.startZoned.toInstant(),
-        end = it.endZoned.toInstant(),
+        start = it.start.toInstant(),
+        end = it.end.toInstant(),
         date = it.date,
         subject = it.subject,
         subjectOld = it.subjectOld,
@@ -45,8 +45,8 @@ fun List<SdkTimetableAdditional>.mapToEntities(semester: Semester) = map {
         diaryId = semester.diaryId,
         subject = it.subject,
         date = it.date,
-        start = it.startZoned.toInstant(),
-        end = it.endZoned.toInstant(),
+        start = it.start.toInstant(),
+        end = it.end.toInstant(),
     )
 }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
index 4aea3377..98bf1402 100644
--- a/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/RegisterUser.kt
@@ -1,20 +1,25 @@
 package io.github.wulkanowy.data.pojos
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.scrapper.Scrapper
 
 data class RegisterUser(
     val email: String,
-    val password: String,
+    val password: String?,
     val login: String, // may be the same as email
-    val baseUrl: String,
-    val loginType: Scrapper.LoginType,
+    val scrapperBaseUrl: String?,
+    val loginType: Scrapper.LoginType?,
+    val loginMode: Sdk.Mode,
     val symbols: List<RegisterSymbol>,
 ) : java.io.Serializable
 
 data class RegisterSymbol(
     val symbol: String,
     val error: Throwable?,
+    val hebeBaseUrl: String?,
+    val keyId: String?,
+    val privatePem: String?,
     val userName: String,
     val schools: List<RegisterUnit>,
 ) : java.io.Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
index cbaa12bd..bec2797d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AppCreatorRepository.kt
@@ -19,7 +19,6 @@ class AppCreatorRepository @Inject constructor(
 ) {
 
     @OptIn(ExperimentalSerializationApi::class)
-    @Suppress("BlockingMethodInNonBlockingContext")
     suspend fun getAppCreators() = withContext(dispatchers.io) {
         val inputStream = context.assets.open("contributors.json").buffered()
         json.decodeFromStream<List<Contributor>>(inputStream)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
index fd5d8bd1..3afb9907 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceRepository.kt
@@ -59,7 +59,7 @@ class AttendanceRepository @Inject constructor(
             }
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
-                .getAttendance(start.monday, end.sunday, semester.semesterId)
+                .getAttendance(start.monday, end.sunday)
                 .mapToEntities(semester, lessons)
         },
         saveFetchResult = { old, new ->
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
index faa80b93..013c0951 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt
@@ -52,7 +52,7 @@ class ExamRepository @Inject constructor(
         fetch = {
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
-                .getExams(start.startExamsDay, start.endExamsDay, semester.semesterId)
+                .getExams(start.startExamsDay, start.endExamsDay)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
index e5d7bc5c..4101803f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt
@@ -42,7 +42,7 @@ class NoteRepository @Inject constructor(
         fetch = {
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
-                .getNotes(semester.semesterId)
+                .getNotes()
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
index 96f01922..92bb3708 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
@@ -40,7 +40,7 @@ class SemesterRepository @Inject constructor(
         val isNoSemesters = semesters.isEmpty()
 
         val isRefreshOnModeChangeRequired = when {
-            Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API -> {
+            Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE -> {
                 semesters.firstOrNull { it.isCurrent }?.let {
                     0 == it.diaryId && 0 == it.kindergartenDiaryId
                 } == true
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
index b1d1ba83..4c7069ef 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@@ -10,11 +10,9 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.data.mappers.mapToEntities
 import io.github.wulkanowy.data.mappers.mapToPojo
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
@@ -29,37 +27,35 @@ class StudentRepository @Inject constructor(
     private val studentDb: StudentDao,
     private val semesterDb: SemesterDao,
     private val sdk: Sdk,
-    private val appInfo: AppInfo,
     private val appDatabase: AppDatabase
 ) {
 
-    suspend fun isStudentSaved() = getSavedStudents(false).isNotEmpty()
-
     suspend fun isCurrentStudentSet() = studentDb.loadCurrent()?.isCurrent ?: false
 
     suspend fun getStudentsApi(
         pin: String,
         symbol: String,
         token: String
-    ): List<StudentWithSemesters> =
-        sdk.getStudentsFromMobileApi(token, pin, symbol, "")
-            .mapToEntities(colors = appInfo.defaultColorsForAvatar)
+    ): RegisterUser = sdk
+        .getStudentsFromHebe(token, pin, symbol, "")
+        .mapToPojo(null)
 
     suspend fun getStudentsScrapper(
         email: String,
         password: String,
         scrapperBaseUrl: String,
         symbol: String
-    ): List<StudentWithSemesters> =
-        sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol)
-            .mapToEntities(password, appInfo.defaultColorsForAvatar)
+    ): RegisterUser = sdk
+        .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, symbol)
+        .mapToPojo(password)
 
     suspend fun getUserSubjectsFromScrapper(
         email: String,
         password: String,
         scrapperBaseUrl: String,
         symbol: String
-    ): RegisterUser = sdk.getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, symbol)
+    ): RegisterUser = sdk
+        .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, symbol)
         .mapToPojo(password)
 
     suspend fun getStudentsHybrid(
@@ -67,15 +63,15 @@ class StudentRepository @Inject constructor(
         password: String,
         scrapperBaseUrl: String,
         symbol: String
-    ): List<StudentWithSemesters> =
-        sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
-            .mapToEntities(password, appInfo.defaultColorsForAvatar)
+    ): RegisterUser = sdk
+        .getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
+        .mapToPojo(password)
 
     suspend fun getSavedStudents(decryptPass: Boolean = true) =
         studentDb.loadStudentsWithSemesters()
             .map {
                 it.apply {
-                    if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+                    if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                         student.password = withContext(dispatchers.io) {
                             decrypt(student.password)
                         }
@@ -85,7 +81,7 @@ class StudentRepository @Inject constructor(
 
     suspend fun getSavedStudentById(id: Long, decryptPass: Boolean = true) =
         studentDb.loadStudentWithSemestersById(id)?.apply {
-            if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+            if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
                 student.password = withContext(dispatchers.io) {
                     decrypt(student.password)
                 }
@@ -95,7 +91,7 @@ class StudentRepository @Inject constructor(
     suspend fun getStudentById(id: Long, decryptPass: Boolean = true): Student {
         val student = studentDb.loadById(id) ?: throw NoCurrentStudentException()
 
-        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
             student.password = withContext(dispatchers.io) {
                 decrypt(student.password)
             }
@@ -106,7 +102,7 @@ class StudentRepository @Inject constructor(
     suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
         val student = studentDb.loadCurrent() ?: throw NoCurrentStudentException()
 
-        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+        if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE) {
             student.password = withContext(dispatchers.io) {
                 decrypt(student.password)
             }
@@ -119,7 +115,7 @@ class StudentRepository @Inject constructor(
         val students = studentsWithSemesters.map { it.student }
             .map {
                 it.apply {
-                    if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) {
+                    if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.HEBE) {
                         password = withContext(dispatchers.io) {
                             encrypt(password, context)
                         }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
index acd71e1f..4e3b40f9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/TeacherRepository.kt
@@ -40,7 +40,7 @@ class TeacherRepository @Inject constructor(
         fetch = {
             sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
-                .getTeachers(semester.semesterId)
+                .getTeachers()
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
index 26e1f3ff..136fb8d5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/TimetableRepository.kt
@@ -66,7 +66,7 @@ class TimetableRepository @Inject constructor(
         fetch = {
             val timetableFull = sdk.init(student)
                 .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
-                .getTimetableFull(start.monday, end.sunday)
+                .getTimetable(start.monday, end.sunday)
 
             timetableFull.mapToEntities(semester)
         },
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index 37ab71dc..4f709438 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -4,13 +4,15 @@ import android.content.Context
 import android.database.sqlite.SQLiteConstraintException
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.sdk.mobile.exception.InvalidPinException
-import io.github.wulkanowy.sdk.mobile.exception.InvalidSymbolException
-import io.github.wulkanowy.sdk.mobile.exception.InvalidTokenException
-import io.github.wulkanowy.sdk.mobile.exception.TokenDeadException
+import io.github.wulkanowy.sdk.hebe.exception.InvalidPinException
+import io.github.wulkanowy.sdk.hebe.exception.InvalidTokenException
+import io.github.wulkanowy.sdk.hebe.exception.TokenDeadException
+import io.github.wulkanowy.sdk.hebe.exception.UnknownTokenException
 import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
+import io.github.wulkanowy.sdk.hebe.exception.InvalidSymbolException as InvalidHebeSymbolException
+import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException as InvalidScrapperSymbolException
 
 class LoginErrorHandler @Inject constructor(
     @ApplicationContext context: Context,
@@ -32,9 +34,11 @@ class LoginErrorHandler @Inject constructor(
             is BadCredentialsException -> onBadCredentials(error.message)
             is SQLiteConstraintException -> onStudentDuplicate(resources.getString(R.string.login_duplicate_student))
             is TokenDeadException -> onInvalidToken(resources.getString(R.string.login_expired_token))
+            is UnknownTokenException,
             is InvalidTokenException -> onInvalidToken(resources.getString(R.string.login_invalid_token))
             is InvalidPinException -> onInvalidPin(resources.getString(R.string.login_invalid_pin))
-            is InvalidSymbolException -> onInvalidSymbol(resources.getString(R.string.login_invalid_symbol))
+            is InvalidScrapperSymbolException,
+            is InvalidHebeSymbolException -> onInvalidSymbol(resources.getString(R.string.login_invalid_symbol))
             else -> super.proceed(error)
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index 8c90623e..ead2d71a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -34,9 +34,9 @@ class LoginAdvancedFragment :
 
     override val formLoginType: String
         get() = when (binding.loginTypeSwitch.checkedRadioButtonId) {
-            R.id.loginTypeApi -> "API"
-            R.id.loginTypeScrapper -> "SCRAPPER"
-            else -> "HYBRID"
+            R.id.loginTypeApi -> Sdk.Mode.HEBE.name
+            R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER.name
+            else -> Sdk.Mode.HYBRID.name
         }
 
     override val formUsernameValue: String
@@ -99,7 +99,7 @@ class LoginAdvancedFragment :
             loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
                 presenter.onLoginModeSelected(
                     when (checkedId) {
-                        R.id.loginTypeApi -> Sdk.Mode.API
+                        R.id.loginTypeApi -> Sdk.Mode.HEBE
                         R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
                         else -> Sdk.Mode.HYBRID
                     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index 33a76e5f..ab56bd78 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -1,17 +1,12 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
 import io.github.wulkanowy.data.Resource
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.logResourceStatus
 import io.github.wulkanowy.data.onResourceNotLoading
-import io.github.wulkanowy.data.pojos.RegisterStudent
-import io.github.wulkanowy.data.pojos.RegisterSymbol
-import io.github.wulkanowy.data.pojos.RegisterUnit
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.scrapper.Scrapper
 import io.github.wulkanowy.sdk.scrapper.getNormalizedSymbol
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
@@ -97,14 +92,16 @@ class LoginAdvancedPresenter @Inject constructor(
     fun onLoginModeSelected(type: Sdk.Mode) {
         view?.run {
             when (type) {
-                Sdk.Mode.API -> {
+                Sdk.Mode.HEBE -> {
                     showOnlyMobileApiModeInputs()
                     showMobileApiWarningMessage()
                 }
+
                 Sdk.Mode.SCRAPPER -> {
                     showOnlyScrapperModeInputs()
                     showScraperWarningMessage()
                 }
+
                 Sdk.Mode.HYBRID -> {
                     showOnlyHybridModeInputs()
                     showHybridWarningMessage()
@@ -145,11 +142,12 @@ class LoginAdvancedPresenter @Inject constructor(
                         showProgress(true)
                         showContent(false)
                     }
+
                     is Resource.Success -> {
                         analytics.logEvent(
                             "registration_form",
                             "success" to true,
-                            "students" to it.data.size,
+                            "scrapperBaseUrl" to view?.formHostValue.orEmpty(),
                             "error" to "No error"
                         )
                         val loginData = LoginData(
@@ -158,14 +156,15 @@ class LoginAdvancedPresenter @Inject constructor(
                             baseUrl = view?.formHostValue.orEmpty().trim(),
                             symbol = view?.formSymbolValue.orEmpty().trim().getNormalizedSymbol(),
                         )
-                        when (it.data.size) {
+                        when (it.data.symbols.size) {
                             0 -> view?.navigateToSymbol(loginData)
                             else -> view?.navigateToStudentSelect(
                                 loginData = loginData,
-                                registerUser = it.data.toRegisterUser(loginData),
+                                registerUser = it.data,
                             )
                         }
                     }
+
                     is Resource.Error -> {
                         analytics.logEvent(
                             "registration_form",
@@ -183,59 +182,7 @@ class LoginAdvancedPresenter @Inject constructor(
             }.launch("login")
     }
 
-    private fun List<StudentWithSemesters>.toRegisterUser(loginData: LoginData) = RegisterUser(
-        email = loginData.login,
-        password = loginData.password,
-        login = loginData.login,
-        baseUrl = loginData.baseUrl,
-        loginType = firstOrNull()?.student?.loginType?.let(
-            Scrapper.LoginType::valueOf
-        ) ?: Scrapper.LoginType.AUTO,
-        symbols = this
-            .groupBy { students -> students.student.symbol }
-            .map { (symbol, students) ->
-                RegisterSymbol(
-                    symbol = symbol,
-                    error = null,
-                    userName = "",
-                    schools = students
-                        .groupBy { student ->
-                            Triple(
-                                first = student.student.schoolSymbol,
-                                second = student.student.userLoginId,
-                                third = student.student.schoolShortName
-                            )
-                        }
-                        .map { (groupKey, students) ->
-                            val (schoolId, loginId, schoolName) = groupKey
-                            RegisterUnit(
-                                students = students.map {
-                                    RegisterStudent(
-                                        studentId = it.student.studentId,
-                                        studentName = it.student.studentName,
-                                        studentSecondName = it.student.studentName,
-                                        studentSurname = it.student.studentName,
-                                        className = it.student.className,
-                                        classId = it.student.classId,
-                                        isParent = it.student.isParent,
-                                        semesters = it.semesters,
-                                    )
-                                },
-                                userLoginId = loginId,
-                                schoolId = schoolId,
-                                schoolName = schoolName,
-                                schoolShortName = schoolName,
-                                parentIds = listOf(),
-                                studentIds = listOf(),
-                                employeeIds = listOf(),
-                                error = null
-                            )
-                        }
-                )
-            },
-    )
-
-    private suspend fun getStudentsAppropriatesToLoginType(): List<StudentWithSemesters> {
+    private suspend fun getStudentsAppropriatesToLoginType(): RegisterUser {
         val email = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
         val endpoint = view?.formHostValue.orEmpty()
@@ -245,10 +192,11 @@ class LoginAdvancedPresenter @Inject constructor(
         val token = view?.formTokenValue.orEmpty()
 
         return when (Sdk.Mode.valueOf(view?.formLoginType.orEmpty())) {
-            Sdk.Mode.API -> studentRepository.getStudentsApi(pin, symbol, token)
+            Sdk.Mode.HEBE -> studentRepository.getStudentsApi(pin, symbol, token)
             Sdk.Mode.SCRAPPER -> studentRepository.getStudentsScrapper(
                 email, password, endpoint, symbol
             )
+
             Sdk.Mode.HYBRID -> studentRepository.getStudentsHybrid(
                 email, password, endpoint, symbol
             )
@@ -267,8 +215,8 @@ class LoginAdvancedPresenter @Inject constructor(
 
         var isCorrect = true
 
-        when (Sdk.Mode.valueOf(view?.formLoginType ?: "")) {
-            Sdk.Mode.API -> {
+        when (Sdk.Mode.valueOf(view?.formLoginType.orEmpty())) {
+            Sdk.Mode.HEBE -> {
                 if (pin.isEmpty()) {
                     view?.setErrorPinRequired()
                     isCorrect = false
@@ -284,17 +232,17 @@ class LoginAdvancedPresenter @Inject constructor(
                     isCorrect = false
                 }
             }
+
             Sdk.Mode.HYBRID, Sdk.Mode.SCRAPPER -> {
                 if (login.isEmpty()) {
                     view?.setErrorUsernameRequired()
                     isCorrect = false
                 } else {
-                    if ("@" in login && "standard" !in host) {
+                    if ("@" in login && "login" in host) {
                         view?.setErrorLoginRequired()
                         isCorrect = false
                     }
-
-                    if ("@" !in login && "standard" in host) {
+                    if ("@" !in login && "email" in host) {
                         view?.setErrorEmailRequired()
                         isCorrect = false
                     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index 824fa028..34062d93 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index bbc38219..43ba3fe1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -204,6 +204,10 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun showOtherOptionsButton(show: Boolean) {
+        binding.loginFormAdvancedButton.isVisible = show
+    }
+
     @SuppressLint("SetTextI18n")
     override fun showVersion() {
         binding.loginFormVersion.text = "v${appInfo.versionName}"
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 8035ea0a..ed70eb12 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -7,6 +7,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.ifNullOrBlank
 import timber.log.Timber
 import java.net.URL
@@ -15,6 +16,7 @@ import javax.inject.Inject
 class LoginFormPresenter @Inject constructor(
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
+    private val appInfo: AppInfo,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository) {
 
@@ -25,6 +27,7 @@ class LoginFormPresenter @Inject constructor(
         view.run {
             initView()
             showContact(false)
+            showOtherOptionsButton(appInfo.isDebug)
             showVersion()
 
             loginErrorHandler.onBadCredentials = {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 5a816fb3..e5c680d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -56,6 +56,8 @@ interface LoginFormView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun showOtherOptionsButton(show: Boolean)
+
     fun showVersion()
 
     fun navigateToSymbol(loginData: LoginData)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index 16970215..c33d12fa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -55,7 +55,6 @@ class LoginStudentSelectFragment :
             }
     }
 
-    @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentLoginStudentSelectBinding.bind(view)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
index 63a30db8..481cad11 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -12,18 +12,17 @@ fun Sdk.init(student: Student): Sdk {
     studentId = student.studentId
     classId = student.classId
 
-    if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+    if (Sdk.Mode.valueOf(student.loginMode) == Sdk.Mode.HEBE) {
+        mobileBaseUrl = student.mobileBaseUrl
+    } else {
         scrapperBaseUrl = student.scrapperBaseUrl
         loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
     }
-    loginId = student.userLoginId
 
     mode = Sdk.Mode.valueOf(student.loginMode)
     mobileBaseUrl = student.mobileBaseUrl
-    certKey = student.certificateKey
-    privateKey = student.privateKey
-
-    emptyCookieJarInterceptor = true
+    keyId = student.certificateKey
+    privatePem = student.privateKey
 
     Timber.d("Sdk in ${student.loginMode} mode reinitialized")
 
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index fac3960e..3bfe0c34 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -247,7 +247,6 @@
                 android:layout_marginEnd="16dp"
                 android:text="@string/login_advanced"
                 android:textAppearance="?android:textAppearance"
-                android:visibility="gone"
                 app:backgroundTint="?android:windowBackground"
                 app:fontFamily="sans-serif-medium"
                 app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
index 84a0cb40..c8d95829 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -48,7 +48,7 @@ fun getSemesterPojo(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalD
     end = end,
 )
 
-fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API) = Student(
+fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.HEBE) = Student(
     scrapperBaseUrl = "http://fakelog.cf",
     email = "jan@fakelog.cf",
     certificateKey = "",
diff --git a/app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt b/app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt
index a35e5d30..ac73becd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/mappers/AttendanceMapperKtTest.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.pojo.Attendance
-import io.github.wulkanowy.sdk.scrapper.attendance.SentExcuse
+import io.github.wulkanowy.sdk.scrapper.attendance.SentExcuseStatus
 import org.junit.Test
 import java.time.Instant
 import java.time.LocalDate
@@ -98,7 +98,7 @@ class AttendanceMapperTest {
         timeId = 1,
         categoryId = 1,
         deleted = false,
-        excuseStatus = SentExcuse.Status.WAITING,
+        excuseStatus = SentExcuseStatus.WAITING,
         excusable = false,
         absence = false,
         excused = false,
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
index 896491ef..d0e500f1 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/AttendanceRepositoryTest.kt
@@ -63,7 +63,7 @@ class AttendanceRepositoryTest {
     @Test
     fun `force refresh without difference`() {
         // prepare
-        coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList
+        coEvery { sdk.getAttendance(startDate, endDate) } returns remoteList
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester, emptyList())),
             flowOf(remoteList.mapToEntities(semester, emptyList()))
@@ -77,7 +77,7 @@ class AttendanceRepositoryTest {
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull?.size)
-        coVerify { sdk.getAttendance(startDate, endDate, 1) }
+        coVerify { sdk.getAttendance(startDate, endDate) }
         coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
         coVerify { attendanceDb.insertAll(match { it.isEmpty() }) }
         coVerify { attendanceDb.deleteAll(match { it.isEmpty() }) }
@@ -86,7 +86,7 @@ class AttendanceRepositoryTest {
     @Test
     fun `force refresh with more items in remote`() {
         // prepare
-        coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList
+        coEvery { sdk.getAttendance(startDate, endDate) } returns remoteList
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList())),
             flowOf(remoteList.dropLast(1).mapToEntities(semester, emptyList())), // after fetch end before save result
@@ -101,7 +101,7 @@ class AttendanceRepositoryTest {
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull?.size)
-        coVerify { sdk.getAttendance(startDate, endDate, 1) }
+        coVerify { sdk.getAttendance(startDate, endDate) }
         coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
         coVerify {
             attendanceDb.insertAll(match {
@@ -114,7 +114,7 @@ class AttendanceRepositoryTest {
     @Test
     fun `force refresh with more items in local`() {
         // prepare
-        coEvery { sdk.getAttendance(startDate, endDate, 1) } returns remoteList.dropLast(1)
+        coEvery { sdk.getAttendance(startDate, endDate) } returns remoteList.dropLast(1)
         coEvery { attendanceDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester, emptyList())),
             flowOf(remoteList.mapToEntities(semester, emptyList())), // after fetch end before save result
@@ -129,7 +129,7 @@ class AttendanceRepositoryTest {
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(1, res.dataOrNull?.size)
-        coVerify { sdk.getAttendance(startDate, endDate, 1) }
+        coVerify { sdk.getAttendance(startDate, endDate) }
         coVerify { attendanceDb.loadAll(1, 1, startDate, endDate) }
         coVerify { attendanceDb.insertAll(match { it.isEmpty() }) }
         coVerify {
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
index e3790662..fb037a87 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/ExamRemoteTest.kt
@@ -59,7 +59,7 @@ class ExamRemoteTest {
     @Test
     fun `force refresh without difference`() {
         // prepare
-        coEvery { sdk.getExams(startDate, realEndDate, 1) } returns remoteList
+        coEvery { sdk.getExams(startDate, realEndDate) } returns remoteList
         coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester)),
             flowOf(remoteList.mapToEntities(semester))
@@ -73,7 +73,7 @@ class ExamRemoteTest {
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull?.size)
-        coVerify { sdk.getExams(startDate, realEndDate, 1) }
+        coVerify { sdk.getExams(startDate, realEndDate) }
         coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
         coVerify { examDb.insertAll(match { it.isEmpty() }) }
         coVerify { examDb.deleteAll(match { it.isEmpty() }) }
@@ -82,7 +82,7 @@ class ExamRemoteTest {
     @Test
     fun `force refresh with more items in remote`() {
         // prepare
-        coEvery { sdk.getExams(startDate, realEndDate, 1) } returns remoteList
+        coEvery { sdk.getExams(startDate, realEndDate) } returns remoteList
         coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
             flowOf(remoteList.dropLast(1).mapToEntities(semester)),
             flowOf(remoteList.dropLast(1).mapToEntities(semester)), // after fetch end before save result
@@ -97,7 +97,7 @@ class ExamRemoteTest {
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull?.size)
-        coVerify { sdk.getExams(startDate, realEndDate, 1) }
+        coVerify { sdk.getExams(startDate, realEndDate) }
         coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
         coVerify {
             examDb.insertAll(match {
@@ -110,7 +110,7 @@ class ExamRemoteTest {
     @Test
     fun `force refresh with more items in local`() {
         // prepare
-        coEvery { sdk.getExams(startDate, realEndDate, 1) } returns remoteList.dropLast(1)
+        coEvery { sdk.getExams(startDate, realEndDate) } returns remoteList.dropLast(1)
         coEvery { examDb.loadAll(1, 1, startDate, realEndDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester)),
             flowOf(remoteList.mapToEntities(semester)), // after fetch end before save result
@@ -125,7 +125,7 @@ class ExamRemoteTest {
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(1, res.dataOrNull?.size)
-        coVerify { sdk.getExams(startDate, realEndDate, 1) }
+        coVerify { sdk.getExams(startDate, realEndDate) }
         coVerify { examDb.loadAll(1, 1, startDate, realEndDate) }
         coVerify { examDb.insertAll(match { it.isEmpty() }) }
         coVerify {
@@ -137,7 +137,6 @@ class ExamRemoteTest {
 
     private fun getExam(date: LocalDate) = SdkExam(
         subject = "",
-        group = "",
         type = "",
         description = "",
         teacher = "",
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
index e8d0b6c8..1d6dfaff 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
@@ -9,13 +9,21 @@ import io.github.wulkanowy.data.toFirstResult
 import io.github.wulkanowy.getSemesterEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.sdk.pojo.Grades
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
+import io.mockk.just
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import java.time.LocalDate
@@ -72,7 +80,7 @@ class GradeRepositoryTest {
             createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
             createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
         )
-        coEvery { sdk.getGrades(1) } returns (remoteList to emptyList())
+        coEvery { sdk.getGrades(1) } returns createGrades(remoteList)
 
         coEvery { gradeDb.loadAll(1, 1) } returnsMany listOf(
             flowOf(listOf()), // empty because it is new user
@@ -122,7 +130,7 @@ class GradeRepositoryTest {
             ),
             createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
         )
-        coEvery { sdk.getGrades(1) } returns (remoteList to emptyList())
+        coEvery { sdk.getGrades(1) } returns createGrades(remoteList)
 
         val localList = listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
@@ -169,7 +177,7 @@ class GradeRepositoryTest {
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         )
-        coEvery { sdk.getGrades(1) } returns (remoteList to emptyList())
+        coEvery { sdk.getGrades(1) } returns createGrades(remoteList)
 
         val localList = listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
@@ -200,7 +208,7 @@ class GradeRepositoryTest {
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"), // will be added...
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         )
-        coEvery { sdk.getGrades(1) } returns (remoteList to emptyList())
+        coEvery { sdk.getGrades(1) } returns createGrades(remoteList)
 
         val localList = listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
@@ -230,7 +238,7 @@ class GradeRepositoryTest {
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
         )
-        coEvery { sdk.getGrades(1) } returns (remoteList to emptyList())
+        coEvery { sdk.getGrades(1) } returns createGrades(remoteList)
 
         coEvery { gradeDb.loadAll(1, 1) } returnsMany listOf(
             flowOf(listOf()),
@@ -250,7 +258,7 @@ class GradeRepositoryTest {
     fun `force refresh when remote is empty`() {
         // prepare
         val remoteList = emptyList<SdkGrade>()
-        coEvery { sdk.getGrades(semester.semesterId) } returns (remoteList to emptyList())
+        coEvery { sdk.getGrades(semester.semesterId) } returns createGrades(remoteList)
 
         val localList = listOf(
             createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
@@ -284,4 +292,13 @@ class GradeRepositoryTest {
             weight = weight.toString(),
             weightValue = weight
         )
+
+    private fun createGrades(grades: List<SdkGrade>): Grades = Grades(
+        details = grades,
+        summary = listOf(),
+        isAverage = false,
+        isPoints = false,
+        isForAdults = false,
+        type = 0,
+    )
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
index 9a2c22fd..3a18ee97 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt
@@ -224,7 +224,7 @@ class MessageRepositoryTest {
         recipients = listOf(),
         subject = "",
         content = "Test",
-        dateZoned = Instant.EPOCH.atZone(ZoneOffset.UTC),
+        date = Instant.EPOCH.atZone(ZoneOffset.UTC),
         folderId = 1,
         unread = true,
         readBy = 1,
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
index 6865aa7d..1a3f9679 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MobileDeviceRepositoryTest.kt
@@ -10,16 +10,21 @@ import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Device
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
+import io.mockk.just
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDateTime.of
-import java.time.ZoneId
+import java.time.ZoneOffset
+import java.time.ZonedDateTime.of
 
 class MobileDeviceRepositoryTest {
 
@@ -134,9 +139,7 @@ class MobileDeviceRepositoryTest {
         id = 0,
         name = "",
         deviceId = "",
-        createDate = of(2019, 5, day, 0, 0, 0),
-        modificationDate = of(2019, 5, day, 0, 0, 0),
-        createDateZoned = of(2019, 5, day, 0, 0, 0).atZone(ZoneId.systemDefault()),
-        modificationDateZoned = of(2019, 5, day, 0, 0, 0).atZone(ZoneId.systemDefault())
+        createDate = of(2019, 5, day, 0, 0, 0, 0, ZoneOffset.UTC),
+        modificationDate = of(2019, 5, day, 0, 0, 0, 0, ZoneOffset.UTC),
     )
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
index 0ed00885..d8256869 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
@@ -75,7 +75,7 @@ class SemesterRepositoryTest {
         coEvery { semesterDb.deleteAll(any()) } just Runs
         coEvery { semesterDb.insertSemesters(any()) } returns listOf()
 
-        val items = runBlocking { semesterRepository.getSemesters(student.copy(loginMode = Sdk.Mode.API.name)) }
+        val items = runBlocking { semesterRepository.getSemesters(student.copy(loginMode = Sdk.Mode.HEBE.name)) }
         assertEquals(2, items.size)
         assertEquals(0, items[0].diaryId)
     }
@@ -215,6 +215,7 @@ class SemesterRepositoryTest {
     @Test(expected = RuntimeException::class)
     fun getCurrentSemester_emptyList() {
         coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns emptyList()
+        coEvery { sdk.getSemesters() } returns emptyList()
 
         runBlocking { semesterRepository.getCurrentSemester(student) }
     }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt
deleted file mode 100644
index 9d3d7a2e..00000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import io.github.wulkanowy.TestDispatchersProvider
-import io.github.wulkanowy.data.db.dao.SemesterDao
-import io.github.wulkanowy.data.db.dao.StudentDao
-import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.Student
-import io.github.wulkanowy.utils.AppInfo
-import io.mockk.MockKAnnotations
-import io.mockk.coEvery
-import io.mockk.impl.annotations.MockK
-import io.mockk.mockk
-import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-
-class StudentTest {
-
-    @MockK
-    private lateinit var mockSdk: Sdk
-
-    @MockK
-    private lateinit var studentDb: StudentDao
-
-    @MockK
-    private lateinit var semesterDb: SemesterDao
-
-    private lateinit var studentRepository: StudentRepository
-
-    @Before
-    fun initApi() {
-        MockKAnnotations.init(this)
-        studentRepository = StudentRepository(
-            context = mockk(),
-            dispatchers = TestDispatchersProvider(),
-            studentDb = studentDb,
-            semesterDb = semesterDb,
-            sdk = mockSdk,
-            appInfo = AppInfo(),
-            appDatabase = mockk()
-        )
-    }
-
-    @Test
-    fun testRemoteAll() {
-        coEvery { mockSdk.getStudentsFromScrapper(any(), any(), any(), any()) } returns listOf(
-            getStudent("test")
-        )
-
-        val students = runBlocking { studentRepository.getStudentsScrapper("", "", "http://fakelog.cf", "") }
-        assertEquals(1, students.size)
-        assertEquals("test Kowalski", students.first().student.studentName)
-    }
-
-    private fun getStudent(name: String): Student {
-        return Student(
-            email = "",
-            symbol = "",
-            studentId = 0,
-            userLoginId = 0,
-            userLogin = "",
-            userName = "",
-            studentName = name,
-            studentSurname = "Kowalski",
-            schoolSymbol = "",
-            schoolShortName = "",
-            schoolName = "",
-            className = "",
-            classId = 0,
-            certificateKey = "",
-            privateKey = "",
-            loginMode = Sdk.Mode.SCRAPPER,
-            mobileBaseUrl = "",
-            loginType = Sdk.ScrapperLoginType.STANDARD,
-            scrapperBaseUrl = "",
-            isParent = false,
-            semesters = emptyList()
-        )
-    }
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
index e56aaa5d..92ad01b1 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/TimetableRepositoryTest.kt
@@ -10,12 +10,17 @@ import io.github.wulkanowy.data.toFirstResult
 import io.github.wulkanowy.getSemesterEntity
 import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
-import io.github.wulkanowy.sdk.pojo.TimetableFull
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.utils.AutoRefreshHelper
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
+import io.mockk.just
+import io.mockk.mockk
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
@@ -25,7 +30,7 @@ import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.LocalDateTime.of
 import java.time.ZoneId
-import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
+import io.github.wulkanowy.sdk.pojo.Lesson as SdkLesson
 
 class TimetableRepositoryTest {
 
@@ -62,18 +67,43 @@ class TimetableRepositoryTest {
         MockKAnnotations.init(this)
         every { refreshHelper.shouldBeRefreshed(any()) } returns false
 
-        timetableRepository = TimetableRepository(timetableDb, timetableAdditionalDao, timetableHeaderDao, sdk, timetableNotificationSchedulerHelper, refreshHelper)
+        timetableRepository = TimetableRepository(
+            timetableDb,
+            timetableAdditionalDao,
+            timetableHeaderDao,
+            sdk,
+            timetableNotificationSchedulerHelper,
+            refreshHelper
+        )
     }
 
     @Test
     fun `force refresh without difference`() {
         val remoteList = listOf(
-            createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "123", "Język polski", "Jan Kowalski", false),
-            createTimetableRemote(of(2021, 1, 4, 8, 50), 2, "124", "Język niemiecki", "Joanna Czarniecka", true)
+            createTimetableRemote(
+                start = of(2021, 1, 4, 8, 0),
+                number = 1,
+                room = "123",
+                subject = "Język polski",
+                teacher = "Jan Kowalski",
+                changes = false
+            ),
+            createTimetableRemote(
+                start = of(2021, 1, 4, 8, 50),
+                number = 2,
+                room = "124",
+                subject = "Język niemiecki",
+                teacher = "Joanna Czarniecka",
+                changes = true
+            )
         )
 
         // prepare
-        coEvery { sdk.getTimetableFull(startDate, endDate) } returns TimetableFull(emptyList(), remoteList, emptyList())
+        coEvery { sdk.getTimetable(startDate, endDate) } returns mockk {
+            every { headers } returns emptyList()
+            every { lessons } returns remoteList
+            every { additional } returns emptyList()
+        }
         coEvery { timetableDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester)),
             flowOf(remoteList.mapToEntities(semester))
@@ -81,7 +111,14 @@ class TimetableRepositoryTest {
         coEvery { timetableDb.insertAll(any()) } returns listOf(1, 2, 3)
         coEvery { timetableDb.deleteAll(any()) } just Runs
 
-        coEvery { timetableAdditionalDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
+        coEvery {
+            timetableAdditionalDao.loadAll(
+                diaryId = 1,
+                studentId = 1,
+                from = startDate,
+                end = endDate
+            )
+        } returns flowOf(listOf())
         coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
         coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
 
@@ -90,23 +127,36 @@ class TimetableRepositoryTest {
         coEvery { timetableHeaderDao.deleteAll(emptyList()) } just Runs
 
         // execute
-        val res = runBlocking { timetableRepository.getTimetable(student, semester, startDate, endDate, true).toFirstResult() }
+        val res = runBlocking {
+            timetableRepository.getTimetable(
+                student = student,
+                semester = semester,
+                start = startDate,
+                end = endDate,
+                forceRefresh = true
+            ).toFirstResult()
+        }
 
         // verify
         assertEquals(null, res.errorOrNull)
         assertEquals(2, res.dataOrNull!!.lessons.size)
-        coVerify { sdk.getTimetableFull(startDate, endDate) }
+        coVerify { sdk.getTimetable(startDate, endDate) }
         coVerify { timetableDb.loadAll(1, 1, startDate, endDate) }
         coVerify { timetableDb.insertAll(match { it.isEmpty() }) }
         coVerify { timetableDb.deleteAll(match { it.isEmpty() }) }
     }
 
-    private fun createTimetableRemote(start: LocalDateTime, number: Int = 1, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false) = SdkTimetable(
+    private fun createTimetableRemote(
+        start: LocalDateTime,
+        number: Int = 1,
+        room: String = "",
+        subject: String = "",
+        teacher: String = "",
+        changes: Boolean = false
+    ) = SdkLesson(
         number = number,
-        start = start,
-        end = start.plusMinutes(45),
-        startZoned = start.atZone(ZoneId.systemDefault()),
-        endZoned = start.plusMinutes(45).atZone(ZoneId.systemDefault()),
+        start = start.atZone(ZoneId.systemDefault()),
+        end = start.plusMinutes(45).atZone(ZoneId.systemDefault()),
         date = start.toLocalDate(),
         subject = subject,
         group = "",
diff --git a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
index 6db16d2f..f58a5381 100644
--- a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
@@ -207,7 +207,7 @@ class GetMailboxByStudentUseCaseTest {
         className = "",
         isCurrent = false,
         isParent = false,
-        loginMode = Sdk.Mode.API.name,
+        loginMode = Sdk.Mode.HEBE.name,
         loginType = Sdk.ScrapperLoginType.STANDARD.name,
         mobileBaseUrl = "",
         password = "",
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index 10c84efc..b94002c0 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -456,7 +456,7 @@ class GradeAverageProviderTest {
 
     @Test
     fun `force calc current semester average with custom modifiers in api mode`() {
-        val student = student.copy(loginMode = Sdk.Mode.API.name)
+        val student = student.copy(loginMode = Sdk.Mode.HEBE.name)
 
         every { preferencesRepository.gradeAverageForceCalcFlow } returns flowOf(true)
         every { preferencesRepository.isOptionalArithmeticAverageFlow } returns flowOf(false)
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index bf2d9f2c..eb1f5300 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -3,11 +3,18 @@ package io.github.wulkanowy.ui.modules.login.form
 import io.github.wulkanowy.MainCoroutineRule
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.scrapper.Scrapper
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
-import io.mockk.*
+import io.github.wulkanowy.utils.AppInfo
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.verify
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -30,13 +37,17 @@ class LoginFormPresenterTest {
     @MockK(relaxed = true)
     lateinit var analytics: AnalyticsHelper
 
+    @MockK
+    lateinit var appInfo: AppInfo
+
     private lateinit var presenter: LoginFormPresenter
 
     private val registerUser = RegisterUser(
         email = "",
         password = "",
         login = "",
-        baseUrl = "",
+        scrapperBaseUrl = "",
+        loginMode = Sdk.Mode.HEBE,
         loginType = Scrapper.LoginType.AUTO,
         symbols = listOf(),
     )
@@ -54,8 +65,14 @@ class LoginFormPresenterTest {
         every { loginFormView.setErrorPassInvalid(any()) } just Runs
         every { loginFormView.setErrorPassRequired(any()) } just Runs
         every { loginFormView.setErrorUsernameRequired() } just Runs
+        every { appInfo.isDebug } returns false
 
-        presenter = LoginFormPresenter(repository, errorHandler, analytics)
+        presenter = LoginFormPresenter(
+            studentRepository = repository,
+            loginErrorHandler = errorHandler,
+            appInfo = appInfo,
+            analytics = analytics,
+        )
         presenter.onAttachView(loginFormView)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index cf426a50..da292c51 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -6,14 +6,22 @@ import io.github.wulkanowy.data.pojos.RegisterSymbol
 import io.github.wulkanowy.data.pojos.RegisterUnit
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.scrapper.Scrapper
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
-import io.mockk.*
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.clearMocks
+import io.mockk.coEvery
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.slot
+import io.mockk.verify
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -76,6 +84,9 @@ class LoginStudentSelectPresenterTest {
         symbol = "",
         error = null,
         userName = "",
+        keyId = null,
+        privatePem = null,
+        hebeBaseUrl = null,
         schools = listOf(school),
     )
 
@@ -83,7 +94,8 @@ class LoginStudentSelectPresenterTest {
         email = "",
         password = "",
         login = "",
-        baseUrl = "",
+        scrapperBaseUrl = "",
+        loginMode = Sdk.Mode.SCRAPPER,
         loginType = Scrapper.LoginType.AUTO,
         symbols = listOf(symbol),
     )

From d99c93ec052f48c3ceb95207397212e086b2e2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sun, 7 May 2023 23:40:18 +0200
Subject: [PATCH 302/429] Version 2.0.0

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 22de4b8b..bcca5587 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 121
-        versionName "1.9.2"
+        versionCode 122
+        versionName "2.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:14267a9a"
+    implementation "io.github.wulkanowy:sdk:2.0.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index b3fec438..c5ec9de3 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,7 +1,8 @@
-Wersja 1.9.2
+Wersja 2.0.0
 
-- naprawiliśmy oznaczanie wiadomości jako odczytanych (problem dotyczył głównie kont rodziców z wieloma dziećmi w tej samej szkole)
-- naprawiliśmy zapisywanie załączników do wiadomości w sytuacji, gdy ten sam załącznik był dodany do więcej niż jednej wiadomości
-- usprawniliśmy ekran z wyborem uczniów i wpisywaniem symbolu przy pierwszym logowaniu
+— zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
+— dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym
+— poprawiliśmy sposób wyświetlania błędu o nieprawidłowym haśle na ekranie logowania
+— od teraz zmiana ustawień liczenia średniej automatycznie odświeży listę ocen
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 3fdd47c22196b1f6957c67f957e6dcadaf3826b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 11 May 2023 16:44:10 +0200
Subject: [PATCH 303/429] Fix ime overlaping message content (#2199)

---
 .../ui/modules/message/send/SendMessageActivity.kt       | 9 +++++++--
 app/src/main/res/layout/activity_send_message.xml        | 6 ++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 28147fae..0ba82f1a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -142,10 +142,15 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
 
     private fun initializeMessageContainer() {
         ViewCompat.setOnApplyWindowInsetsListener(binding.sendMessageScroll) { view, insets ->
-            val bottomInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val navigationBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
 
             view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = bottomInsets.bottom
+                bottomMargin = if (imeInsets.bottom > navigationBarInsets.bottom) {
+                    imeInsets.bottom
+                } else {
+                    navigationBarInsets.bottom
+                }
             }
             WindowInsetsCompat.CONSUMED
         }
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index fac27d99..e50cf6b3 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -22,17 +22,15 @@
 
     <io.github.wulkanowy.materialchipsinput.ConsumedNestedScrollView
         android:id="@+id/sendMessageScroll"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:fillViewport="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/send_app_bar">
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/sendMessageContent"

From 52218e800ce5e9b7662892659a226d627f32ab48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 11 May 2023 23:45:20 +0200
Subject: [PATCH 304/429] Add auth dialog (#2198)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 app/build.gradle                              |   2 +-
 .../wulkanowy/data/db/dao/StudentDao.kt       |   4 +
 .../wulkanowy/data/db/entities/StudentName.kt |  18 +++
 .../data/repositories/StudentRepository.kt    |  20 +++
 .../github/wulkanowy/ui/base/BaseActivity.kt  |   5 +
 .../wulkanowy/ui/base/BaseDialogFragment.kt   |   8 +-
 .../github/wulkanowy/ui/base/BaseFragment.kt  |   5 +
 .../github/wulkanowy/ui/base/BasePresenter.kt |   8 +-
 .../io/github/wulkanowy/ui/base/BaseView.kt   |   2 +
 .../github/wulkanowy/ui/base/ErrorHandler.kt  |   5 +
 .../wulkanowy/ui/modules/auth/AuthDialog.kt   |  81 +++++++++++
 .../ui/modules/auth/AuthPresenter.kt          | 100 ++++++++++++++
 .../wulkanowy/ui/modules/auth/AuthView.kt     |  20 +++
 .../ui/modules/settings/SettingsFragment.kt   |   2 +
 .../settings/advanced/AdvancedFragment.kt     |   5 +
 .../settings/appearance/AppearanceFragment.kt |   5 +
 .../notifications/NotificationsFragment.kt    |   5 +
 .../ui/modules/settings/sync/SyncFragment.kt  |   5 +
 .../wulkanowy/utils/StudentExtension.kt       |   2 +-
 app/src/main/res/drawable/ic_auth_success.xml |  10 ++
 app/src/main/res/layout/dialog_auth.xml       | 128 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |  11 ++
 app/src/main/res/values/styles.xml            |   5 +
 .../ui/modules/settings/ads/AdsFragment.kt    |   5 +
 24 files changed, 455 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/entities/StudentName.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthView.kt
 create mode 100644 app/src/main/res/drawable/ic_auth_success.xml
 create mode 100644 app/src/main/res/layout/dialog_auth.xml

diff --git a/app/build.gradle b/app/build.gradle
index bcca5587..16127d9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:2.0.0"
+    implementation 'com.github.wulkanowy:sdk:c1573f04c5'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git 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
index cfa7a72a..a2f0abac 100644
--- 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
@@ -2,6 +2,7 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.*
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import javax.inject.Singleton
@@ -19,6 +20,9 @@ abstract class StudentDao {
     @Update(entity = Student::class)
     abstract suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
 
+    @Update(entity = Student::class)
+    abstract suspend fun update(studentName: StudentName)
+
     @Query("SELECT * FROM Students WHERE is_current = 1")
     abstract suspend fun loadCurrent(): Student?
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentName.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentName.kt
new file mode 100644
index 00000000..46f754b5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentName.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity
+data class StudentName(
+
+    @ColumnInfo(name = "student_name")
+    val studentName: String
+
+) : Serializable {
+
+    @PrimaryKey
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
index 4c7069ef..a6bb7243 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@@ -6,7 +6,9 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
+import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentName
 import io.github.wulkanowy.data.db.entities.StudentNickAndAvatar
 import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
@@ -14,6 +16,7 @@ import io.github.wulkanowy.data.mappers.mapToPojo
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
 import kotlinx.coroutines.withContext
@@ -146,4 +149,21 @@ class StudentRepository @Inject constructor(
 
     suspend fun isOneUniqueStudent() = getSavedStudents(false)
         .distinctBy { it.student.studentName }.size == 1
+
+    suspend fun authorizePermission(student: Student, semester: Semester, pesel: String) =
+        sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            .authorizePermission(pesel)
+
+    suspend fun refreshStudentName(student: Student, semester: Semester) {
+        val newCurrentApiStudent = sdk.init(student)
+            .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear)
+            .getCurrentStudent() ?: return
+
+        val studentName = StudentName(
+            studentName = "${newCurrentApiStudent.studentName} ${newCurrentApiStudent.studentSurname}"
+        ).apply { id = student.id }
+
+        studentDb.update(studentName)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index 7914df81..f622209a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -10,6 +10,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
@@ -76,6 +77,10 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
             .show()
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(supportFragmentManager, "auth_dialog")
+    }
+
     override fun showChangePasswordSnackbar(redirectUrl: String) {
         messageContainer?.let {
             Snackbar.make(it, R.string.error_password_change_required, LENGTH_LONG)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
index 561d181a..84540b1c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -5,10 +5,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.annotation.CallSuper
 import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
 import com.google.android.material.elevation.SurfaceColors
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
@@ -40,17 +40,19 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
         (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+    }
+
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
-    @CallSuper
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         view.setBackgroundColor(SurfaceColors.SURFACE_3.getColor(requireContext()))
     }
 
-    @CallSuper
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index dbc5af3a..b25346a7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -7,6 +7,7 @@ import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 
 abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragment(layoutId),
@@ -42,6 +43,10 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragme
         (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+    }
+
     override fun openClearLoginView() {
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
index 15c069f5..2d913103 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
@@ -1,10 +1,15 @@
 package io.github.wulkanowy.ui.base
 
 import io.github.wulkanowy.data.repositories.StudentRepository
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 open class BasePresenter<T : BaseView>(
@@ -26,6 +31,7 @@ open class BasePresenter<T : BaseView>(
             onSessionExpired = view::showExpiredDialog
             onNoCurrentStudent = view::openClearLoginView
             onPasswordChangeRequired = view::showChangePasswordSnackbar
+            onAuthorizationRequired = view::showAuthDialog
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
index d3165ea4..b31737e2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt
@@ -8,6 +8,8 @@ interface BaseView {
 
     fun showExpiredDialog()
 
+    fun showAuthDialog()
+
     fun openClearLoginView()
 
     fun showErrorDetailsDialog(error: Throwable)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
index afe200e9..0a41a47b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.base
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
+import io.github.wulkanowy.sdk.scrapper.exception.AuthorizationRequiredException
 import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
 import io.github.wulkanowy.utils.getErrorString
@@ -20,6 +21,8 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
 
     var onPasswordChangeRequired: (String) -> Unit = {}
 
+    var onAuthorizationRequired: () -> Unit = {}
+
     fun dispatch(error: Throwable) {
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
@@ -31,6 +34,7 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
             is PasswordChangeRequiredException -> onPasswordChangeRequired(error.redirectUrl)
             is ScramblerException, is BadCredentialsException -> onSessionExpired()
             is NoCurrentStudentException -> onNoCurrentStudent()
+            is AuthorizationRequiredException -> onAuthorizationRequired()
         }
     }
 
@@ -39,5 +43,6 @@ open class ErrorHandler @Inject constructor(@ApplicationContext protected val co
         onSessionExpired = {}
         onNoCurrentStudent = {}
         onPasswordChangeRequired = {}
+        onAuthorizationRequired = {}
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt
new file mode 100644
index 00000000..fa29df47
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthDialog.kt
@@ -0,0 +1,81 @@
+package io.github.wulkanowy.ui.modules.auth
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.text.parseAsHtml
+import androidx.core.view.isVisible
+import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.DialogAuthBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AuthDialog : BaseDialogFragment<DialogAuthBinding>(), AuthView {
+
+    @Inject
+    lateinit var presenter: AuthPresenter
+
+    companion object {
+        fun newInstance() = AuthDialog()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, R.style.FullScreenDialogStyle)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return DialogAuthBinding.inflate(inflater).apply { binding = this }.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        presenter.onAttachView(this)
+
+        binding.authInput.doOnTextChanged { text, _, _, _ ->
+            presenter.onPeselChange(text?.toString())
+        }
+
+        binding.authButton.setOnClickListener { presenter.authorize() }
+        binding.authSuccessButton.setOnClickListener {
+            activity?.recreate()
+            dismiss()
+        }
+        binding.authButtonSkip.setOnClickListener { dismiss() }
+    }
+
+    override fun enableAuthButton(isEnabled: Boolean) {
+        binding.authButton.isEnabled = isEnabled
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.authProgress.isVisible = show
+    }
+
+    override fun showPeselError(show: Boolean) {
+        binding.authInputLayout.error = getString(R.string.auth_api_error).takeIf { show }
+    }
+
+    override fun showInvalidPeselError(show: Boolean) {
+        binding.authInputLayout.error = getString(R.string.auth_invalid_error).takeIf { show }
+    }
+
+    override fun showSuccess(show: Boolean) {
+        binding.authSuccess.isVisible = show
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.authForm.isVisible = show
+    }
+
+    override fun showDescriptionWithName(name: String) {
+        binding.authDescription.text = getString(R.string.auth_description, name).parseAsHtml()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt
new file mode 100644
index 00000000..8f579712
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthPresenter.kt
@@ -0,0 +1,100 @@
+package io.github.wulkanowy.ui.modules.auth
+
+import io.github.wulkanowy.data.repositories.SemesterRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class AuthPresenter @Inject constructor(
+    private val semesterRepository: SemesterRepository,
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository
+) : BasePresenter<AuthView>(errorHandler, studentRepository) {
+
+    private var pesel: String = ""
+
+    override fun onAttachView(view: AuthView) {
+        super.onAttachView(view)
+        view.enableAuthButton(pesel.length == 11)
+        view.showSuccess(false)
+        view.showProgress(false)
+
+        loadName()
+    }
+
+    private fun loadName() {
+        presenterScope.launch {
+            runCatching { studentRepository.getCurrentStudent(false) }
+                .onSuccess { view?.showDescriptionWithName(it.studentName) }
+                .onFailure { errorHandler.dispatch(it) }
+        }
+    }
+
+    fun onPeselChange(newPesel: String?) {
+        pesel = newPesel.orEmpty()
+
+        view?.enableAuthButton(pesel.length == 11)
+        view?.showPeselError(false)
+        view?.showInvalidPeselError(false)
+    }
+
+    fun authorize() {
+        presenterScope.launch {
+            view?.showProgress(true)
+            view?.showContent(false)
+
+            if (!isValidPESEL(pesel)) {
+                view?.showInvalidPeselError(true)
+                view?.showProgress(false)
+                view?.showContent(true)
+                return@launch
+            }
+
+            runCatching {
+                val student = studentRepository.getCurrentStudent()
+                val semester = semesterRepository.getCurrentSemester(student)
+
+                val isSuccess = studentRepository.authorizePermission(student, semester, pesel)
+                if (isSuccess) {
+                    studentRepository.refreshStudentName(student, semester)
+                }
+                isSuccess
+            }
+                .onFailure { errorHandler.dispatch(it) }
+                .onSuccess {
+                    if (it) {
+                        view?.showSuccess(true)
+                        view?.showContent(false)
+                        view?.showPeselError(false)
+                    } else {
+                        view?.showSuccess(false)
+                        view?.showContent(true)
+                        view?.showPeselError(true)
+                    }
+                }
+
+            view?.showProgress(false)
+        }
+    }
+
+    private fun isValidPESEL(peselString: String): Boolean {
+        if (peselString.length != 11) {
+            return false
+        }
+
+        val weights = intArrayOf(1, 3, 7, 9, 1, 3, 7, 9, 1, 3)
+        var sum = 0
+
+        for (i in 0 until 10) {
+            sum += weights[i] * Character.getNumericValue(peselString[i])
+        }
+
+        sum %= 10
+        sum = 10 - sum
+        sum %= 10
+
+        return sum == Character.getNumericValue(peselString[10])
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthView.kt
new file mode 100644
index 00000000..d7e1917c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/auth/AuthView.kt
@@ -0,0 +1,20 @@
+package io.github.wulkanowy.ui.modules.auth
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface AuthView : BaseView {
+
+    fun enableAuthButton(isEnabled: Boolean)
+
+    fun showProgress(show: Boolean)
+
+    fun showPeselError(show: Boolean)
+
+    fun showInvalidPeselError(show: Boolean)
+
+    fun showSuccess(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showDescriptionWithName(name: String)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index d56cdfa7..21f56498 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -31,4 +31,6 @@ class SettingsFragment : PreferenceFragmentCompat(), MainView.TitledView, Settin
     override fun showErrorDetailsDialog(error: Throwable) {}
 
     override fun showChangePasswordSnackbar(redirectUrl: String) {}
+
+    override fun showAuthDialog() {}
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
index b4ba5bc4..41e9e8b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
@@ -8,6 +8,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
@@ -62,6 +63,10 @@ class AdvancedFragment : PreferenceFragmentCompat(),
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+    }
+
     override fun onResume() {
         super.onResume()
         preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
index 1f6d5143..493ab5d7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
@@ -9,6 +9,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
@@ -78,6 +79,10 @@ class AppearanceFragment : PreferenceFragmentCompat(),
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+    }
+
     override fun onResume() {
         super.onResume()
         preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
index 98ac1573..35c1faa4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
@@ -21,6 +21,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openInternetBrowser
@@ -148,6 +149,10 @@ class NotificationsFragment : PreferenceFragmentCompat(),
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+    }
+
     override fun showFixSyncDialog() {
         MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.pref_notify_fix_sync_issues)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
index 2a804d9f..df2e1348 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
@@ -10,6 +10,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import javax.inject.Inject
 
@@ -99,6 +100,10 @@ class SyncFragment : PreferenceFragmentCompat(),
         ErrorDialog.newInstance(error).show(childFragmentManager, "error_details")
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+    }
+
     override fun onResume() {
         super.onResume()
         preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/StudentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/StudentExtension.kt
index fdd0610a..132a3085 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/StudentExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/StudentExtension.kt
@@ -2,4 +2,4 @@ package io.github.wulkanowy.utils
 
 import io.github.wulkanowy.data.db.entities.Student
 
-inline val Student.nickOrName get() = if (nick.isBlank()) studentName else nick
+inline val Student.nickOrName get() = nick.ifBlank { studentName }
diff --git a/app/src/main/res/drawable/ic_auth_success.xml b/app/src/main/res/drawable/ic_auth_success.xml
new file mode 100644
index 00000000..015553c0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_auth_success.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM16.59,7.58L10,14.17l-2.59,-2.58L6,13l4,4 8,-8z" />
+</vector>
diff --git a/app/src/main/res/layout/dialog_auth.xml b/app/src/main/res/layout/dialog_auth.xml
new file mode 100644
index 00000000..e2e2aa30
--- /dev/null
+++ b/app/src/main/res/layout/dialog_auth.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/auth_form"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/auth_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="32dp"
+                android:text="@string/auth_title"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/auth_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="8dp"
+                android:textSize="16sp"
+                app:layout_constraintTop_toBottomOf="@id/auth_title"
+                app:lineHeight="24sp"
+                tools:text="@string/auth_description" />
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/auth_input_layout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="24dp"
+                android:hint="@string/auth_pesel"
+                app:errorEnabled="true"
+                app:layout_constraintTop_toBottomOf="@id/auth_description">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/auth_input"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="numberDecimal"
+                    android:maxLength="11" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/auth_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="8dp"
+                android:text="@string/auth_button"
+                app:layout_constraintBottom_toTopOf="@id/auth_button_skip"
+                app:layout_constraintTop_toBottomOf="@id/auth_input_layout"
+                app:layout_constraintVertical_bias="1" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/auth_button_skip"
+                style="@style/Widget.Material3.Button.OutlinedButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="24dp"
+                android:text="@string/auth_button_skip"
+                app:layout_constraintBottom_toBottomOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/auth_success"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/auth_success_icon"
+                android:layout_width="62dp"
+                android:layout_height="62dp"
+                android:layout_marginTop="220dp"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_auth_success"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="?colorOnBackground" />
+
+            <TextView
+                android:id="@+id/auth_success_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="24dp"
+                android:gravity="center"
+                android:text="@string/auth_success"
+                android:textSize="24sp"
+                app:layout_constraintTop_toBottomOf="@id/auth_success_icon"
+                app:lineHeight="32sp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/auth_success_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="24dp"
+                android:text="@android:string/ok"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/auth_success_description"
+                app:layout_constraintVertical_bias="1" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <ProgressBar
+            android:id="@+id/auth_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </FrameLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e53fd2f..1eff9569 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -808,6 +808,17 @@
     <string name="menu_order_confirm_restart">Restart</string>
 
 
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b>%1$s&lt;/b> in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
+
+
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b0bf2819..9d1f0745 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -78,4 +78,9 @@
         <item name="android:background">@drawable/background_material_alert_dialog</item>
         <item name="android:layout" tools:ignore="PrivateResource">@layout/m3_alert_dialog</item>
     </style>
+
+    <style name="FullScreenDialogStyle" parent="WulkanowyTheme">
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowIsFloating">false</item>
+    </style>
 </resources>
diff --git a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
index de4c591e..af6a8340 100644
--- a/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
+++ b/app/src/play/java/io/github/wulkanowy/ui/modules/settings/ads/AdsFragment.kt
@@ -13,6 +13,7 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.databinding.DialogAdsConsentBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
@@ -146,6 +147,10 @@ class AdsFragment : PreferenceFragmentCompat(), MainView.TitledView, AdsView {
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
 
+    override fun showAuthDialog() {
+        AuthDialog.newInstance().show(childFragmentManager, "auth_dialog")
+    }
+
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }

From 5a2622871f9e5a61b419e100dd546457a36c63bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 12 May 2023 00:21:24 +0200
Subject: [PATCH 305/429] Version 2.0.1

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 16127d9a..48ca28a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 122
-        versionName "2.0.0"
+        versionCode 123
+        versionName "2.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,7 +161,7 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.50d
+    userFraction = 0.10d
     updatePriority = 2
     enabled.set(false)
 }
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.github.wulkanowy:sdk:c1573f04c5'
+    implementation 'io.github.wulkanowy:sdk:2.0.1'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index c5ec9de3..d079f986 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -4,5 +4,6 @@ Wersja 2.0.0
 — dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym
 — poprawiliśmy sposób wyświetlania błędu o nieprawidłowym haśle na ekranie logowania
 — od teraz zmiana ustawień liczenia średniej automatycznie odświeży listę ocen
+— dodaliśmy okienko na wpisanie numeru PESEL, gdy dziennik wymaga dodatkowej autoryzacji dostępu
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From cbef160adaead03b862035c8cfc3b6dab9355716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 12 May 2023 00:41:53 +0200
Subject: [PATCH 306/429] New Crowdin updates (#2193)

---
 app/src/main/res/values-cs/strings.xml     |  9 +++++++++
 app/src/main/res/values-da-rDK/strings.xml |  9 +++++++++
 app/src/main/res/values-de/strings.xml     |  9 +++++++++
 app/src/main/res/values-es-rES/strings.xml |  9 +++++++++
 app/src/main/res/values-pl/strings.xml     |  9 +++++++++
 app/src/main/res/values-ru/strings.xml     | 11 ++++++++++-
 app/src/main/res/values-sk/strings.xml     |  9 +++++++++
 app/src/main/res/values-uk/strings.xml     |  9 +++++++++
 8 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bedb491b..beb2996b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -809,6 +809,15 @@
     <string name="menu_order_confirm_title">Restartování aplikace</string>
     <string name="menu_order_confirm_content">Pro uložení změn je nutné aplikaci restartovat</string>
     <string name="menu_order_confirm_restart">Restartovat</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
     <!--Errors-->
     <string name="error_no_internet">Žádné internetové připojení</string>
     <string name="error_invalid_device_datetime">Vyskytla se chyba. Zkontrolujte hodiny svého zařízení</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index ebec11b2..b9de57f7 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -721,6 +721,15 @@
     <string name="menu_order_confirm_title">Application restart</string>
     <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
     <string name="menu_order_confirm_restart">Restart</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1e1785bf..4fdd71b5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -721,6 +721,15 @@
     <string name="menu_order_confirm_title">Application restart</string>
     <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
     <string name="menu_order_confirm_restart">Restart</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
     <!--Errors-->
     <string name="error_no_internet">Keine Internetverbindung</string>
     <string name="error_invalid_device_datetime">Es ist ein Fehler aufgetreten. Überprüfen Sie Ihre Geräteuhr</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ebec11b2..b9de57f7 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -721,6 +721,15 @@
     <string name="menu_order_confirm_title">Application restart</string>
     <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
     <string name="menu_order_confirm_restart">Restart</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f797a4dc..207b12e9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -809,6 +809,15 @@
     <string name="menu_order_confirm_title">Ponowne uruchomienie aplikacji</string>
     <string name="menu_order_confirm_content">W celu zapisania zmian aplikacja musi zostać ponownie uruchomiona</string>
     <string name="menu_order_confirm_restart">Uruchom ponownie</string>
+    <!--Auth-->
+    <string name="auth_api_error">Autoryzacja została odrzucona. Podano dane niezgodne z danymi w sekretariacie.</string>
+    <string name="auth_invalid_error">Nieprawidłowy PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Potwierdź</string>
+    <string name="auth_success">Autoryzacja zakończona pomyślnie</string>
+    <string name="auth_title">Autoryzacja</string>
+    <string name="auth_description">Rodzicu, musimy mieć pewność, że Twój adres e-mail został powiązany z prawidłowym kontem ucznia. W celu autoryzacji konta podaj numer PESEL ucznia &lt;b&gt;%1$s&lt;/b&gt; w polu poniżej</string>
+    <string name="auth_button_skip">Na razie pomiń</string>
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_invalid_device_datetime">Wystąpił błąd. Sprawdź poprawność daty w urządzeniu</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7a42e388..726e9546 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -778,7 +778,7 @@
     <string name="pref_advanced_category_summary">Значения плюса и минуса, расчёт средней оценки</string>
     <string name="pref_advanced_category">Расширенные</string>
     <string name="pref_about_category_summary">Версия приложения, разработчики, соц. сети</string>
-    <string name="pref_ads_category_summary">Посмотреть рекламу, чтобы поддержать преокт</string>
+    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
     <!--Notification Channels-->
     <string name="channel_new_grades">Новые оценки</string>
     <string name="channel_new_homework">Новое домашнее задание</string>
@@ -809,6 +809,15 @@
     <string name="menu_order_confirm_title">Перезапуск приложение</string>
     <string name="menu_order_confirm_content">Для сохранения изменений необходимо перезапустить приложение</string>
     <string name="menu_order_confirm_restart">Перезапустить</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
     <!--Errors-->
     <string name="error_no_internet">Интернет-соединение отсутствует</string>
     <string name="error_invalid_device_datetime">Произошла ошибка. Проверьте время на вашем устройстве</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index cde3178b..7e42c6cd 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -809,6 +809,15 @@
     <string name="menu_order_confirm_title">Reštartovanie aplikácie</string>
     <string name="menu_order_confirm_content">Pre uloženie zmien je nutné aplikáciu reštartovať</string>
     <string name="menu_order_confirm_restart">Reštartovať</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
     <!--Errors-->
     <string name="error_no_internet">Žiadne internetové pripojenie</string>
     <string name="error_invalid_device_datetime">Vyskytla sa chyba. Skontrolujte hodiny svojho zariadenia</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9602aabb..66cd2387 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -809,6 +809,15 @@
     <string name="menu_order_confirm_title">Перезавантаження додатку</string>
     <string name="menu_order_confirm_content">Додаток потрібно перезавантажити для збереження змін</string>
     <string name="menu_order_confirm_restart">Перезавантажити</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
     <!--Errors-->
     <string name="error_no_internet">Немає з\'єднання з інтернетом</string>
     <string name="error_invalid_device_datetime">Сталася помилка. Перевірте годинник пристрою</string>

From b8ac72c247a70ae4a68349a3239d3ff280bd0335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 12 May 2023 00:45:48 +0200
Subject: [PATCH 307/429] Version 2.0.2

---
 app/build.gradle                                  | 4 ++--
 app/src/main/play/release-notes/pl-PL/default.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 48ca28a0..de0c2a3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 123
-        versionName "2.0.1"
+        versionCode 124
+        versionName "2.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index d079f986..378dedce 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 2.0.0
+Wersja 2.0.2
 
 — zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
 — dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym

From 54fbd56b7382f956dc745addd4e91d3cf23dc17a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 04:33:56 +0000
Subject: [PATCH 308/429] Bump com.google.firebase:firebase-bom from 31.5.0 to
 32.0.0 (#2190)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index de0c2a3c..0f6789e8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,7 +242,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:31.5.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.0.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From cb8303f33dc1953db0dcf31516ca36f396aede29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 04:34:14 +0000
Subject: [PATCH 309/429] Bump com.google.android.material:material from 1.8.0
 to 1.9.0 (#2191)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0f6789e8..85ac4833 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -206,7 +206,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.8.0"
+    implementation "com.google.android.material:material:1.9.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.3.0'

From a0af55825d3c8e0a39ca559b6de804f76ee3d309 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 04:34:32 +0000
Subject: [PATCH 310/429] Bump about_libraries from 10.6.2 to 10.6.3 (#2189)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3c8552d2..c63a8fd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.21'
-        about_libraries = '10.6.2'
+        about_libraries = '10.6.3'
         hilt_version = "2.45"
     }
     repositories {

From c33b309cf068efd51566fb52048da140f9046208 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 04:34:48 +0000
Subject: [PATCH 311/429] Bump org.robolectric:robolectric from 4.10 to 4.10.2
 (#2188)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 85ac4833..4ea086a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -265,7 +265,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.10'
+    testImplementation 'org.robolectric:robolectric:4.10.2'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"

From 030fe8c218a2508789c5750d9d3412334aa1fb03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 04:45:15 +0000
Subject: [PATCH 312/429] Bump coroutines from 1.6.4 to 1.7.0 (#2186)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4ea086a1..3a6744c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -182,7 +182,7 @@ ext {
     room = "2.5.1"
     chucker = "3.5.2"
     mockk = "1.13.5"
-    coroutines = "1.6.4"
+    coroutines = "1.7.0"
 }
 
 dependencies {

From f2faa7e8b7f27c7f7f182117fc8b83d02e0e8122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 12 May 2023 22:45:24 +0200
Subject: [PATCH 313/429] Fix button color in high priority admin message
 (#2202)

---
 .../ui/modules/dashboard/adapters/DashboardAdapter.kt       | 5 +++--
 app/src/main/res/values-night-v31/styles.xml                | 4 +++-
 app/src/main/res/values-night/styles.xml                    | 4 +++-
 app/src/main/res/values-v31/styles.xml                      | 4 +++-
 app/src/main/res/values/attrs.xml                           | 2 ++
 app/src/main/res/values/colors.xml                          | 6 ++++--
 app/src/main/res/values/styles.xml                          | 4 +++-
 7 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
index 2c06e45f..4ad4e9d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
@@ -738,8 +738,8 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         val context = adminMessageViewHolder.binding.root.context
         val (backgroundColor, textColor) = when (item.priority) {
             "HIGH" -> {
-                context.getThemeAttrColor(R.attr.colorPrimary) to
-                    context.getThemeAttrColor(R.attr.colorOnPrimary)
+                context.getThemeAttrColor(R.attr.colorMessageHigh) to
+                    context.getThemeAttrColor(R.attr.colorOnMessageHigh)
             }
             "MEDIUM" -> {
                 context.getThemeAttrColor(R.attr.colorMessageMedium) to Color.BLACK
@@ -754,6 +754,7 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             dashboardAdminMessageItemDescription.setTextColor(textColor)
             dashboardAdminMessageItemIcon.setColorFilter(textColor)
             dashboardAdminMessageItemDismiss.isVisible = item.isDismissible
+            dashboardAdminMessageItemDismiss.setTextColor(textColor)
             dashboardAdminMessageItemDismiss.setOnClickListener {
                 onAdminMessageDismissClickListener(item)
             }
diff --git a/app/src/main/res/values-night-v31/styles.xml b/app/src/main/res/values-night-v31/styles.xml
index 067a4353..6e6c4d79 100644
--- a/app/src/main/res/values-night-v31/styles.xml
+++ b/app/src/main/res/values-night-v31/styles.xml
@@ -35,7 +35,9 @@
         <item name="colorError">@color/colorErrorLight</item>
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="colorSwipeRefresh">@color/material_dynamic_secondary20</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_dark</item>
+        <item name="colorOnMessageHigh">@android:color/black</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">@color/material_dynamic_neutral90</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 7d2f0cfe..5d9aa22a 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -24,7 +24,9 @@
         <item name="colorError">@color/colorErrorLight</item>
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="colorSwipeRefresh">@color/colorSwipeRefreshDark</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_dark</item>
+        <item name="colorOnMessageHigh">@android:color/black</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:navigationBarColor">@color/colorNavigationBarDark</item>
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
index cffb284e..bb47b22e 100644
--- a/app/src/main/res/values-v31/styles.xml
+++ b/app/src/main/res/values-v31/styles.xml
@@ -37,7 +37,9 @@
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
         <item name="colorSwipeRefresh">@color/material_dynamic_secondary90</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_light</item>
+        <item name="colorOnMessageHigh">@android:color/white</item>
         <item name="android:textColor">@color/material_dynamic_neutral10</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8986f357..aa58fa09 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,4 +5,6 @@
     <attr name="colorTimetableCanceled" format="color" />
     <attr name="colorTimetableChange" format="color" />
     <attr name="colorMessageMedium" format="color" />
+    <attr name="colorMessageHigh" format="color" />
+    <attr name="colorOnMessageHigh" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ac1b1c19..87057c61 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,8 +39,10 @@
     <color name="colorStatusBarDark">#342826</color>
     <color name="colorStatusBarBlack">#181010</color>
 
-    <color name="dashboard_message_medium_light">#FFD980</color>
-    <color name="dashboard_message_medium_dark">#ffd54f</color>
+    <color name="dashboard_message_medium_light">#ffd54f</color>
+    <color name="dashboard_message_medium_dark">#FFD980</color>
+    <color name="dashboard_message_high_light">#B91B21</color>
+    <color name="dashboard_message_high_dark">#e57373</color>
 
     <color name="timetable_canceled_light">#d32f2f</color>
     <color name="timetable_canceled_dark">#e57373</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9d1f0745..603e22ab 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,7 +22,9 @@
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
         <item name="colorSwipeRefresh">@color/colorSwipeRefresh</item>
-        <item name="colorMessageMedium">@color/dashboard_message_medium_dark</item>
+        <item name="colorMessageMedium">@color/dashboard_message_medium_light</item>
+        <item name="colorMessageHigh">@color/dashboard_message_high_light</item>
+        <item name="colorOnMessageHigh">@android:color/white</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:statusBarColor">@android:color/black</item>
         <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>

From cc752ab0ad36510bff1df10bfee1eda641768ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 12 May 2023 22:45:50 +0200
Subject: [PATCH 314/429] New Crowdin updates (#2201)

---
 app/src/main/res/values-cs/strings.xml | 14 +++++-----
 app/src/main/res/values-de/strings.xml | 36 +++++++++++++-------------
 app/src/main/res/values-sk/strings.xml | 14 +++++-----
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index beb2996b..f8c19dff 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -810,14 +810,14 @@
     <string name="menu_order_confirm_content">Pro uložení změn je nutné aplikaci restartovat</string>
     <string name="menu_order_confirm_restart">Restartovat</string>
     <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_api_error">Autorizace byla zamítnuta. Uvedené údaje se neshodují se záznamy v kanceláři tajemníka.</string>
+    <string name="auth_invalid_error">Neplatný PESEL</string>
     <string name="auth_pesel">PESEL</string>
-    <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
+    <string name="auth_button">Autorizovat</string>
+    <string name="auth_success">Autorizace byla úspěšně dokončena</string>
+    <string name="auth_title">Autorizace</string>
+    <string name="auth_description">Pro provoz aplikace potřebujeme potvrdit vaši identitu. Zadejte PESEL žáka &lt;b&gt;%1$s&lt;/b&gt; v níže uvedeném poli</string>
+    <string name="auth_button_skip">Zatím přeskočit</string>
     <!--Errors-->
     <string name="error_no_internet">Žádné internetové připojení</string>
     <string name="error_invalid_device_datetime">Vyskytla se chyba. Zkontrolujte hodiny svého zařízení</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4fdd71b5..500553e2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -26,7 +26,7 @@
     <string name="student_info_title">Schülerinfo</string>
     <string name="dashboard_title">Übersicht</string>
     <string name="notifications_center_title">Benachrichtigungszentrum</string>
-    <string name="menu_order_title">Menu configuartion</string>
+    <string name="menu_order_title">Menü Konfiguration</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -56,7 +56,7 @@
     <string name="login_invalid_symbol">Ungültige symbol</string>
     <string name="login_incorrect_symbol">Schüler nicht gefunden. Überprüfen Sie das Symbol und die gewählte Variation des UONET+ Registers</string>
     <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
+    <string name="login_symbol_helper">Das Symbol kann auf der Registerseite in&#160;<b>Student </b>→&#160;<b>Tost Möbeln</b> →&#160;<b>Registrieren Sie Ihr Mobilgerät</b>gefunden werden.\n\nStellen Sie sicher, dass Sie die entsprechende Registervariante im Feld <b>UONET+ Registervariante</b> auf dem vorherigen Bildschirm festgelegt haben</string>
     <string name="login_select_student">Wählen Sie die Studenten aus, die sich bei der Anwendung anmelden sollen</string>
     <string name="login_advanced">Andere Optionen</string>
     <string name="login_advanced_warning_mobile_api">In diesem Modus funktioniert eine Glücknummer, eine Klassenstatistik, eine Zusammenfassung der Anwesenheit, eine Entschuldigung für die Abwesenheit, abgeschlossene Lektionen, Schulinformationen und eine Vorschau der Liste der registrierten Geräte nicht</string>
@@ -73,14 +73,14 @@
     <string name="login_recover">Wiederherstellen</string>
     <string name="login_signed_in">Student ist bereits angemeldet</string>
     <string name="login_host_standard">Standard</string>
-    <string name="login_other_search_locations">Other search locations</string>
-    <string name="login_no_active_student">No active students found</string>
-    <string name="login_symbol_enter">Enter a different symbol</string>
+    <string name="login_other_search_locations">Andere Suchorte</string>
+    <string name="login_no_active_student">Keine aktiven Schüler gefunden</string>
+    <string name="login_symbol_enter">Geben Sie ein anderes Symbol ein</string>
     <!--Notifications-->
-    <string name="notifications_header_title">Enable notifications</string>
-    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
-    <string name="notifications_skip">Skip</string>
-    <string name="notifications_enable">Enable</string>
+    <string name="notifications_header_title">Benachrichtigungen aktivieren</string>
+    <string name="notifications_header_description">Aktivieren Sie Benachrichtigungen, damit Sie keine Nachricht vom Lehrer oder eine neue Klasse verpassen</string>
+    <string name="notifications_skip">Überspringen</string>
+    <string name="notifications_enable">Ermöglichen</string>
     <!--Main-->
     <string name="main_account_picker">Kundenbetreuer</string>
     <string name="main_log_in">Anmelden</string>
@@ -288,7 +288,7 @@
     <string name="message_chip_only_unread">Nur ungelesen</string>
     <string name="message_chip_only_with_attachments">Nur mit Anhängen</string>
     <string name="message_read">Lesen: %s</string>
-    <string name="message_read_by">Read by: %1$d of %2$d people</string>
+    <string name="message_read_by">Lesen von: %1$d von %2$d Personen</string>
     <plurals name="message_number_item">
         <item quantity="one">%1$d Nachricht</item>
         <item quantity="other">%1$d Nachrichten</item>
@@ -422,8 +422,8 @@
     </plurals>
     <string name="conferences_present">Teilnahme an einem Meeting</string>
     <string name="conference_agenda">Agenda</string>
-    <string name="conference_place">Place</string>
-    <string name="conference_topic">Topic</string>
+    <string name="conference_place">Ort</string>
+    <string name="conference_topic">Thema</string>
     <!--Director information-->
     <string name="school_announcement_title">Schulankündigungen</string>
     <string name="school_announcement_no_items">Keine schulankündigungen</string>
@@ -591,10 +591,10 @@
     <string name="all_undo">lösen</string>
     <string name="all_change">Ändern</string>
     <string name="all_add_to_calendar">Zum Kalender hinzufügen</string>
-    <string name="all_cancel">Cancel</string>
+    <string name="all_cancel">Stornieren</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Keine Lektionen</string>
-    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
+    <string name="widget_timetable_last_synchronization">Synchronisiert am %1$s am %2$s</string>
     <string name="widget_timetable_theme_title">Thema wählen</string>
     <string name="widget_timetable_theme_light">Licht</string>
     <string name="widget_timetable_theme_dark">Dunkel</string>
@@ -614,8 +614,8 @@
     <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
     <string name="pref_view_grade_sorting_mode">Schulfachen sortieren</string>
     <string name="pref_view_app_language">Sprache</string>
-    <string name="pref_view_menu_order_title">Menu configuration</string>
-    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
+    <string name="pref_view_menu_order_title">Menü Konfiguration</string>
+    <string name="pref_view_menu_order_summary">Legen Sie die Reihenfolge der Funktionen im Menü fest</string>
     <string name="pref_notify_header">Benachrichtigungen</string>
     <string name="pref_notify_header_other">Sonstiges</string>
     <string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
@@ -718,8 +718,8 @@
     <string name="update_download_success_button">Neustart</string>
     <string name="update_failed">Update fehlgeschlagen! Wulkanowy funktioniert möglicherweise nicht richtig. Überlegen Sie die Aktualisierung</string>
     <!--Menu order-->
-    <string name="menu_order_confirm_title">Application restart</string>
-    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_title">Neustart der Anwendung</string>
+    <string name="menu_order_confirm_content">Die Anwendung muss neu gestartet werden, damit die Änderungen gespeichert werden</string>
     <string name="menu_order_confirm_restart">Restart</string>
     <!--Auth-->
     <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 7e42c6cd..950eb01e 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -810,14 +810,14 @@
     <string name="menu_order_confirm_content">Pre uloženie zmien je nutné aplikáciu reštartovať</string>
     <string name="menu_order_confirm_restart">Reštartovať</string>
     <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_api_error">Autorizácia bola zamietnutá. Uvedené údaje sa nezhodujú so záznamami v kancelárii tajomníka.</string>
+    <string name="auth_invalid_error">Neplatný PESEL</string>
     <string name="auth_pesel">PESEL</string>
-    <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
+    <string name="auth_button">Autorizovať</string>
+    <string name="auth_success">Autorizácia bola úspešne dokončená</string>
+    <string name="auth_title">Autorizácia</string>
+    <string name="auth_description">Na prevádzku aplikácie potrebujeme potvrdiť vašu identitu. Zadajte PESEL žiaka &lt;b&gt;%1$s&lt;/b&gt; v nižšie uvedenom poli</string>
+    <string name="auth_button_skip">Zatiaľ preskočiť</string>
     <!--Errors-->
     <string name="error_no_internet">Žiadne internetové pripojenie</string>
     <string name="error_invalid_device_datetime">Vyskytla sa chyba. Skontrolujte hodiny svojho zariadenia</string>

From 1e9a6a5c42bc11d80bb9f73fcb788f5a0b051cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 12 May 2023 22:59:40 +0200
Subject: [PATCH 315/429] Version 2.0.3

---
 app/build.gradle                                  | 10 +++++-----
 app/src/main/play/release-notes/pl-PL/default.txt |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3a6744c1..a4f230b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 124
-        versionName "2.0.2"
+        versionCode 125
+        versionName "2.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,8 +161,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.10d
-    updatePriority = 2
+    userFraction = 0.50d
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -186,7 +186,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.1'
+    implementation 'io.github.wulkanowy:sdk:2.0.3'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 378dedce..aee30290 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 2.0.2
+Wersja 2.0.3
 
 — zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
 — dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym

From adf418cc689c479ac898a14bac0d7a4219d4620f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Sat, 13 May 2023 10:44:09 +0200
Subject: [PATCH 316/429] Fix delete user homework button visibility (#2204)

---
 app/src/main/res/layout/item_homework_dialog_details.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/item_homework_dialog_details.xml b/app/src/main/res/layout/item_homework_dialog_details.xml
index 1b1c1d39..a40b5dce 100644
--- a/app/src/main/res/layout/item_homework_dialog_details.xml
+++ b/app/src/main/res/layout/item_homework_dialog_details.xml
@@ -14,16 +14,13 @@
 
         <TextView
             android:id="@+id/homework_dialog_header"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
+            android:layout_weight="1"
             android:text="@string/all_details"
             android:textAppearance="?attr/textAppearanceHeadlineSmall"
-            android:textColor="?attr/colorOnSurface"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:textColor="?attr/colorOnSurface" />
 
         <ImageButton
             android:id="@+id/homework_dialog_delete"

From dce491bffe1c546d8e872f7a3ac12f113c4ad436 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 May 2023 17:28:29 +0000
Subject: [PATCH 317/429] Bump hilt_version from 2.45 to 2.46.1 (#2205)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c63a8fd0..7161e4c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.8.21'
         about_libraries = '10.6.3'
-        hilt_version = "2.45"
+        hilt_version = "2.46.1"
     }
     repositories {
         mavenCentral()

From a06add070ecc9543a9a5235bf822b89d4d6775fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 May 2023 18:20:56 +0000
Subject: [PATCH 318/429] Bump com.android.tools.build:gradle from 7.4.2 to
 8.0.1 (#2187)

---
 .github/workflows/deploy-store.yml       |   4 ++--
 .github/workflows/deploy-test.yml        |   4 ++--
 .github/workflows/test.yml               |   6 +++---
 app/build.gradle                         |   6 +++++-
 build.gradle                             |   2 +-
 gradle.properties                        |   9 +++++++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 61574 -> 61608 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   4 ++--
 9 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
index 3ce618ca..e8a220dd 100644
--- a/.github/workflows/deploy-store.yml
+++ b/.github/workflows/deploy-store.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
index 20082590..f2e9f016 100644
--- a/.github/workflows/deploy-test.yml
+++ b/.github/workflows/deploy-test.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7f8591bb..bc4b3647 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
         - uses: actions/setup-java@v2
           with:
             distribution: 'zulu'
-            java-version: 11
+            java-version: 17
         - uses: actions/cache@v3
           with:
             path: |
@@ -48,7 +48,7 @@ jobs:
         - uses: actions/setup-java@v2
           with:
             distribution: 'zulu'
-            java-version: 11
+            java-version: 17
         - uses: actions/cache@v3
           with:
             path: |
@@ -74,7 +74,7 @@ jobs:
         - uses: actions/setup-java@v2
           with:
             distribution: 'zulu'
-            java-version: 11
+            java-version: 17
         - uses: actions/cache@v3
           with:
             path: |
diff --git a/app/build.gradle b/app/build.gradle
index a4f230b8..ad83461a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,7 +156,11 @@ android {
 kapt {
     correctErrorTypes true
 }
-
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
 play {
     defaultToAppBundles = false
     track = 'production'
diff --git a/build.gradle b/build.gradle
index 7161e4c3..88079e54 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.0.300'
diff --git a/gradle.properties b/gradle.properties
index 38603830..5a8099a1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,13 +11,18 @@ org.gradle.jvmargs=-Xmx1536m
 #
 android.enableJetifier=true
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 #
 kotlin.code.style=official
-#
 kapt.use.worker.api=true
 kapt.include.compile.classpath=false
 #
+# https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-common-faq-0000001063210244#section17273113244910
+apmsInstrumentationEnabled=false
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 5094
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
TewQJ9_Q^>f<k<4>f&v@>EQQ)j

delta 5107
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e8be595e..6ec1567a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d..79a61d42 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

From 5b0fe2c006a2509aeb912d8c834db8aa6355c635 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 May 2023 19:28:49 +0000
Subject: [PATCH 319/429] Bump ru.cian:huawei-publish-gradle-plugin from 1.3.5
 to 1.4.0 (#2185)

---
 app/build.gradle | 8 +++++++-
 build.gradle     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ad83461a..f500e779 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -175,7 +175,13 @@ huaweiPublish {
         hmsRelease {
             credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
             buildFormat = "aab"
-            deployType = "draft"
+            deployType = "publish"
+            releaseNotes = [
+                new ru.cian.huawei.publish.ReleaseNote(
+                    "pl-PL",
+                    "$projectDir/src/main/play/release-notes/pl-PL/default.txt"
+                )
+            ]
         }
     }
 }
diff --git a/build.gradle b/build.gradle
index 88079e54..eac46b05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         classpath 'com.huawei.agconnect:agcp:1.9.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
-        classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"
+        classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"

From ea312c3e12c9bbc3dc4a379d092678ea099dad89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 17:13:02 +0000
Subject: [PATCH 320/429] Bump androidx.core:core-ktx from 1.10.0 to 1.10.1
 (#2208)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f500e779..aaa27b9c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -203,7 +203,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.10.0"
+    implementation "androidx.core:core-ktx:1.10.1"
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.7.1"
     implementation "androidx.appcompat:appcompat:1.6.1"

From 8a7b7103eb375b22231a748a6360f85640033489 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 18:36:26 +0000
Subject: [PATCH 321/429] Bump coroutines from 1.7.0 to 1.7.1 (#2207)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index aaa27b9c..2cde7cda 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -192,7 +192,7 @@ ext {
     room = "2.5.1"
     chucker = "3.5.2"
     mockk = "1.13.5"
-    coroutines = "1.7.0"
+    coroutines = "1.7.1"
 }
 
 dependencies {

From 48bcf581cfde80e282eb18866870c42be5e91c74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 18:36:50 +0000
Subject: [PATCH 322/429] Bump org.jetbrains.kotlinx:kotlinx-serialization-json
 (#2209)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2cde7cda..3b5fadb1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -200,7 +200,7 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.10.1"

From 94664828938ee2b25cdd6a367323fe4c2923477a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 18 May 2023 16:14:14 +0200
Subject: [PATCH 323/429] Add foojay-resolver and update dependencies (#2212)

---
 app/build.gradle                         |  10 +++++-----
 gradle/wrapper/gradle-wrapper.jar        | Bin 61608 -> 62076 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   7 ++++---
 settings.gradle                          |   3 +++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3b5fadb1..83be53fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,11 +156,11 @@ android {
 kapt {
     correctErrorTypes true
 }
+
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
+    jvmToolchain(11)
 }
+
 play {
     defaultToAppBundles = false
     track = 'production'
@@ -261,7 +261,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:22.0.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
@@ -275,7 +275,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.10.2'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..c1962a79e29d3e0ab67b14947c167a862655af9b 100644
GIT binary patch
delta 8979
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
K1B3H@5Dx%!RyC~v

delta 8469
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
V!;dnPqptEzPWvRlmVXzd4*<TVPC5Vp

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6ec1567a..8707e8b5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d42..aeb74cbb 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/settings.gradle b/settings.gradle
index e7b4def4..a69aaa95 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}
 include ':app'

From 49203175739758c72d436c6e4f9b6f035837e877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 22 May 2023 17:09:57 +0200
Subject: [PATCH 324/429] Version 2.0.4

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 83be53fc..72948873 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 125
-        versionName "2.0.3"
+        versionCode 126
+        versionName "2.0.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -166,7 +166,7 @@ play {
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
     userFraction = 0.50d
-    updatePriority = 3
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -196,7 +196,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.3'
+    implementation 'io.github.wulkanowy:sdk:2.0.4'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index aee30290..858b44d4 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 2.0.3
+Wersja 2.0.4
 
 — zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
 — dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym

From aca88b57e0b005df6bf0f05efbe66dc066479451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 23 May 2023 02:16:42 +0200
Subject: [PATCH 325/429] Add r8 rules for HMS SDK (#2217)

---
 app/proguard-rules.pro | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index fd948261..ac7d1b02 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,5 +1,6 @@
 # General
 -dontobfuscate
+-ignorewarnings
 
 
 #Config for wulkanowy
@@ -24,3 +25,13 @@
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
+
+#Config for HMS SDK
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keep class com.huawei.agconnect.**{*;}
+-keep class com.huawei.hianalytics.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}

From 4c1fe233c7d4fa2ef4d4cd088fbfecc0189ae4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 23 May 2023 02:37:38 +0200
Subject: [PATCH 326/429] Version 2.0.5

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 72948873..b1116c58 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 126
-        versionName "2.0.4"
+        versionCode 127
+        versionName "2.0.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -196,7 +196,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.4'
+    implementation 'io.github.wulkanowy:sdk:2.0.5'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 858b44d4..72095273 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 2.0.4
+Wersja 2.0.5
 
 — zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
 — dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym

From c1706144615b9e024f3e8d1a7efe47d60dd1aa35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 23 May 2023 14:09:48 +0200
Subject: [PATCH 327/429] Add R8 rule for Wulkanowy SDK (#2220)

---
 app/proguard-rules.pro |  5 +++++
 gradle.properties      | 29 +++++++----------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index ac7d1b02..0fd49f6a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -26,6 +26,7 @@
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
 
+
 #Config for HMS SDK
 -keepattributes *Annotation*
 -keepattributes Exceptions
@@ -35,3 +36,7 @@
 -keep class com.huawei.hianalytics.**{*;}
 -keep class com.huawei.updatesdk.**{*;}
 -keep class com.huawei.hms.**{*;}
+
+
+#Config for Wulkanowy SDK
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
diff --git a/gradle.properties b/gradle.properties
index 5a8099a1..4c54d414 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,28 +1,13 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-#
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
 #
-android.enableJetifier=true
-android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
-#
-kotlin.code.style=official
-kapt.use.worker.api=true
 kapt.include.compile.classpath=false
+kotlin.code.style=official
+#
+android.useAndroidX=true
+android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.defaults.buildfeatures.buildconfig=true
 #
 # https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-common-faq-0000001063210244#section17273113244910
 apmsInstrumentationEnabled=false
-#
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+

From 092e86b621459ec4cb0229a6aa65f43e623ea85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 23 May 2023 16:26:31 +0200
Subject: [PATCH 328/429] Version 2.0.6

---
 app/build.gradle                                  | 10 +++++-----
 app/src/main/play/release-notes/pl-PL/default.txt |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b1116c58..5cebcb31 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 127
-        versionName "2.0.5"
+        versionCode 128
+        versionName "2.0.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -165,8 +165,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
-    userFraction = 0.50d
-    updatePriority = 1
+    userFraction = 0.25d
+    updatePriority = 4
     enabled.set(false)
 }
 
@@ -196,7 +196,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.5'
+    implementation 'io.github.wulkanowy:sdk:2.0.6'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 72095273..df69a331 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 2.0.5
+Wersja 2.0.6
 
 — zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
 — dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym

From e7733bfa2a72362e8736dc102383cce9d241cf6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 21:31:38 +0000
Subject: [PATCH 329/429] Bump com.google.android.gms:play-services-ads from
 22.0.0 to 22.1.0 (#2216)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5cebcb31..40ea252c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -259,7 +259,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-config-ktx'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:22.0.0'
+    playImplementation 'com.google.android.gms:play-services-ads:22.1.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'

From 19ed12146686d95d15101c58429403f8245425ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 21:32:28 +0000
Subject: [PATCH 330/429] Bump io.coil-kt:coil from 2.3.0 to 2.4.0 (#2215)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 40ea252c..3b7ee510 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -246,7 +246,7 @@ dependencies {
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation "io.coil-kt:coil:2.3.0"
+    implementation "io.coil-kt:coil:2.4.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'

From 3096fa15384ce6d8083d1aad5143be1ee1fed1ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 May 2023 21:50:17 +0000
Subject: [PATCH 331/429] Bump about_libraries from 10.6.3 to 10.7.0 (#2214)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index eac46b05..1a70f82a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.21'
-        about_libraries = '10.6.3'
+        about_libraries = '10.7.0'
         hilt_version = "2.46.1"
     }
     repositories {

From 70333737cf218734850ea5d4df16b439f75e789b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 15:16:42 +0000
Subject: [PATCH 332/429] Bump androidx.activity:activity-ktx from 1.7.1 to
 1.7.2 (#2226)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3b7ee510..e72beed2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -205,7 +205,7 @@ dependencies {
 
     implementation "androidx.core:core-ktx:1.10.1"
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.7.1"
+    implementation "androidx.activity:activity-ktx:1.7.2"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.5.7"
     implementation "androidx.annotation:annotation:1.6.0"

From 48e4a9fec58cc6beb07f7e086fe6fd964f318f66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 15:17:48 +0000
Subject: [PATCH 333/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2223)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1a70f82a..b7ac37ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.1.0.3113"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From db4e4d8cef31f399bfc5a4d48c0a1a98d1d53ffa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 15:18:07 +0000
Subject: [PATCH 334/429] Bump com.huawei.hms:hianalytics from 6.10.0.300 to
 6.10.0.301 (#2224)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e72beed2..251aa4b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -261,7 +261,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:22.1.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.300'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.301'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From 06fd7b0c368959d101a3baf0df021becfa73222a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 15:18:30 +0000
Subject: [PATCH 335/429] Bump com.google.firebase:firebase-bom from 32.0.0 to
 32.1.0 (#2225)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 251aa4b6..05070d10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -252,7 +252,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.0.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 556f42195b1bc5d7c5ac9ba26ee4cf7c75f3e931 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 15:18:55 +0000
Subject: [PATCH 336/429] Bump com.android.tools.build:gradle from 8.0.1 to
 8.0.2 (#2228)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b7ac37ed..69c0905a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.0.300'

From 41bde45731dce8c4cf39200ff98e7ca47c6c7bfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 15:19:25 +0000
Subject: [PATCH 337/429] Bump androidx.viewpager2:viewpager2 from 1.1.0-beta01
 to 1.1.0-beta02 (#2227)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 05070d10..929a9db9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -212,7 +212,7 @@ dependencies {
 
     implementation "androidx.preference:preference-ktx:1.2.0"
     implementation "androidx.recyclerview:recyclerview:1.3.0"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
+    implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"

From 1bc0f2d21457281d1c528b7c6cb9697b3211f9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Jun 2023 10:30:50 +0200
Subject: [PATCH 338/429] Add character limit to attendance excuse content
 (#2222)

---
 app/src/main/res/layout/dialog_excuse.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/dialog_excuse.xml b/app/src/main/res/layout/dialog_excuse.xml
index 401aef31..8297bc14 100644
--- a/app/src/main/res/layout/dialog_excuse.xml
+++ b/app/src/main/res/layout/dialog_excuse.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -8,13 +9,18 @@
     <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:counterEnabled="true"
+        app:counterMaxLength="256">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/excuseReason"
+            style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/attendance_excuse_dialog_reason" />
+            android:layout_weight="1"
+            android:hint="@string/attendance_excuse_dialog_reason"
+            android:maxLength="256" />
 
         <requestFocus />
     </com.google.android.material.textfield.TextInputLayout>

From 63487249b8ce8995e6b433ee31701ac9015d405b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 1 Jun 2023 10:31:42 +0200
Subject: [PATCH 339/429] New Crowdin updates (#2211)

---
 app/src/main/res/values-ru/strings.xml | 18 +++++++++---------
 app/src/main/res/values-uk/strings.xml | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 726e9546..9029f4b9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -682,7 +682,7 @@
     <string name="all_cancel">Отменить</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
-    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
+    <string name="widget_timetable_last_synchronization">Синхронизировано %1$s в %2$s</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
     <string name="widget_timetable_theme_light">Светлая</string>
     <string name="widget_timetable_theme_dark">Тёмная</string>
@@ -778,7 +778,7 @@
     <string name="pref_advanced_category_summary">Значения плюса и минуса, расчёт средней оценки</string>
     <string name="pref_advanced_category">Расширенные</string>
     <string name="pref_about_category_summary">Версия приложения, разработчики, соц. сети</string>
-    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+    <string name="pref_ads_category_summary">Посмотреть рекламу, чтобы поддержать проект</string>
     <!--Notification Channels-->
     <string name="channel_new_grades">Новые оценки</string>
     <string name="channel_new_homework">Новое домашнее задание</string>
@@ -810,14 +810,14 @@
     <string name="menu_order_confirm_content">Для сохранения изменений необходимо перезапустить приложение</string>
     <string name="menu_order_confirm_restart">Перезапустить</string>
     <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
-    <string name="auth_pesel">PESEL</string>
+    <string name="auth_api_error">Авторизация отклонена. Предоставленные данные не соответствуют записям в кабинете секретаря.</string>
+    <string name="auth_invalid_error">Неправильный номер PESEL</string>
+    <string name="auth_pesel">Номер PESEL</string>
     <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
+    <string name="auth_success">Авторизация прошла успешно</string>
+    <string name="auth_title">Авторизация</string>
+    <string name="auth_description">Для работы приложения нам необходимо подтвердить вашу личность. Введите PESEL учащегося &lt;b&gt;%1$s&lt;/b&gt; в поле ниже</string>
+    <string name="auth_button_skip">Пропустить сейчас</string>
     <!--Errors-->
     <string name="error_no_internet">Интернет-соединение отсутствует</string>
     <string name="error_invalid_device_datetime">Произошла ошибка. Проверьте время на вашем устройстве</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 66cd2387..be136ea2 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -682,7 +682,7 @@
     <string name="all_cancel">Скасувати</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Немаэ уроків</string>
-    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
+    <string name="widget_timetable_last_synchronization">Синхронізовано %1$s в %2$s</string>
     <string name="widget_timetable_theme_title">Увібрати тему</string>
     <string name="widget_timetable_theme_light">Яскрава</string>
     <string name="widget_timetable_theme_dark">Темна</string>
@@ -810,14 +810,14 @@
     <string name="menu_order_confirm_content">Додаток потрібно перезавантажити для збереження змін</string>
     <string name="menu_order_confirm_restart">Перезавантажити</string>
     <!--Auth-->
-    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
-    <string name="auth_invalid_error">Invalid PESEL</string>
-    <string name="auth_pesel">PESEL</string>
+    <string name="auth_api_error">Авторизацію відхилено. Надані дані не збігаються із записами в кабінеті секретаря.</string>
+    <string name="auth_invalid_error">Неправильний PESEL</string>
+    <string name="auth_pesel">Число PESEL</string>
     <string name="auth_button">Authorize</string>
     <string name="auth_success">Authorization completed successfully</string>
-    <string name="auth_title">Authorization</string>
-    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
-    <string name="auth_button_skip">Skip for now</string>
+    <string name="auth_title">Авторизувати</string>
+    <string name="auth_description">Для роботи програми нам потрібно підтвердити вашу особу. Будь ласка, введіть число PESEL &lt;b&gt;%1$s&lt;/b&gt; студента в поле нижче</string>
+    <string name="auth_button_skip">Поки що пропустити</string>
     <!--Errors-->
     <string name="error_no_internet">Немає з\'єднання з інтернетом</string>
     <string name="error_invalid_device_datetime">Сталася помилка. Перевірте годинник пристрою</string>

From d4ae0d56d62215ea26ad829579ac909d9e313575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Jun 2023 10:59:50 +0200
Subject: [PATCH 340/429] Version 2.0.7

---
 app/build.gradle                                  |  8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 10 ++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 929a9db9..ec62e19f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 128
-        versionName "2.0.6"
+        versionCode 129
+        versionName "2.0.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -166,7 +166,7 @@ play {
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
     userFraction = 0.25d
-    updatePriority = 4
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -196,7 +196,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.6'
+    implementation 'io.github.wulkanowy:sdk:2.0.7'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index df69a331..066485d3 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,9 +1,7 @@
-Wersja 2.0.6
+Wersja 2.0.7
 
-— zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
-— dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym
-— poprawiliśmy sposób wyświetlania błędu o nieprawidłowym haśle na ekranie logowania
-— od teraz zmiana ustawień liczenia średniej automatycznie odświeży listę ocen
-— dodaliśmy okienko na wpisanie numeru PESEL, gdy dziennik wymaga dodatkowej autoryzacji dostępu
+— poprawiliśmy wyświetlanie kilku rodzajów zmian w planie lekcji
+— dodaliśmy limit znaków w okienku usprawiedliwiania
+— naprawiliśmy wyświetlanie frekwencji w szkołach, gdzie działa już system eduOne (ciągle jednak brak opcji usprawiedliwiania)
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 5306044173d5a67b4d1d09f037148f08b4ea8574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Jun 2023 23:22:10 +0200
Subject: [PATCH 341/429] Add custom register host field on login screen
 (#2221)

---
 app/build.gradle                              |    2 +-
 .../56.json                                   | 2442 +++++++++++++++++
 .../github/wulkanowy/data/db/AppDatabase.kt   |    3 +-
 .../wulkanowy/data/db/entities/Student.kt     |    3 +
 .../data/mappers/RegisterUserMapper.kt        |    2 +
 .../data/repositories/StudentRepository.kt    |   12 +-
 .../wulkanowy/ui/modules/login/LoginData.kt   |    1 +
 .../login/advanced/LoginAdvancedFragment.kt   |    7 +
 .../login/advanced/LoginAdvancedPresenter.kt  |    6 +-
 .../login/advanced/LoginAdvancedView.kt       |    2 +
 .../modules/login/form/LoginFormFragment.kt   |    8 +
 .../modules/login/form/LoginFormPresenter.kt  |   18 +-
 .../ui/modules/login/form/LoginFormView.kt    |    4 +
 .../LoginStudentSelectPresenter.kt            |    1 +
 .../login/symbol/LoginSymbolPresenter.kt      |    1 +
 .../io/github/wulkanowy/utils/SdkExtension.kt |    1 +
 .../res/layout/fragment_login_advanced.xml    |   29 +-
 .../main/res/layout/fragment_login_form.xml   |   28 +-
 app/src/main/res/values/api_hosts.xml         |    3 +
 app/src/main/res/values/strings.xml           |    1 +
 .../io/github/wulkanowy/TestEnityCreator.kt   |    1 +
 .../data/repositories/GradeRepositoryTest.kt  |    1 +
 .../domain/GetMailboxByStudentUseCaseTest.kt  |    1 +
 .../modules/grade/GradeAverageProviderTest.kt |    1 +
 .../login/form/LoginFormPresenterTest.kt      |   13 +-
 .../LoginStudentSelectPresenterTest.kt        |    1 +
 26 files changed, 2564 insertions(+), 28 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/56.json

diff --git a/app/build.gradle b/app/build.gradle
index ec62e19f..19fbf6de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,7 +196,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.7'
+    implementation 'io.github.wulkanowy:sdk:2.0.8-SNAPSHOT'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/56.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/56.json
new file mode 100644
index 00000000..1a26e717
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/56.json
@@ -0,0 +1,2442 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 56,
+    "identityHash": "48f0538bd21601eb5322a7d850e04134",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `scrapper_domain_suffix` TEXT NOT NULL DEFAULT '', `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperDomainSuffix",
+            "columnName": "scrapper_domain_suffix",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "globalKey"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `type` TEXT NOT NULL, `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '48f0538bd21601eb5322a7d850e04134')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 0aea86da..882a7016 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -49,6 +49,7 @@ import javax.inject.Singleton
         AutoMigration(from = 47, to = 48),
         AutoMigration(from = 51, to = 52),
         AutoMigration(from = 54, to = 55, spec = Migration55::class),
+        AutoMigration(from = 55, to = 56),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -57,7 +58,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 55
+        const val VERSION_SCHEMA = 56
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index 76da9643..e1116733 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -19,6 +19,9 @@ data class Student(
     @ColumnInfo(name = "scrapper_base_url")
     val scrapperBaseUrl: String,
 
+    @ColumnInfo(name = "scrapper_domain_suffix", defaultValue = "")
+    val scrapperDomainSuffix: String,
+
     @ColumnInfo(name = "mobile_base_url")
     val mobileBaseUrl: String,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
index bcf26a5e..72c4861c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/RegisterUserMapper.kt
@@ -55,6 +55,7 @@ fun SdkRegisterUser.mapToPojo(password: String?) = RegisterUser(
 
 fun RegisterStudent.mapToStudentWithSemesters(
     user: RegisterUser,
+    scrapperDomainSuffix: String,
     symbol: RegisterSymbol,
     unit: RegisterUnit,
     colors: List<Long>,
@@ -76,6 +77,7 @@ fun RegisterStudent.mapToStudentWithSemesters(
         studentName = "$studentName $studentSurname",
         loginMode = user.loginMode.name,
         scrapperBaseUrl = user.scrapperBaseUrl.orEmpty(),
+        scrapperDomainSuffix = scrapperDomainSuffix,
         mobileBaseUrl = symbol.hebeBaseUrl.orEmpty(),
         certificateKey = symbol.keyId.orEmpty(),
         privateKey = symbol.privatePem.orEmpty(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
index a6bb7243..42d1eb84 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@@ -43,22 +43,14 @@ class StudentRepository @Inject constructor(
         .getStudentsFromHebe(token, pin, symbol, "")
         .mapToPojo(null)
 
-    suspend fun getStudentsScrapper(
-        email: String,
-        password: String,
-        scrapperBaseUrl: String,
-        symbol: String
-    ): RegisterUser = sdk
-        .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, symbol)
-        .mapToPojo(password)
-
     suspend fun getUserSubjectsFromScrapper(
         email: String,
         password: String,
         scrapperBaseUrl: String,
+        domainSuffix: String,
         symbol: String
     ): RegisterUser = sdk
-        .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, symbol)
+        .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, domainSuffix, symbol)
         .mapToPojo(password)
 
     suspend fun getStudentsHybrid(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
index ae6c2249..2c11bb6d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginData.kt
@@ -6,5 +6,6 @@ data class LoginData(
     val login: String,
     val password: String,
     val baseUrl: String,
+    val domainSuffix: String,
     val symbol: String?,
 ) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index ead2d71a..13d2c14a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.ArrayAdapter
+import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -55,6 +56,9 @@ class LoginAdvancedFragment :
         get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString()))
             .orEmpty()
 
+    override val formDomainSuffix: String
+        get() = binding.loginFormDomainSuffix.text.toString().trim()
+
     override val formHostSymbol: String
         get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString()))
             .orEmpty()
@@ -279,6 +283,7 @@ class LoginAdvancedFragment :
             loginFormUsernameLayout.visibility = VISIBLE
             loginFormPassLayout.visibility = VISIBLE
             loginFormHostLayout.visibility = VISIBLE
+            loginFormDomainSuffixLayout.isVisible = true
             loginFormPinLayout.visibility = GONE
             loginFormSymbolLayout.visibility = VISIBLE
             loginFormTokenLayout.visibility = GONE
@@ -290,6 +295,7 @@ class LoginAdvancedFragment :
             loginFormUsernameLayout.visibility = VISIBLE
             loginFormPassLayout.visibility = VISIBLE
             loginFormHostLayout.visibility = VISIBLE
+            loginFormDomainSuffixLayout.isVisible = true
             loginFormPinLayout.visibility = GONE
             loginFormSymbolLayout.visibility = VISIBLE
             loginFormTokenLayout.visibility = GONE
@@ -301,6 +307,7 @@ class LoginAdvancedFragment :
             loginFormUsernameLayout.visibility = GONE
             loginFormPassLayout.visibility = GONE
             loginFormHostLayout.visibility = GONE
+            loginFormDomainSuffixLayout.isVisible = false
             loginFormPinLayout.visibility = VISIBLE
             loginFormSymbolLayout.visibility = VISIBLE
             loginFormTokenLayout.visibility = VISIBLE
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index ab56bd78..a17ad003 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -154,6 +154,7 @@ class LoginAdvancedPresenter @Inject constructor(
                             login = view?.formUsernameValue.orEmpty().trim(),
                             password = view?.formPassValue.orEmpty().trim(),
                             baseUrl = view?.formHostValue.orEmpty().trim(),
+                            domainSuffix = view?.formDomainSuffix.orEmpty().trim(),
                             symbol = view?.formSymbolValue.orEmpty().trim().getNormalizedSymbol(),
                         )
                         when (it.data.symbols.size) {
@@ -186,6 +187,7 @@ class LoginAdvancedPresenter @Inject constructor(
         val email = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
         val endpoint = view?.formHostValue.orEmpty()
+        val domainSuffix = view?.formDomainSuffix.orEmpty()
 
         val pin = view?.formPinValue.orEmpty()
         val symbol = view?.formSymbolValue.orEmpty()
@@ -193,8 +195,8 @@ class LoginAdvancedPresenter @Inject constructor(
 
         return when (Sdk.Mode.valueOf(view?.formLoginType.orEmpty())) {
             Sdk.Mode.HEBE -> studentRepository.getStudentsApi(pin, symbol, token)
-            Sdk.Mode.SCRAPPER -> studentRepository.getStudentsScrapper(
-                email, password, endpoint, symbol
+            Sdk.Mode.SCRAPPER -> studentRepository.getUserSubjectsFromScrapper(
+                email, password, endpoint, domainSuffix, symbol
             )
 
             Sdk.Mode.HYBRID -> studentRepository.getStudentsHybrid(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index 34062d93..afd33e3b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -12,6 +12,8 @@ interface LoginAdvancedView : BaseView {
 
     val formHostValue: String
 
+    val formDomainSuffix: String
+
     val formHostSymbol: String
 
     val formLoginType: String
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 43ba3fe1..1085ff50 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -45,6 +45,9 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString()))
             .orEmpty()
 
+    override val formDomainSuffix: String
+        get() = binding.loginFormDomainSuffix.text.toString()
+
     override val formHostSymbol: String
         get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString()))
             .orEmpty()
@@ -204,6 +207,10 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun showDomainSuffixInput(show: Boolean) {
+        binding.loginFormDomainSuffixLayout.isVisible = show
+    }
+
     override fun showOtherOptionsButton(show: Boolean) {
         binding.loginFormAdvancedButton.isVisible = show
     }
@@ -256,6 +263,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     override fun onResume() {
         super.onResume()
         presenter.updateUsernameLabel()
+        presenter.updateCustomDomainSuffixVisibility()
     }
 
     override fun openEmail(lastError: String) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index ed70eb12..85f42841 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -1,8 +1,13 @@
 package io.github.wulkanowy.ui.modules.login.form
 
 import androidx.core.net.toUri
-import io.github.wulkanowy.data.*
+import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.onResourceLoading
+import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -56,10 +61,17 @@ class LoginFormPresenter @Inject constructor(
             } else if (formUsernameValue == "jan@fakelog.cf" && formPassValue == "jan123") {
                 setCredentials("", "")
             }
+            updateCustomDomainSuffixVisibility()
             updateUsernameLabel()
         }
     }
 
+    fun updateCustomDomainSuffixVisibility() {
+        view?.run {
+            showDomainSuffixInput("customSuffix" in formHostValue)
+        }
+    }
+
     fun updateUsernameLabel() {
         view?.run {
             setUsernameLabel(if ("email" !in formHostValue) nicknameLabel else emailLabel)
@@ -91,6 +103,7 @@ class LoginFormPresenter @Inject constructor(
         val email = view?.formUsernameValue.orEmpty().trim()
         val password = view?.formPassValue.orEmpty().trim()
         val host = view?.formHostValue.orEmpty().trim()
+        val domainSuffix = view?.formDomainSuffix.orEmpty().trim()
         val symbol = view?.formHostSymbol.orEmpty().trim()
 
         if (!validateCredentials(email, password, host)) return
@@ -100,6 +113,7 @@ class LoginFormPresenter @Inject constructor(
                 email = email,
                 password = password,
                 scrapperBaseUrl = host,
+                domainSuffix = domainSuffix,
                 symbol = symbol
             )
         }
@@ -112,7 +126,7 @@ class LoginFormPresenter @Inject constructor(
                 }
             }
             .onResourceSuccess {
-                val loginData = LoginData(email, password, host, symbol)
+                val loginData = LoginData(email, password, host, domainSuffix, symbol)
                 when (it.symbols.size) {
                     0 -> view?.navigateToSymbol(loginData)
                     else -> view?.navigateToStudentSelect(loginData, it)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index e5c680d6..5fb26062 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -14,6 +14,8 @@ interface LoginFormView : BaseView {
 
     val formHostValue: String
 
+    val formDomainSuffix: String
+
     val formHostSymbol: String
 
     val nicknameLabel: String
@@ -56,6 +58,8 @@ interface LoginFormView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun showDomainSuffixInput(show: Boolean)
+
     fun showOtherOptionsButton(show: Boolean)
 
     fun showVersion()
diff --git 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
index 7e1fe3b2..70862e82 100644
--- 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
@@ -241,6 +241,7 @@ class LoginStudentSelectPresenter @Inject constructor(
                 item.student.mapToStudentWithSemesters(
                     user = registerUser,
                     symbol = item.symbol,
+                    scrapperDomainSuffix = loginData.domainSuffix,
                     unit = item.unit,
                     colors = appInfo.defaultColorsForAvatar,
                 )
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index 03ea95fa..91fe1ac3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -62,6 +62,7 @@ class LoginSymbolPresenter @Inject constructor(
                 email = loginData.login,
                 password = loginData.password,
                 scrapperBaseUrl = loginData.baseUrl,
+                domainSuffix = loginData.domainSuffix,
                 symbol = loginData.symbol.orEmpty(),
             )
         }.onEach { user ->
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
index 481cad11..889d64ea 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -16,6 +16,7 @@ fun Sdk.init(student: Student): Sdk {
         mobileBaseUrl = student.mobileBaseUrl
     } else {
         scrapperBaseUrl = student.scrapperBaseUrl
+        domainSuffix = student.scrapperDomainSuffix
         loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
     }
 
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index 43016db4..37551dec 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -172,7 +172,7 @@
                 android:layout_marginBottom="16dp"
                 android:hint="@string/login_host_hint"
                 android:orientation="vertical"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormTokenLayout"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormDomainSuffixLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
@@ -185,6 +185,31 @@
                     tools:ignore="Deprecated,LabelFor" />
             </com.google.android.material.textfield.TextInputLayout>
 
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormDomainSuffixLayout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_domain_suffix_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormSymbolLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginFormDomainSuffix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textShortMessage"
+                    android:maxLines="1" />
+            </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormTokenLayout"
                 style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
@@ -200,7 +225,7 @@
                 app:layout_constraintBottom_toTopOf="@+id/loginFormSymbolLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout">
+                app:layout_constraintTop_toBottomOf="@+id/loginFormDomainSuffixLayout">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/loginFormToken"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 3bfe0c34..39f3146c 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -239,6 +239,32 @@
                     tools:ignore="Deprecated,LabelFor" />
             </com.google.android.material.textfield.TextInputLayout>
 
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginFormDomainSuffixLayout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_domain_suffix_hint"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout"
+                tools:ignore="HardcodedText">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginFormDomainSuffix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:importantForAutofill="no"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    tools:targetApi="o" />
+            </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginFormAdvancedButton"
                 style="@style/Widget.Material3.Button.OutlinedButton"
@@ -264,7 +290,7 @@
                 android:layout_marginEnd="24dp"
                 android:text="@string/login_sign_in"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormHostLayout" />
+                app:layout_constraintTop_toBottomOf="@+id/loginFormDomainSuffixLayout" />
 
             <TextView
                 android:id="@+id/loginFormPrivacyLink"
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 04f4a12b..93209367 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -20,6 +20,7 @@
         <item>Gmina Ulan-Majorat - Platforma oświatowa</item>
         <item>Gmina Ozorków - Platforma edukacyjna</item>
         <item>Gmina Łopiennik Górny - Platforma oświatowa</item>
+        <item>Custom domain suffix</item>
         <item>Fakelog</item>
     </string-array>
     <string-array name="hosts_values">
@@ -42,6 +43,7 @@
         <item>https://vulcan.net.pl/?login</item>
         <item>https://vulcan.net.pl/?login</item>
         <item>https://vulcan.net.pl/?login</item>
+        <item>https://vulcan.net.pl/?email&amp;customSuffix</item>
         <item>https://fakelog.cf/?email</item>
     </string-array>
     <string-array name="hosts_symbols">
@@ -64,6 +66,7 @@
         <item>gminaulanmajorat</item>
         <item>gminaozorkow</item>
         <item>gminalopiennikgorny</item>
+        <item>Default</item>
         <item>powiatwulkanowy</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1eff9569..98c316cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
     <string name="login_password_hint">Password</string>
     <string name="login_host_hint">UONET+ register variant</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
index c8d95829..eac1389f 100644
--- a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -50,6 +50,7 @@ fun getSemesterPojo(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalD
 
 fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.HEBE) = Student(
     scrapperBaseUrl = "http://fakelog.cf",
+    scrapperDomainSuffix = "",
     email = "jan@fakelog.cf",
     certificateKey = "",
     classId = 0,
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
index 1d6dfaff..5a1877cc 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/GradeRepositoryTest.kt
@@ -296,6 +296,7 @@ class GradeRepositoryTest {
     private fun createGrades(grades: List<SdkGrade>): Grades = Grades(
         details = grades,
         summary = listOf(),
+        descriptive = emptyList(),
         isAverage = false,
         isPoints = false,
         isForAdults = false,
diff --git a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
index f58a5381..34a8fe99 100644
--- a/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/domain/GetMailboxByStudentUseCaseTest.kt
@@ -201,6 +201,7 @@ class GetMailboxByStudentUseCaseTest {
         schoolShortName: String = "test",
     ) = Student(
         scrapperBaseUrl = "http://fakelog.cf",
+        scrapperDomainSuffix = "",
         email = "jan@fakelog.cf",
         certificateKey = "",
         classId = 0,
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index b94002c0..31ea3322 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -47,6 +47,7 @@ class GradeAverageProviderTest {
 
     private val student = Student(
         scrapperBaseUrl = "",
+        scrapperDomainSuffix = "",
         mobileBaseUrl = "",
         loginType = "",
         loginMode = "SCRAPPER",
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index eb1f5300..a6440f72 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -130,7 +130,7 @@ class LoginFormPresenterTest {
     @Test
     fun loginTest() {
         coEvery {
-            repository.getUserSubjectsFromScrapper(any(), any(), any(), any())
+            repository.getUserSubjectsFromScrapper(any(), any(), any(), any(), any())
         } returns registerUser
 
         every { loginFormView.formUsernameValue } returns "@"
@@ -149,7 +149,7 @@ class LoginFormPresenterTest {
     @Test
     fun loginEmptyTest() {
         coEvery {
-            repository.getUserSubjectsFromScrapper(any(), any(), any(), any())
+            repository.getUserSubjectsFromScrapper(any(), any(), any(), any(), any())
         } returns registerUser
         every { loginFormView.formUsernameValue } returns "@"
         every { loginFormView.formPassValue } returns "123456"
@@ -167,7 +167,7 @@ class LoginFormPresenterTest {
     @Test
     fun loginEmptyTwiceTest() {
         coEvery {
-            repository.getUserSubjectsFromScrapper(any(), any(), any(), any())
+            repository.getUserSubjectsFromScrapper(any(), any(), any(), any(), any())
         } returns registerUser
         every { loginFormView.formUsernameValue } returns "@"
         every { loginFormView.formPassValue } returns "123456"
@@ -187,12 +187,7 @@ class LoginFormPresenterTest {
     fun loginErrorTest() {
         val testException = IOException("test")
         coEvery {
-            repository.getUserSubjectsFromScrapper(
-                any(),
-                any(),
-                any(),
-                any()
-            )
+            repository.getUserSubjectsFromScrapper(any(), any(), any(), any(), any())
         } throws testException
         every { loginFormView.formUsernameValue } returns "@"
         every { loginFormView.formPassValue } returns "123456"
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index da292c51..06aabec7 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -55,6 +55,7 @@ class LoginStudentSelectPresenterTest {
         password = "",
         baseUrl = "",
         symbol = null,
+        domainSuffix = "",
     )
 
     private val subject = RegisterStudent(

From fa44295d59ffa0b480f43b46b3139f10df88ebc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 1 Jun 2023 23:37:01 +0200
Subject: [PATCH 342/429] New Crowdin updates (#2231)

---
 app/src/main/res/values-cs/strings.xml     | 1 +
 app/src/main/res/values-da-rDK/strings.xml | 1 +
 app/src/main/res/values-de/strings.xml     | 1 +
 app/src/main/res/values-es-rES/strings.xml | 1 +
 app/src/main/res/values-pl/strings.xml     | 1 +
 app/src/main/res/values-ru/strings.xml     | 1 +
 app/src/main/res/values-sk/strings.xml     | 1 +
 app/src/main/res/values-uk/strings.xml     | 1 +
 8 files changed, 8 insertions(+)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index f8c19dff..964329da 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Přihlášení, číslo PESEL nebo e-mail</string>
     <string name="login_password_hint">Heslo</string>
     <string name="login_host_hint">Variace deníku UONET+</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybridní</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index b9de57f7..5c7d02a0 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
     <string name="login_password_hint">Password</string>
     <string name="login_host_hint">UONET+ register variant</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 500553e2..96423e35 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Anmeldung, PESEL oder e-mail</string>
     <string name="login_password_hint">Passwort</string>
     <string name="login_host_hint">UONET+ Registervariante</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybride</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b9de57f7..5c7d02a0 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
     <string name="login_password_hint">Password</string>
     <string name="login_host_hint">UONET+ register variant</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 207b12e9..2c707797 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Login, PESEL lub adres e-mail</string>
     <string name="login_password_hint">Hasło</string>
     <string name="login_host_hint">Odmiana dziennika UONET+</string>
+    <string name="login_domain_suffix_hint">Niestandardowy sufiks domeny</string>
     <string name="login_type_api">Mobilne API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrydowe</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9029f4b9..eb8be002 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Логин, PESEL или электронная почта</string>
     <string name="login_password_hint">Пароль</string>
     <string name="login_host_hint">Тип дневника UONET+</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Мобильный API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 950eb01e..bcbd832a 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Prihlásenie, číslo PESEL alebo e-mail</string>
     <string name="login_password_hint">Heslo</string>
     <string name="login_host_hint">Variácia denníka UONET+</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybridné</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index be136ea2..30a587cc 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -37,6 +37,7 @@
     <string name="login_login_pesel_email_hint">Логін, PESEL або e-mail</string>
     <string name="login_password_hint">Пароль</string>
     <string name="login_host_hint">Тип щоденника UONET+</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
     <string name="login_type_api">Мobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>

From fecd5c707d6005e37117d231d612ee59a92126c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 1 Jun 2023 23:43:01 +0200
Subject: [PATCH 343/429] Version 2.0.8

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 2 +-
 app/src/main/res/values/api_hosts.xml             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 19fbf6de..000cc09c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 129
-        versionName "2.0.7"
+        versionCode 130
+        versionName "2.0.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -196,7 +196,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.8-SNAPSHOT'
+    implementation 'io.github.wulkanowy:sdk:2.0.8'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 066485d3..e881cfda 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,4 +1,4 @@
-Wersja 2.0.7
+Wersja 2.0.8
 
 — poprawiliśmy wyświetlanie kilku rodzajów zmian w planie lekcji
 — dodaliśmy limit znaków w okienku usprawiedliwiania
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index 93209367..522b6e11 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -20,7 +20,7 @@
         <item>Gmina Ulan-Majorat - Platforma oświatowa</item>
         <item>Gmina Ozorków - Platforma edukacyjna</item>
         <item>Gmina Łopiennik Górny - Platforma oświatowa</item>
-        <item>Custom domain suffix</item>
+        <item>@string/login_domain_suffix_hint</item>
         <item>Fakelog</item>
     </string-array>
     <string-array name="hosts_values">

From 2f749a690b4293a802c6fc00063c41a42c5008c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 23:18:23 +0000
Subject: [PATCH 344/429] Bump androidx.fragment:fragment-ktx from 1.5.7 to
 1.6.0 (#2239)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 000cc09c..2231da52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,7 +207,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.7.2"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.7"
+    implementation "androidx.fragment:fragment-ktx:1.6.0"
     implementation "androidx.annotation:annotation:1.6.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From f20ffe44d5b16c9954d9738b8f44214968f27853 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 23:24:27 +0000
Subject: [PATCH 345/429] Bump kotlin_version from 1.8.21 to 1.8.22 (#2238)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 69c0905a..c5a48ec9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.8.21'
+        kotlin_version = '1.8.22'
         about_libraries = '10.7.0'
         hilt_version = "2.46.1"
     }

From 8913b22a200685915c4da82a10802ab5ad0a7990 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 23:25:46 +0000
Subject: [PATCH 346/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2237)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c5a48ec9..757910b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.1.0.3113"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.2.0.3129"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From df8849639b3baa8826eafc3a2c1c7a8eccdc510d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jun 2023 10:56:32 +0000
Subject: [PATCH 347/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2242)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 757910b1..150bd4cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.2.0.3129"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.2.1.3168"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From 03cd3aeab78cf3c3991cb28099cca6d67d5d2f1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:53:21 +0000
Subject: [PATCH 348/429] Bump com.google.firebase:firebase-bom from 32.1.0 to
 32.2.0 (#2259)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2231da52..46f709c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -252,7 +252,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.1.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 6e7c12a118775f9590a57e99ac6a4064116505d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:53:38 +0000
Subject: [PATCH 349/429] Bump com.google.firebase:firebase-crashlytics-gradle
 from 2.9.5 to 2.9.7 (#2258)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 150bd4cf..62f6389f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.0.300'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.2.1.3168"

From bb79b33b6d40d0d208b7fe546c32a04a09d02446 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:53:58 +0000
Subject: [PATCH 350/429] Bump com.google.android.gms:play-services-ads from
 22.1.0 to 22.2.0 (#2256)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 46f709c8..4589331f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -259,7 +259,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-config-ktx'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:22.1.0'
+    playImplementation 'com.google.android.gms:play-services-ads:22.2.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.301'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'

From dbe608f2dd6aa9ab616c40a5d0b377a88d77fe37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:54:26 +0000
Subject: [PATCH 351/429] Bump about_libraries from 10.7.0 to 10.8.0 (#2249)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 62f6389f..d12932db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.22'
-        about_libraries = '10.7.0'
+        about_libraries = '10.8.0'
         hilt_version = "2.46.1"
     }
     repositories {

From 29a36aaf6ed30318e2a8feb4666a0739daed822d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 18:11:57 +0000
Subject: [PATCH 352/429] Bump com.huawei.hms:hianalytics from 6.10.0.301 to
 6.10.0.302 (#2253)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4589331f..54cc97ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -261,7 +261,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:22.2.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.301'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.302'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From 8564e12b015b151f3ead4b13f7ae4fb5d4c8358d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 19:15:06 +0000
Subject: [PATCH 353/429] Bump com.huawei.agconnect:agcp from 1.9.0.300 to
 1.9.1.300 (#2254)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d12932db..75191aad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.huawei.agconnect:agcp:1.9.0.300'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"

From d0819928f3b61e4d020d2dd9b78d10fd9b32d4d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 19:15:21 +0000
Subject: [PATCH 354/429] Bump com.huawei.agconnect:agconnect-crash from
 1.9.0.300 to 1.9.1.300 (#2252)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 54cc97ff..fdb8d20f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -262,7 +262,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:22.2.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.302'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From 88ea753fc69bba48fb367a9535e28c05e14c6b6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 19:15:34 +0000
Subject: [PATCH 355/429] Bump coroutines from 1.7.1 to 1.7.2 (#2251)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index fdb8d20f..9e074371 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -192,7 +192,7 @@ ext {
     room = "2.5.1"
     chucker = "3.5.2"
     mockk = "1.13.5"
-    coroutines = "1.7.1"
+    coroutines = "1.7.2"
 }
 
 dependencies {

From 86c7de6595fc6f71dbe616bffaa5474d1bdb215e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 19:15:48 +0000
Subject: [PATCH 356/429] Bump room from 2.5.1 to 2.5.2 (#2250)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9e074371..f3ea03c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -189,7 +189,7 @@ huaweiPublish {
 ext {
     work_manager = "2.8.1"
     android_hilt = "1.0.0"
-    room = "2.5.1"
+    room = "2.5.2"
     chucker = "3.5.2"
     mockk = "1.13.5"
     coroutines = "1.7.2"

From 05741761a2117667d848d171b43096287d1aa811 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 20:08:56 +0000
Subject: [PATCH 357/429] Bump kotlin_version from 1.8.22 to 1.9.0 (#2255)

---
 app/build.gradle                                  | 15 +++++----------
 .../wulkanowy/data/db/dao/AdminMessageDao.kt      |  2 +-
 build.gradle                                      |  3 ++-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f3ea03c1..596393f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
@@ -33,14 +34,6 @@ android {
             firebase_enabled: project.hasProperty("enableFirebase"),
             admob_project_id: ""
         ]
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += [
-                    "room.schemaLocation": "$projectDir/schemas".toString(),
-                    "room.incremental"   : "true"
-                ]
-            }
-        }
 
         buildConfigField "String", "SINGLE_SUPPORT_AD_ID", "null"
         buildConfigField "String", "DASHBOARD_TILE_AD_ID", "null"
@@ -156,7 +149,9 @@ android {
 kapt {
     correctErrorTypes true
 }
-
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas".toString())
+}
 kotlin {
     jvmToolchain(11)
 }
@@ -228,7 +223,7 @@ dependencies {
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
-    kapt "androidx.room:room-compiler:$room"
+    ksp "androidx.room:room-compiler:$room"
 
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt
index 87f4812d..2b4cb597 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AdminMessageDao.kt
@@ -22,4 +22,4 @@ abstract class AdminMessageDao : BaseDao<AdminMessage> {
         deleteAll(oldMessages)
         insertAll(newMessages)
     }
-}
\ No newline at end of file
+}
diff --git a/build.gradle b/build.gradle
index 75191aad..6a378d48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.8.22'
+        kotlin_version = '1.9.0'
         about_libraries = '10.8.0'
         hilt_version = "2.46.1"
     }
@@ -13,6 +13,7 @@ buildscript {
     dependencies {
         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.11"
         classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'

From ef72218906b6a87d7a909fb3a561d99307276c17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 21:30:37 +0000
Subject: [PATCH 358/429] Bump org.gradle.toolchains.foojay-resolver-convention
 (#2264)

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index a69aaa95..af9bb737 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.6.0'
 }
 include ':app'

From c0161f38c61dc93a338b5907b374a48280e65031 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 21:33:17 +0000
Subject: [PATCH 359/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2262)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6a378d48..8bdcdedf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.2.1.3168"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.0.3225"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From e79c5d4d2bc9b7cb9359377fb7709bdc2633f8c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 21:36:06 +0000
Subject: [PATCH 360/429] Bump hilt_version from 2.46.1 to 2.47 (#2261)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8bdcdedf..dba02152 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.9.0'
         about_libraries = '10.8.0'
-        hilt_version = "2.46.1"
+        hilt_version = "2.47"
     }
     repositories {
         mavenCentral()

From 5b2e2ffb34820e475a4553eb1795b070a4f0a789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 25 Jul 2023 11:37:43 +0200
Subject: [PATCH 361/429] Remove tests deprecations (#2260)

---
 app/build.gradle                              |  2 +-
 .../io/github/wulkanowy/MainCoroutineRule.kt  | 12 +++----
 .../db/migrations/AbstractMigrationTest.kt    |  3 +-
 .../data/db/migrations/Migration12Test.kt     | 18 +++++-----
 .../data/db/migrations/Migration13Test.kt     | 34 +++++++++++--------
 5 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 596393f5..f8603cc8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'com.google.gms.google-services'
@@ -11,6 +10,7 @@ apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'com.huawei.agconnect'
+apply plugin: 'kotlin-kapt'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
diff --git a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt b/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
index 10724868..543c9540 100644
--- a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
+++ b/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
@@ -2,7 +2,8 @@ package io.github.wulkanowy
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.TestDispatcher
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
 import org.junit.rules.TestWatcher
@@ -10,17 +11,14 @@ import org.junit.runner.Description
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class MainCoroutineRule(
-    private val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
+    private val testDispatcher: TestDispatcher = UnconfinedTestDispatcher()
 ) : TestWatcher() {
 
-    override fun starting(description: Description?) {
-        super.starting(description)
+    override fun starting(description: Description) {
         Dispatchers.setMain(testDispatcher)
     }
 
-    override fun finished(description: Description?) {
-        super.finished(description)
+    override fun finished(description: Description) {
         Dispatchers.resetMain()
-        testDispatcher.cleanupTestCoroutines()
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
index 18249ba8..18ff9339 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/AbstractMigrationTest.kt
@@ -22,7 +22,8 @@ abstract class AbstractMigrationTest {
     @get:Rule
     val helper: MigrationTestHelper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java.canonicalName,
+        AppDatabase::class.java,
+        listOf(Migration55()),
         FrameworkSQLiteOpenHelperFactory()
     )
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
index f614c8ca..54c73e20 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@@ -22,12 +22,12 @@ class Migration12Test : AbstractMigrationTest() {
     fun twoNotRelatedStudents() {
         helper.createDatabase(dbName, 11).apply {
             // user 1
-            createStudent(this, 1, true)
+            createStudent(this, 1)
             createSemester(this, 1, false, 5, 1)
             createSemester(this, 1, true, 5, 2)
 
             // user 2
-            createStudent(this, 2, true)
+            createStudent(this, 2)
             createSemester(this, 2, false, 6, 1)
             createSemester(this, 2, true, 6, 2)
             close()
@@ -56,9 +56,9 @@ class Migration12Test : AbstractMigrationTest() {
     fun removeStudentsWithoutClassId() {
         helper.createDatabase(dbName, 11).apply {
             // user 1
-            createStudent(this, 1, true)
+            createStudent(this, 1)
             createSemester(this, 1, false, 0, 2)
-            createStudent(this, 2, true)
+            createStudent(this, 2)
             createSemester(this, 2, true, 1, 2)
             close()
         }
@@ -81,11 +81,11 @@ class Migration12Test : AbstractMigrationTest() {
     fun ensureThereIsOnlyOneCurrentStudent() {
         helper.createDatabase(dbName, 11).apply {
             // user 1
-            createStudent(this, 1, true)
+            createStudent(this, 1)
             createSemester(this, 1, true, 5, 2)
-            createStudent(this, 2, true)
+            createStudent(this, 2)
             createSemester(this, 2, true, 6, 2)
-            createStudent(this, 3, true)
+            createStudent(this, 3)
             createSemester(this, 3, false, 7, 2)
             close()
         }
@@ -112,7 +112,7 @@ class Migration12Test : AbstractMigrationTest() {
         db.close()
     }
 
-    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int, isCurrent: Boolean) {
+    private fun createStudent(db: SupportSQLiteDatabase, studentId: Int) {
         db.insert("Students", CONFLICT_FAIL, ContentValues().apply {
             put("endpoint", "https://fakelog.cf")
             put("loginType", "STANDARD")
@@ -123,7 +123,7 @@ class Migration12Test : AbstractMigrationTest() {
             put("student_name", "Jan Kowalski")
             put("school_id", "000123")
             put("school_name", "")
-            put("is_current", isCurrent)
+            put("is_current", true)
             put("registration_date", "0")
         })
     }
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index b0c03fb1..9ba36876 100644
--- a/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -95,22 +95,22 @@ class Migration13Test : AbstractMigrationTest() {
     fun markAtLeastAndOnlyOneSemesterAtCurrent() {
         helper.createDatabase(dbName, 12).apply {
             createStudent(this, 1, "", 5)
-            createSemester(this, 1, 5, 1, 1, false)
-            createSemester(this, 1, 5, 2, 1, false)
-            createSemester(this, 1, 5, 3, 2, false)
-            createSemester(this, 1, 5, 4, 2, false)
+            createSemester(this, 1, 1, 1, false)
+            createSemester(this, 1, 2, 1, false)
+            createSemester(this, 1, 3, 2, false)
+            createSemester(this, 1, 4, 2, false)
 
             createStudent(this, 2, "", 5)
-            createSemester(this, 2, 5, 5, 5, true)
-            createSemester(this, 2, 5, 6, 5, true)
-            createSemester(this, 2, 5, 7, 55, true)
-            createSemester(this, 2, 5, 8, 55, true)
+            createSemester(this, 2, 5, 5, true)
+            createSemester(this, 2, 6, 5, true)
+            createSemester(this, 2, 7, 55, true)
+            createSemester(this, 2, 8, 55, true)
 
             createStudent(this, 3, "", 5)
-            createSemester(this, 3, 5, 11, 99, false)
-            createSemester(this, 3, 5, 12, 99, false)
-            createSemester(this, 3, 5, 13, 100, false)
-            createSemester(this, 3, 5, 14, 100, true)
+            createSemester(this, 3, 11, 99, false)
+            createSemester(this, 3, 12, 99, false)
+            createSemester(this, 3, 13, 100, false)
+            createSemester(this, 3, 14, 100, true)
             close()
         }
 
@@ -198,7 +198,13 @@ class Migration13Test : AbstractMigrationTest() {
         })
     }
 
-    private fun createSemester(db: SupportSQLiteDatabase, studentId: Int, classId: Int, semesterId: Int, diaryId: Int, isCurrent: Boolean = false) {
+    private fun createSemester(
+        db: SupportSQLiteDatabase,
+        studentId: Int,
+        semesterId: Int,
+        diaryId: Int,
+        isCurrent: Boolean = false
+    ) {
         db.insert("Semesters", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
             put("student_id", studentId)
             put("diary_id", diaryId)
@@ -206,7 +212,7 @@ class Migration13Test : AbstractMigrationTest() {
             put("semester_id", semesterId)
             put("semester_name", "1")
             put("is_current", isCurrent)
-            put("class_id", classId)
+            put("class_id", 5)
             put("unit_id", "99")
         })
     }

From 398bc513fb6e6e7284a1e1126f01af755ade050f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jul 2023 10:00:31 +0000
Subject: [PATCH 362/429] Bump about_libraries from 10.8.0 to 10.8.3 (#2263)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dba02152..9584caac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.0'
-        about_libraries = '10.8.0'
+        about_libraries = '10.8.3'
         hilt_version = "2.47"
     }
     repositories {

From b2969264231a65109ed70b24c7636c0c3425802a Mon Sep 17 00:00:00 2001
From: Bartosz Bieniek <itsbk20@gmail.com>
Date: Tue, 25 Jul 2023 23:05:14 +0200
Subject: [PATCH 363/429] Timetable widget improvements (#2219)

---
 .../timetablewidget/TimetableWidgetFactory.kt |   8 +-
 .../TimetableWidgetProvider.kt                | 270 +++++++++------
 .../background_timetable_widget_avatar.xml    |   2 +-
 .../background_widget_item_timetable.xml      |   2 +-
 .../res/drawable/ic_timetable_widget_swap.xml |   4 +-
 .../main/res/drawable/ic_widget_chevron.xml   |   4 +-
 .../drawable/img_timetable_widget_preview.png | Bin 21111 -> 76378 bytes
 .../layout-v31/widget_timetable_preview.xml   | 321 ++++++++++++++++--
 .../main/res/layout/item_widget_timetable.xml |  20 +-
 app/src/main/res/layout/widget_timetable.xml  |  89 ++---
 .../res/xml/provider_widget_timetable.xml     |  10 +-
 11 files changed, 524 insertions(+), 206 deletions(-)
 mode change 100755 => 100644 app/src/main/res/drawable/img_timetable_widget_preview.png

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index 9c5abe1c..d545413d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -124,14 +124,12 @@ class TimetableWidgetFactory(
 
         val lessonStartTime = lesson.start.toFormattedString(TIME_FORMAT_STYLE)
         val lessonEndTime = lesson.end.toFormattedString(TIME_FORMAT_STYLE)
-        val roomText = "${context.getString(R.string.timetable_room)} ${lesson.room}"
 
         val remoteViews = RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
             setTextViewText(R.id.timetableWidgetItemNumber, lesson.number.toString())
             setTextViewText(R.id.timetableWidgetItemTimeStart, lessonStartTime)
             setTextViewText(R.id.timetableWidgetItemTimeFinish, lessonEndTime)
             setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
-            setTextViewText(R.id.timetableWidgetItemRoom, roomText)
             setTextViewText(R.id.timetableWidgetItemTeacher, lesson.teacher)
             setTextViewText(R.id.timetableWidgetItemDescription, lesson.info)
             setOnClickFillInIntent(R.id.timetableWidgetItemContainer, Intent())
@@ -140,6 +138,12 @@ class TimetableWidgetFactory(
         updateTheme()
         clearLessonStyles(remoteViews)
 
+        if (lesson.room.isBlank()) {
+            remoteViews.setViewVisibility(R.id.timetableWidgetItemRoom, GONE)
+        } else {
+            remoteViews.setTextViewText(R.id.timetableWidgetItemRoom, lesson.room)
+        }
+
         when {
             lesson.canceled -> applyCancelledLessonStyles(remoteViews)
             lesson.changes or lesson.info.isNotBlank() -> applyChangedLessonStyles(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 624ca30f..cc48539a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.graphics.Bitmap
 import android.widget.RemoteViews
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.DrawableCompat
@@ -76,110 +77,151 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         GlobalScope.launch {
             when (intent.action) {
-                ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
-                ACTION_APPWIDGET_DELETED -> onDelete(intent)
+                ACTION_APPWIDGET_UPDATE -> onWidgetUpdate(context, intent)
+                ACTION_APPWIDGET_DELETED -> onWidgetDeleted(intent)
             }
         }
     }
 
-    private suspend fun onUpdate(context: Context, intent: Intent) {
-        if (intent.getStringExtra(EXTRA_BUTTON_TYPE) == null) {
-            val isFromConfigure = intent.getBooleanExtra(EXTRA_FROM_CONFIGURE, false)
-            val appWidgetIds = intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS) ?: return
+    private suspend fun onWidgetUpdate(context: Context, intent: Intent) {
+        val pressedButton = intent.getPressedButton()
 
-            appWidgetIds.forEach { appWidgetId ->
-                val student =
-                    getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
-                val savedDataEpochDay = sharedPref.getLong(getDateWidgetKey(appWidgetId), 0)
-
-                val dateToLoad = if (isFromConfigure && savedDataEpochDay != 0L) {
-                    LocalDate.ofEpochDay(savedDataEpochDay)
-                } else {
-                    getWidgetDefaultDateToLoad(appWidgetId)
-                }
-
-                updateWidget(context, appWidgetId, dateToLoad, student)
-            }
+        if (pressedButton == null) {
+            val updatedWidgetIds = intent.getWidgetIds() ?: return
+            updatedWidgetIds.forEach { updateWidgetLayout(context, it) }
         } 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 savedDate =
-                LocalDate.ofEpochDay(sharedPref.getLong(getDateWidgetKey(toggledWidgetId), 0))
-            val date = when (buttonType) {
-                BUTTON_RESET -> getWidgetDefaultDateToLoad(toggledWidgetId)
-                BUTTON_NEXT -> savedDate.nextSchoolDay
-                BUTTON_PREV -> savedDate.previousSchoolDay
-                else -> getWidgetDefaultDateToLoad(toggledWidgetId)
-            }
-            if (!buttonType.isNullOrBlank()) {
-                analytics.logEvent(
-                    "changed_timetable_widget_day", "button" to buttonType
-                )
-            }
-            updateWidget(context, toggledWidgetId, date, student)
+            val widgetId = intent.getToggledWidgetId() ?: return
+            reportChangedDay(pressedButton)
+            updateSavedWidgetDate(widgetId, pressedButton)
+            updateWidgetLayout(context, widgetId)
         }
     }
 
-    private fun onDelete(intent: Intent) {
-        val appWidgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID, 0)
+    private fun Intent.getPressedButton(): String? {
+        return getStringExtra(EXTRA_BUTTON_TYPE)
+    }
 
-        if (appWidgetId != 0) {
-            with(sharedPref) {
-                delete(getStudentWidgetKey(appWidgetId))
-                delete(getDateWidgetKey(appWidgetId))
-            }
+    private fun Intent.getWidgetIds(): IntArray? {
+        return getIntArrayExtra(EXTRA_APPWIDGET_IDS)
+    }
+
+    private fun Intent.getToggledWidgetId(): Int? {
+        val toggledWidgetId = getIntExtra(EXTRA_TOGGLED_WIDGET_ID, INVALID_APPWIDGET_ID)
+        return toggledWidgetId.takeIf { it != INVALID_APPWIDGET_ID }
+    }
+
+    private fun reportChangedDay(buttonType: String) {
+        if (buttonType.isNotBlank()) {
+            analytics.logEvent("changed_timetable_widget_day", "button" to buttonType)
         }
     }
 
-    private fun updateWidget(
-        context: Context, appWidgetId: Int, date: LocalDate, student: Student?
+    private fun updateSavedWidgetDate(widgetId: Int, buttonType: String) {
+        val savedDate = getSavedWidgetDate(widgetId)
+        val newDate = savedDate?.let { getNewDate(it, widgetId, buttonType) }
+            ?: getWidgetDefaultDateToLoad(widgetId)
+        setWidgetDate(widgetId, newDate)
+    }
+
+    private fun getSavedWidgetDate(widgetId: Int): LocalDate? {
+        val epochDay = sharedPref.getLong(getDateWidgetKey(widgetId), 0)
+        return if (epochDay == 0L) null else LocalDate.ofEpochDay(epochDay)
+    }
+
+    private fun getNewDate(
+        currentDate: LocalDate,
+        widgetId: Int,
+        selectedButton: String
+    ): LocalDate {
+        return when (selectedButton) {
+            BUTTON_NEXT -> currentDate.nextSchoolDay
+            BUTTON_PREV -> currentDate.previousSchoolDay
+            else -> getWidgetDefaultDateToLoad(widgetId)
+        }
+    }
+
+    private fun setWidgetDate(widgetId: Int, dateToSet: LocalDate) {
+        val widgetDateKey = getDateWidgetKey(widgetId)
+        sharedPref.putLong(widgetDateKey, dateToSet.toEpochDay(), true)
+    }
+
+    private fun getWidgetDefaultDateToLoad(widgetId: Int): LocalDate {
+        val lastLessonEndDateTime = getLastLessonDateTime(widgetId)
+
+        val todayDate = LocalDate.now()
+        val isLastLessonToday = lastLessonEndDateTime.toLocalDate() == todayDate
+        val isEndOfLessons = LocalDateTime.now() > lastLessonEndDateTime
+
+        return if (isLastLessonToday && isEndOfLessons) {
+            todayDate.nextSchoolDay
+        } else {
+            todayDate.nextOrSameSchoolDay
+        }
+    }
+
+    private fun getLastLessonDateTime(widgetId: Int): LocalDateTime {
+        val lastLessonTimestamp = sharedPref
+            .getLong(getTodayLastLessonEndDateTimeWidgetKey(widgetId), 0)
+        return LocalDateTime.ofEpochSecond(lastLessonTimestamp, 0, ZoneOffset.UTC)
+    }
+
+    private suspend fun updateWidgetLayout(
+        context: Context, widgetId: Int
     ) {
-        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 adapterIntent = Intent(context, TimetableWidgetService::class.java).apply {
-            putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
-            action = appWidgetId.toString() //make Intent unique
-        }
-        val appIntent = PendingIntent.getActivity(
-            context,
-            TIMETABLE_PENDING_INTENT_ID,
-            SplashActivity.getStartIntent(context, Destination.Timetable()),
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-        )
+        val widgetRemoteViews = RemoteViews(context.packageName, R.layout.widget_timetable)
 
+        // Apply the click action intent
+        val appIntent = createPendingAppIntent(context)
+        widgetRemoteViews.setPendingIntentTemplate(R.id.timetableWidgetList, appIntent)
+
+        // Display saved date
+        val date = getSavedWidgetDate(widgetId) ?: getWidgetDefaultDateToLoad(widgetId)
         val formattedDate = date.toFormattedString("EEE, dd.MM").capitalise()
-        val remoteView = RemoteViews(context.packageName, R.layout.widget_timetable).apply {
-            setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
-            setTextViewText(R.id.timetableWidgetDate, formattedDate)
-            setRemoteAdapter(R.id.timetableWidgetList, adapterIntent)
+        widgetRemoteViews.setTextViewText(R.id.timetableWidgetDate, formattedDate)
+
+        // Apply intents to the date switcher buttons
+        val nextNavIntent = createNavButtonIntent(context, widgetId, widgetId, BUTTON_NEXT)
+        val prevNavIntent = createNavButtonIntent(context, -widgetId, widgetId, BUTTON_PREV)
+        val resetNavIntent =
+            createNavButtonIntent(context, Int.MAX_VALUE - widgetId, widgetId, BUTTON_RESET)
+        widgetRemoteViews.run {
             setOnClickPendingIntent(R.id.timetableWidgetNext, nextNavIntent)
             setOnClickPendingIntent(R.id.timetableWidgetPrev, prevNavIntent)
             setOnClickPendingIntent(R.id.timetableWidgetDate, resetNavIntent)
-            setPendingIntentTemplate(R.id.timetableWidgetList, appIntent)
         }
 
-        student?.let {
-            setupAccountView(context, student, remoteView, appWidgetId)
+        // Setup the lesson list adapter
+        val lessonListAdapterIntent = createLessonListAdapterIntent(context, widgetId)
+        // --- Ensure the selected date is stored in the shared preferences,
+        // --- on which the TimetableWidgetFactory relies
+        setWidgetDate(widgetId, date)
+        // ---
+        widgetRemoteViews.apply {
+            setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
+            setRemoteAdapter(R.id.timetableWidgetList, lessonListAdapterIntent)
         }
 
-        with(sharedPref) {
-            putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
+        // Setup profile picture
+        getWidgetStudent(widgetId)?.let { student ->
+            setupAccountView(context, student, widgetRemoteViews, widgetId)
         }
 
+        // Apply updates
         with(appWidgetManager) {
-            partiallyUpdateAppWidget(appWidgetId, remoteView)
-            notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
+            partiallyUpdateAppWidget(widgetId, widgetRemoteViews)
+            notifyAppWidgetViewDataChanged(widgetId, R.id.timetableWidgetList)
         }
 
         Timber.d("TimetableWidgetProvider updated")
     }
 
-    private fun createNavIntent(
+    private fun createPendingAppIntent(context: Context) = PendingIntent.getActivity(
+        context, TIMETABLE_PENDING_INTENT_ID,
+        SplashActivity.getStartIntent(context, Destination.Timetable()),
+        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+    )
+
+    private fun createNavButtonIntent(
         context: Context, code: Int, appWidgetId: Int, buttonType: String
     ) = PendingIntent.getBroadcast(
         context, code, Intent(context, TimetableWidgetProvider::class.java).apply {
@@ -189,6 +231,17 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         }, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
     )
 
+    private fun createLessonListAdapterIntent(context: Context, widgetId: Int) =
+        Intent(context, TimetableWidgetService::class.java).apply {
+            putExtra(EXTRA_APPWIDGET_ID, widgetId)
+            action = widgetId.toString() //make Intent unique
+        }
+
+    private suspend fun getWidgetStudent(widgetId: Int): Student? {
+        val studentId = sharedPref.getLong(getStudentWidgetKey(widgetId), 0)
+        return getStudent(studentId, widgetId)
+    }
+
     private suspend fun getStudent(studentId: Long, appWidgetId: Int) = try {
         val students = studentRepository.getSavedStudents(false)
         val student = students.singleOrNull { it.student.id == studentId }?.student
@@ -199,6 +252,7 @@ class TimetableWidgetProvider : BroadcastReceiver() {
                     sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
                 }
             }
+
             else -> null
         }
     } catch (e: Exception) {
@@ -208,60 +262,64 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         null
     }
 
-    private fun getWidgetDefaultDateToLoad(appWidgetId: Int): LocalDate {
-        val lastLessonEndTimestamp =
-            sharedPref.getLong(getTodayLastLessonEndDateTimeWidgetKey(appWidgetId), 0)
-        val lastLessonEndDateTime =
-            LocalDateTime.ofEpochSecond(lastLessonEndTimestamp, 0, ZoneOffset.UTC)
+    private fun setupAccountView(
+        context: Context, student: Student, remoteViews: RemoteViews, widgetId: Int
+    ) {
+        val accountInitials = getAccountInitials(student.nickOrName)
+        val accountPickerPendingIntent = createAccountPickerPendingIntent(context, widgetId)
 
-        val todayDate = LocalDate.now()
-        val isLastLessonEndDateNow = lastLessonEndDateTime.toLocalDate() == todayDate
-        val isLastLessonEndDateAfterNowTime = LocalDateTime.now() > lastLessonEndDateTime
+        getAvatarBackgroundBitmap(context, student.avatarColor)?.let {
+            remoteViews.setImageViewBitmap(R.id.timetableWidgetAccountBackground, it)
+        }
 
-        return if (isLastLessonEndDateNow && isLastLessonEndDateAfterNowTime) {
-            todayDate.nextSchoolDay
-        } else {
-            todayDate.nextOrSameSchoolDay
+        remoteViews.apply {
+            setTextViewText(R.id.timetableWidgetAccountInitials, accountInitials)
+            setOnClickPendingIntent(R.id.timetableWidgetAccount, accountPickerPendingIntent)
         }
     }
 
-    private fun setupAccountView(
-        context: Context,
-        student: Student,
-        remoteViews: RemoteViews,
-        appWidgetId: Int
-    ) {
-        val accountInitials = student.nickOrName
-            .split(" ")
-            .mapNotNull { it.firstOrNull() }.take(2)
-            .joinToString(separator = "").uppercase()
+    private fun getAccountInitials(name: String): String {
+        val firstLetters = name.split(" ").mapNotNull { it.firstOrNull() }
+        return firstLetters.joinToString(separator = "").uppercase()
+    }
 
-        val accountPickerIntent = PendingIntent.getActivity(
+    private fun createAccountPickerPendingIntent(context: Context, widgetId: Int) =
+        PendingIntent.getActivity(
             context,
-            -Int.MAX_VALUE + appWidgetId,
+            -Int.MAX_VALUE + widgetId,
             Intent(context, TimetableWidgetConfigureActivity::class.java).apply {
                 addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)
-                putExtra(EXTRA_APPWIDGET_ID, appWidgetId)
+                putExtra(EXTRA_APPWIDGET_ID, widgetId)
                 putExtra(EXTRA_FROM_PROVIDER, true)
             },
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
         )
 
-        // Create background bitmap
+    private fun getAvatarBackgroundBitmap(context: Context, avatarColor: Long): Bitmap? {
         val avatarDrawableResource = R.drawable.background_timetable_widget_avatar
-        AppCompatResources.getDrawable(context, avatarDrawableResource)?.let { drawable ->
+        return AppCompatResources.getDrawable(context, avatarDrawableResource)?.let { drawable ->
             val screenDensity = context.resources.displayMetrics.density
             val avatarSize = (48 * screenDensity).toInt()
-            val backgroundBitmap = DrawableCompat.wrap(drawable).run {
-                DrawableCompat.setTint(this, student.avatarColor.toInt())
+            DrawableCompat.wrap(drawable).run {
+                DrawableCompat.setTint(this, avatarColor.toInt())
                 toBitmap(avatarSize, avatarSize)
             }
-            remoteViews.setImageViewBitmap(R.id.timetableWidgetAccountBackground, backgroundBitmap)
         }
+    }
 
-        remoteViews.apply {
-            setTextViewText(R.id.timetableWidgetAccountInitials, accountInitials)
-            setOnClickPendingIntent(R.id.timetableWidgetAccount, accountPickerIntent)
+    private fun onWidgetDeleted(intent: Intent) {
+        val deletedWidgetId = intent.getWidgetId()
+        deleteWidgetPreferences(deletedWidgetId)
+    }
+
+    private fun Intent.getWidgetId(): Int {
+        return getIntExtra(EXTRA_APPWIDGET_ID, INVALID_APPWIDGET_ID)
+    }
+
+    private fun deleteWidgetPreferences(widgetId: Int) {
+        with(sharedPref) {
+            delete(getStudentWidgetKey(widgetId))
+            delete(getDateWidgetKey(widgetId))
         }
     }
 }
diff --git a/app/src/main/res/drawable/background_timetable_widget_avatar.xml b/app/src/main/res/drawable/background_timetable_widget_avatar.xml
index 7f64c4eb..48298d67 100644
--- a/app/src/main/res/drawable/background_timetable_widget_avatar.xml
+++ b/app/src/main/res/drawable/background_timetable_widget_avatar.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#FF000000" />
-    <corners android:radius="12dp" />
+    <corners android:radius="14dp" />
 </shape>
diff --git a/app/src/main/res/drawable/background_widget_item_timetable.xml b/app/src/main/res/drawable/background_widget_item_timetable.xml
index 09635758..510c70c0 100644
--- a/app/src/main/res/drawable/background_widget_item_timetable.xml
+++ b/app/src/main/res/drawable/background_widget_item_timetable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="#FFFFFBFF" />
-    <corners android:radius="12dp" />
+    <corners android:radius="14dp" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_timetable_widget_swap.xml b/app/src/main/res/drawable/ic_timetable_widget_swap.xml
index 2f91489a..09c50b4f 100644
--- a/app/src/main/res/drawable/ic_timetable_widget_swap.xml
+++ b/app/src/main/res/drawable/ic_timetable_widget_swap.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="20dp"
+    android:height="20dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_widget_chevron.xml b/app/src/main/res/drawable/ic_widget_chevron.xml
index 2c88f818..871aca9b 100644
--- a/app/src/main/res/drawable/ic_widget_chevron.xml
+++ b/app/src/main/res/drawable/ic_widget_chevron.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="20dp"
+    android:height="20dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.png b/app/src/main/res/drawable/img_timetable_widget_preview.png
old mode 100755
new mode 100644
index a81bcf361e5a22491599f8fb785a07ca1a42c37d..5c1752cb511919e605d88e704fcc087b8b56ebab
GIT binary patch
literal 76378
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

literal 21111
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
bi-Ccg@uSalw&_c=6hVAXS3j3^P6<r_NbWqL

diff --git a/app/src/main/res/layout-v31/widget_timetable_preview.xml b/app/src/main/res/layout-v31/widget_timetable_preview.xml
index bc556f50..2c47836c 100644
--- a/app/src/main/res/layout-v31/widget_timetable_preview.xml
+++ b/app/src/main/res/layout-v31/widget_timetable_preview.xml
@@ -5,10 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/background_widget_timetable"
-    android:backgroundTint="?attr/colorSurface"
+    android:backgroundTint="?attr/colorSecondaryContainer"
     android:clipToOutline="true"
     android:orientation="vertical"
-    android:paddingHorizontal="16dp"
+    android:paddingHorizontal="12dp"
     android:theme="@style/Wulkanowy.Widget.Theme"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
 
@@ -16,23 +16,47 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingVertical="16dp">
+        android:paddingTop="12dp"
+        android:paddingBottom="8dp">
+
+        <FrameLayout
+            android:layout_width="48dp"
+            android:layout_height="48dp">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:importantForAccessibility="no"
+                android:src="@drawable/background_timetable_widget_avatar"
+                android:tint="?attr/colorPrimary"
+                app:tint="?attr/colorPrimary"
+                tools:ignore="UseAppTint" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="JK"
+                android:textAppearance="?attr/textAppearanceTitleLarge"
+                android:textColor="?attr/colorOnPrimary"
+                android:textSize="18sp"
+                tools:ignore="HardcodedText" />
+
+        </FrameLayout>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginHorizontal="12dp"
             android:layout_weight="1"
             android:lines="1"
-            android:text="Pon, 03.10"
-            android:textAppearance="?attr/textAppearanceHeadline5"
+            android:text="Pon, 19.05"
+            android:textSize="18sp"
             tools:ignore="HardcodedText" />
 
         <ImageButton
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginStart="12dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/all_prev"
             android:rotation="180"
@@ -51,46 +75,273 @@
             app:tint="?attr/colorPrimary"
             tools:ignore="UseAppTint" />
 
-        <TextView
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="12dp"
-            android:background="@drawable/background_timetable_widget_avatar"
-            android:backgroundTint="?attr/colorPrimary"
-            android:contentDescription="@string/account_quick_manager"
-            android:gravity="center"
-            android:text="AW"
-            android:textAppearance="?attr/textAppearanceTitleLarge"
-            android:textColor="?attr/colorOnPrimary" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:showDividers="middle">
+        android:paddingBottom="12dp">
 
-        <ImageView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="56dp"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/background_widget_item_timetable"
-            app:tint="?attr/backgroundColor" />
+            android:background="@drawable/background_widget_item_timetable"
+            android:backgroundTint="?attr/colorSurface"
+            android:gravity="center_vertical"
+            android:minHeight="48dp"
+            android:orientation="horizontal"
+            android:paddingHorizontal="12dp"
+            android:paddingVertical="8dp">
 
-        <ImageView
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1"
+                android:textSize="22sp"
+                tools:ignore="HardcodedText" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="08:00"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="09:45"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    tools:ignore="HardcodedText" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:text="Wychowanie fizyczne"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="6dp"
+                        android:text="213"
+                        android:textSize="12sp"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:text="Dorota Nowak"
+                        android:textAppearance="?attr/textAppearanceBodySmall"
+                        tools:ignore="HardcodedText" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="56dp"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="4dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/background_widget_item_timetable"
-            app:tint="?attr/backgroundColor" />
+            android:background="@drawable/background_widget_item_timetable"
+            android:backgroundTint="?attr/colorSurface"
+            android:gravity="center_vertical"
+            android:minHeight="48dp"
+            android:orientation="horizontal"
+            android:paddingHorizontal="12dp"
+            android:paddingVertical="8dp">
 
-        <ImageView
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="2"
+                android:textSize="22sp"
+                tools:ignore="HardcodedText"
+                tools:textColor="?attr/colorTimetableChange" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="08:50"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="09:35"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    tools:ignore="HardcodedText" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:text="Język polski"
+                    android:textColor="?attr/colorTimetableChange"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="6dp"
+                        android:text="125"
+                        android:textSize="12sp"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:text="Karolina Kowalska"
+                        android:textAppearance="?attr/textAppearanceBodySmall"
+                        android:textColor="?attr/colorTimetableChange"
+                        tools:ignore="HardcodedText" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:contentDescription="@string/timetable_changes"
+                android:tint="?attr/colorTimetableChange"
+                app:tint="?attr/colorTimetableChange"
+                tools:ignore="UseAppTint"
+                tools:src="@drawable/ic_timetable_widget_swap" />
+
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/background_widget_item_timetable"
-            app:tint="?attr/backgroundColor" />
+            android:layout_height="wrap_content"
+            android:background="@drawable/background_widget_item_timetable"
+            android:backgroundTint="?attr/colorSurface"
+            android:gravity="center_vertical"
+            android:minHeight="48dp"
+            android:orientation="horizontal"
+            android:paddingHorizontal="12dp"
+            android:paddingVertical="8dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="3"
+                android:textSize="22sp"
+                tools:ignore="HardcodedText"
+                tools:textColor="?attr/colorTimetableCanceled" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="09:45"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:text="10:30"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    tools:ignore="HardcodedText" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:text="Wiedza o społeczeństwie"
+                    android:textColor="?attr/colorTimetableCanceled"
+                    android:textSize="14sp"
+                    tools:ignore="HardcodedText" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Lekcja odwołana: uczniowie zwolnieni do domu"
+                    android:textAppearance="?attr/textAppearanceBodySmall"
+                    android:textColor="?attr/colorTimetableCanceled"
+                    tools:ignore="HardcodedText" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
     </LinearLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 27c9db66..01f4525e 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -6,11 +6,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/background_widget_item_timetable"
-    android:backgroundTint="?attr/backgroundColor"
+    android:backgroundTint="?attr/colorSurface"
     android:gravity="center_vertical"
+    android:minHeight="48dp"
     android:orientation="horizontal"
-    android:paddingHorizontal="16dp"
-    android:paddingVertical="12dp"
+    android:paddingHorizontal="12dp"
+    android:paddingVertical="8dp"
     android:theme="@style/Wulkanowy.Widget.Theme"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
@@ -18,15 +19,14 @@
         android:id="@+id/timetableWidgetItemNumber"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?attr/textAppearanceHeadline6"
-        android:textSize="24sp"
+        android:textSize="22sp"
         tools:text="1"
         tools:textColor="?attr/colorTimetableChange" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="10dp"
         android:gravity="center_vertical"
         android:orientation="vertical">
 
@@ -41,7 +41,7 @@
             android:id="@+id/timetableWidgetItemTimeFinish"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="2dp"
             android:textAppearance="?attr/textAppearanceBodySmall"
             tools:text="09:45" />
 
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:lines="1"
-            android:textAppearance="?attr/textAppearanceTitleMedium"
+            android:textSize="14sp"
             tools:text="Programowanie aplikacji mobilnych i desktopowych" />
 
         <LinearLayout
@@ -72,15 +72,15 @@
                 android:id="@+id/timetableWidgetItemRoom"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="6dp"
                 android:textAppearance="?attr/textAppearanceBodySmall"
-                tools:text="Sala 213"
+                tools:text="213"
                 tools:textColor="?attr/colorTimetableChange" />
 
             <TextView
                 android:id="@+id/timetableWidgetItemTeacher"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
                 android:ellipsize="end"
                 android:lines="1"
                 android:textAppearance="?attr/textAppearanceBodySmall"
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 3abc488e..b07cc78f 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -5,35 +5,70 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/background_widget_timetable"
-    android:backgroundTint="?attr/colorSurface"
+    android:backgroundTint="?attr/colorSecondaryContainer"
     android:clipToOutline="true"
     android:orientation="vertical"
-    android:paddingHorizontal="16dp"
+    android:paddingHorizontal="12dp"
     android:theme="@style/Wulkanowy.Widget.Theme"
-    tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider"
+    tools:targetApi="s">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingVertical="16dp">
+        android:paddingTop="12dp"
+        android:paddingBottom="8dp">
+
+        <FrameLayout
+            android:id="@+id/timetableWidgetAccount"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="@drawable/background_timetable_widget_avatar"
+            android:backgroundTint="@android:color/transparent"
+            android:clickable="true"
+            android:clipToOutline="true"
+            android:contentDescription="@string/account_quick_manager"
+            android:focusable="true"
+            android:foreground="?attr/selectableItemBackgroundBorderless"
+            android:importantForAccessibility="yes"
+            android:outlineProvider="background"
+            tools:targetApi="s">
+
+            <ImageView
+                android:id="@+id/timetableWidgetAccountBackground"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:importantForAccessibility="no"
+                tools:src="@drawable/background_timetable_widget_avatar"
+                tools:tint="?attr/colorPrimary" />
+
+            <TextView
+                android:id="@+id/timetableWidgetAccountInitials"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textAppearance="?attr/textAppearanceTitleLarge"
+                android:textColor="@android:color/white"
+                android:textSize="18sp"
+                tools:text="JK" />
+
+        </FrameLayout>
 
         <TextView
             android:id="@+id/timetableWidgetDate"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginHorizontal="12dp"
             android:layout_weight="1"
             android:lines="1"
-            android:textAppearance="?attr/textAppearanceHeadline5"
-            tools:text="Pon, 12.05" />
+            android:textSize="18sp"
+            tools:text="Friday, 19.05" />
 
         <ImageButton
             android:id="@+id/timetableWidgetPrev"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_marginStart="12dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/all_prev"
             android:rotation="180"
@@ -53,39 +88,6 @@
             app:tint="?attr/colorPrimary"
             tools:ignore="UseAppTint" />
 
-        <FrameLayout
-            android:id="@+id/timetableWidgetAccount"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="12dp"
-            android:background="@drawable/background_timetable_widget_avatar"
-            android:backgroundTint="@android:color/transparent"
-            android:clickable="true"
-            android:clipToOutline="true"
-            android:contentDescription="@string/account_quick_manager"
-            android:focusable="true"
-            android:foreground="?attr/selectableItemBackgroundBorderless"
-            android:importantForAccessibility="yes"
-            android:outlineProvider="background">
-
-            <ImageView
-                android:id="@+id/timetableWidgetAccountBackground"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:importantForAccessibility="no"
-                tools:src="@drawable/background_timetable_widget_avatar"
-                tools:tint="?attr/colorPrimary" />
-
-            <TextView
-                android:id="@+id/timetableWidgetAccountInitials"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:textAppearance="?attr/textAppearanceTitleLarge"
-                android:textColor="@android:color/white"
-                android:textSize="20sp"
-                tools:text="AW" />
-        </FrameLayout>
     </LinearLayout>
 
     <FrameLayout
@@ -99,6 +101,7 @@
             android:clipToPadding="false"
             android:divider="@android:color/transparent"
             android:dividerHeight="4dp"
+            android:listSelector="@android:color/transparent"
             android:paddingBottom="16dp"
             tools:listfooter="@layout/item_widget_timetable_footer"
             tools:listitem="@layout/item_widget_timetable" />
@@ -111,5 +114,7 @@
             android:text="@string/widget_timetable_no_items"
             android:textAppearance="?attr/textAppearanceBody1"
             android:visibility="gone" />
+
     </FrameLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/xml/provider_widget_timetable.xml b/app/src/main/res/xml/provider_widget_timetable.xml
index 3cdad0c8..555d8cb1 100644
--- a/app/src/main/res/xml/provider_widget_timetable.xml
+++ b/app/src/main/res/xml/provider_widget_timetable.xml
@@ -3,15 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:configure="io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
     android:initialLayout="@layout/widget_timetable"
-    android:minWidth="250dp"
-    android:minHeight="110dp"
-    android:minResizeWidth="250dp"
-    android:minResizeHeight="110dp"
+    android:minWidth="245dp"
+    android:minHeight="102dp"
+    android:minResizeWidth="245dp"
+    android:minResizeHeight="102dp"
     android:previewImage="@drawable/img_timetable_widget_preview"
     android:previewLayout="@layout/widget_timetable_preview"
     android:resizeMode="horizontal|vertical"
     android:targetCellWidth="3"
-    android:targetCellHeight="2"
+    android:targetCellHeight="3"
     android:updatePeriodMillis="3600000"
     android:widgetCategory="home_screen"
     tools:targetApi="s" />

From 91d7ee442edc87b045ae2693874d612bf0bcfe87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 26 Jul 2023 19:37:06 +0200
Subject: [PATCH 364/429] New Crowdin updates (#2257)

---
 .../res/values-it-rIT/preferences_values.xml  |  65 ++
 app/src/main/res/values-it-rIT/strings.xml    | 747 ++++++++++++++++++
 app/src/main/res/values-uk/strings.xml        |   6 +-
 3 files changed, 815 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/values-it-rIT/preferences_values.xml
 create mode 100644 app/src/main/res/values-it-rIT/strings.xml

diff --git a/app/src/main/res/values-it-rIT/preferences_values.xml b/app/src/main/res/values-it-rIT/preferences_values.xml
new file mode 100644
index 00000000..ac2b6e9e
--- /dev/null
+++ b/app/src/main/res/values-it-rIT/preferences_values.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Black (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>System language</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+        <item>Slovenčina</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 minutes</item>
+        <item>30 minutes</item>
+        <item>1 hour</item>
+        <item>2 hours</item>
+        <item>6 hours</item>
+        <item>12 hours</item>
+        <item>24 hours</item>
+    </string-array>
+    <string-array name="grade_modifier_entries">
+        <item>0,00</item>
+        <item>0,25</item>
+        <item>0,33</item>
+        <item>0,5</item>
+        <item>0,75</item>
+    </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetically</item>
+        <item>By date</item>
+        <item>By average</item>
+    </string-array>
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Grade colors in register</item>
+    </string-array>
+    <string-array name="default_expand_grade_entries">
+        <item>Up to 1 at once</item>
+        <item>Always expanded</item>
+        <item>Unlimited expansions</item>
+    </string-array>
+    <string-array name="grade_average_mode_entries">
+        <item>Average of grades only from selected semester</item>
+        <item>Average of averages from both semesters</item>
+        <item>Average of grades from the whole year</item>
+    </string-array>
+    <string-array name="dashboard_tile_entries">
+        <item>Lucky number</item>
+        <item>Unread messages</item>
+        <item>Attendance</item>
+        <item>Lessons</item>
+        <item>Grades</item>
+        <item>Homework</item>
+        <item>School announcements</item>
+        <item>Exams</item>
+        <item>Conferences</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 00000000..5c7d02a0
--- /dev/null
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,747 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Login</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Grades</string>
+    <string name="attendance_title">Attendance</string>
+    <string name="exam_title">Exams</string>
+    <string name="timetable_title">Timetable</string>
+    <string name="settings_title">Settings</string>
+    <string name="more_title">More</string>
+    <string name="about_title">About</string>
+    <string name="logviewer_title">Log viewer</string>
+    <string name="debug_title">Debug</string>
+    <string name="notification_debug_title">Notification debug</string>
+    <string name="contributors_title">Contributors</string>
+    <string name="license_title">Licenses</string>
+    <string name="message_title">Messages</string>
+    <string name="send_message_title">New message</string>
+    <string name="add_homework_title">New homework</string>
+    <string name="note_title">Notes and achievements</string>
+    <string name="homework_title">Homework</string>
+    <string name="account_title">Accounts manager</string>
+    <string name="account_quick_title">Select account</string>
+    <string name="account_details_title">Account details</string>
+    <string name="student_info_title">Student info</string>
+    <string name="dashboard_title">Dashboard</string>
+    <string name="notifications_center_title">Notifications center</string>
+    <string name="menu_order_title">Menu configuartion</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+    <!--Login-->
+    <string name="login_header_default">Sign in with the student or parent account</string>
+    <string name="login_header_symbol">Enter the symbol from the register page for account: &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="login_nickname_hint">Username</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
+    <string name="login_password_hint">Password</string>
+    <string name="login_host_hint">UONET+ register variant</string>
+    <string name="login_domain_suffix_hint">Custom domain suffix</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_sign_in">Sign in</string>
+    <string name="login_invalid_password">Password too short</string>
+    <string name="login_incorrect_password_default">Login details are incorrect</string>
+    <string name="login_incorrect_password">%1$s. Make sure the correct UONET+ register variation is selected below</string>
+    <string name="login_invalid_pin">Invalid PIN</string>
+    <string name="login_invalid_token">Invalid token</string>
+    <string name="login_expired_token">Token expired</string>
+    <string name="login_invalid_email">Invalid email</string>
+    <string name="login_invalid_login">Use the assigned login instead of email</string>
+    <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
+    <string name="login_invalid_symbol">Invalid symbol</string>
+    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
+    <string name="login_duplicate_student">Selected student is already logged in</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
+    <string name="login_select_student">Select students to log in to the application</string>
+    <string name="login_advanced">Other options</string>
+    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
+    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
+    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
+    <string name="login_privacy_policy">Privacy policy</string>
+    <string name="login_contact_header">Trouble signing in? Contact us!</string>
+    <string name="login_contact_email">Email</string>
+    <string name="login_contact_discord">Discord</string>
+    <string name="login_email_intent_title">Send email</string>
+    <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
+    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_title">Recover your account</string>
+    <string name="login_recover">Recover</string>
+    <string name="login_signed_in">Student is already signed in</string>
+    <string name="login_host_standard">Standard</string>
+    <string name="login_other_search_locations">Other search locations</string>
+    <string name="login_no_active_student">No active students found</string>
+    <string name="login_symbol_enter">Enter a different symbol</string>
+    <!--Notifications-->
+    <string name="notifications_header_title">Enable notifications</string>
+    <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
+    <string name="notifications_skip">Skip</string>
+    <string name="notifications_enable">Enable</string>
+    <!--Main-->
+    <string name="main_account_picker">Account manager</string>
+    <string name="main_log_in">Log in</string>
+    <string name="main_session_expired">Session expired</string>
+    <string name="main_session_relogin">Session expired, log in again</string>
+    <string name="main_support_title">Application support</string>
+    <string name="main_support_description">Do you like this app? Support its development by enabling non-invasive ads that you can disable at any time</string>
+    <string name="main_support_positive">Enable ads</string>
+    <!--Grade-->
+    <string name="grade_header">Grade</string>
+    <string name="grade_semester">Semester %d</string>
+    <string name="grade_switch_semester">Change semester</string>
+    <string name="grade_no_items">No grades</string>
+    <string name="grade_weight">Weight</string>
+    <string name="grade_weight_value">Weight: %s</string>
+    <string name="grade_comment">Comment</string>
+    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
+    <string name="grade_average">Average: %1$.2f</string>
+    <string name="grade_points_sum">Points: %s</string>
+    <string name="grade_no_average">No average</string>
+    <string name="grade_summary_points">Total points</string>
+    <string name="grade_summary_final_grade">Final grade</string>
+    <string name="grade_summary_predicted_grade">Predicted grade</string>
+    <string name="grade_summary_calculated_average">Calculated average</string>
+    <string name="grade_summary_calculated_average_help_dialog_title">How does Calculated Average work?</string>
+    <string name="grade_summary_calculated_average_help_dialog_message">The Calculated Average is the arithmetic average calculated from the subjects averages. It allows you to know the approximate final average. It is calculated in a way selected by the user in the application settings. It is recommended that you choose the appropriate option. This is because the calculation of school averages differs. Additionally, if your school reports the average of the subjects on the Vulcan page, the application downloads them and does not calculate these averages. This can be changed by forcing the calculation of the average in the application settings.\n\n<b>Average of grades only from selected semester</b>:\n1. Calculating the weighted average for each subject in a given semester\n2.Adding calculated averages\n3. Calculation of the arithmetic average of the summed averages\n\n<b>Average of averages from both semesters</b>:\n1.Calculating the weighted average for each subject in semester 1 and 2\n2. Calculating the arithmetic average of the calculated averages for semesters 1 and 2 for each subject.\n3. Adding calculated averages\n4. Calculation of the arithmetic average of the summed averages\n\n<b>Average of grades from the whole year:</b>\n1. Calculating weighted average over the year for each subject. The final average in the 1st semester is irrelevant.\n2. Adding calculated averages\n3. Calculating the arithmetic average of summed averages</string>
+    <string name="grade_summary_final_average_help_dialog_title">How does the Final Average work?</string>
+    <string name="grade_summary_final_average_help_dialog_message">The Final Average is the arithmetic average calculated from all currently available final grades in the given semester.\n\nThe calculation scheme consists of the following steps:\n1. Summing up the final grades given by teachers\n2. Divide by the number of subjects that have already been graded</string>
+    <string name="grade_summary_final_average">Final average</string>
+    <string name="grade_summary_from_subjects">from %1$d of %2$d subjects</string>
+    <string name="grade_menu_summary">Summary</string>
+    <string name="grade_menu_statistics">Class</string>
+    <string name="grade_menu_read">Mark as read</string>
+    <string name="grade_statistics_partial">Partial</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Points</string>
+    <string name="grade_statistics_legend">Legend</string>
+    <string name="grade_statistics_class_average">Class average: %1$s</string>
+    <string name="grade_statistics_student_average">Your average: %1$s</string>
+    <string name="grade_statistics_student_grade">Your grade: %1$s</string>
+    <string name="grade_statistics_average_class">Class</string>
+    <string name="grade_statistics_average_student">Student</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d grade</item>
+        <item quantity="other">%d grades</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">New grade</item>
+        <item quantity="other">New grades</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">You received %1$d grade</item>
+        <item quantity="other">You received %1$d grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lesson</string>
+    <string name="timetable_room">Room</string>
+    <string name="timetable_group">Group</string>
+    <string name="timetable_time">Hours</string>
+    <string name="timetable_changes">Changes</string>
+    <string name="timetable_no_items">No lessons this day</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
+    <string name="timetable_notify_lesson">%1$s lesson %2$d - %3$s</string>
+    <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
+    <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
+    <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_notify_new_items_title">
+        <item quantity="one">Timetable change</item>
+        <item quantity="other">Timetable changes</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items">
+        <item quantity="one">%1$s - %2$d change in timetable</item>
+        <item quantity="other">%1$s - %2$d  changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_notify_new_items_group">
+        <item quantity="one">%1$d change in timetable</item>
+        <item quantity="other">%1$d changes in timetable</item>
+    </plurals>
+    <plurals name="timetable_number_item">
+        <item quantity="one">%d change</item>
+        <item quantity="other">%d changes</item>
+    </plurals>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Completed lessons</string>
+    <string name="completed_lessons_button">Show completed lessons</string>
+    <string name="completed_lessons_no_items">No info about completed lessons</string>
+    <string name="completed_lessons_topic">Topic</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Resources</string>
+    <!--Additional lessons-->
+    <string name="additional_lessons_title">Additional lessons</string>
+    <string name="additional_lessons_button">Show additional lessons</string>
+    <string name="additional_lessons_no_items">No info about additional lessons</string>
+    <string name="additional_lessons_add">New lesson</string>
+    <string name="additional_lessons_add_title">New additional lesson</string>
+    <string name="additional_lessons_add_success">Additional lesson added successfully</string>
+    <string name="additional_lessons_delete_success">Additional lesson deleted successfully</string>
+    <string name="additional_lessons_repeat">Repeat weekly</string>
+    <string name="additional_lessons_delete_title">Delete additional lesson</string>
+    <string name="additional_lessons_delete_one">Just this lesson</string>
+    <string name="additional_lessons_delete_series">All in the series</string>
+    <string name="additional_lessons_start">Start time</string>
+    <string name="additional_lessons_end">End time</string>
+    <string name="additional_lessons_end_time_error">End time must be greater than start time</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Attendance summary</string>
+    <string name="attendance_absence_school">Absent for school reasons</string>
+    <string name="attendance_absence_excused">Excused absence</string>
+    <string name="attendance_absence_unexcused">Unexcused absence</string>
+    <string name="attendance_exemption">Exemption</string>
+    <string name="attendance_excused_lateness">Excused lateness</string>
+    <string name="attendance_unexcused_lateness">Unexcused lateness</string>
+    <string name="attendance_present">Present</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Number of lesson</string>
+    <string name="attendance_no_items">No entries</string>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excuse request sent successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
+    <plurals name="attendance_notify_new_items_title">
+        <item quantity="one">New attendance</item>
+        <item quantity="other">New attendance</item>
+    </plurals>
+    <plurals name="attendance_notify_new_items">
+        <item quantity="one">%1$d new attendance</item>
+        <item quantity="other">%1$d attendance</item>
+    </plurals>
+    <plurals name="attendance_number_item">
+        <item quantity="one">%d attendance</item>
+        <item quantity="other">%d attendance</item>
+    </plurals>
+    <!--Attendance summary-->
+    <string name="attendance_summary_total">Total</string>
+    <!--Exam-->
+    <string name="exam_no_items">No exams this week</string>
+    <string name="exam_type">Type</string>
+    <string name="exam_entry_date">Entry date</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">New exam</item>
+        <item quantity="other">New exams</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">%d new exam</item>
+        <item quantity="other">%d new exams</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d exam</item>
+        <item quantity="other">%d exams</item>
+    </plurals>
+    <!--Message-->
+    <string name="message_inbox">Inbox</string>
+    <string name="message_sent">Sent</string>
+    <string name="message_trash">Trash</string>
+    <string name="message_no_subject">(no subject)</string>
+    <string name="message_no_items">No messages</string>
+    <string name="message_from">From:</string>
+    <string name="message_to">To:</string>
+    <string name="message_date">Date: %1$s</string>
+    <string name="message_reply">Reply</string>
+    <string name="message_forward">Forward</string>
+    <string name="message_select_all">Select all</string>
+    <string name="message_unselect_all">Unselect all</string>
+    <string name="message_move_to_trash">Move to trash</string>
+    <string name="message_delete_forever">Delete permanently</string>
+    <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_mailbox_type_student">student</string>
+    <string name="message_mailbox_type_parent">parent</string>
+    <string name="message_mailbox_type_guardian">guardian</string>
+    <string name="message_mailbox_type_employee">employee</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
+    <string name="message_subject">Subject</string>
+    <string name="message_content">Content</string>
+    <string name="message_send_successful">Message sent successfully</string>
+    <string name="message_not_exists">Message does not exist</string>
+    <string name="message_required_recipients">You need to choose at least 1 recipient</string>
+    <string name="message_content_min_length">The message content must be at least 3 characters</string>
+    <string name="message_chip_all_mailboxes">All mailboxes</string>
+    <string name="message_chip_only_unread">Only unread</string>
+    <string name="message_chip_only_with_attachments">Only with attachments</string>
+    <string name="message_read">Read: %s</string>
+    <string name="message_read_by">Read by: %1$d of %2$d people</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%1$d message</item>
+        <item quantity="other">%1$d messages</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">New message</item>
+        <item quantity="other">New messages</item>
+    </plurals>
+    <string name="message_restore_dialog">Do you want to restore draft message?</string>
+    <string name="message_restore_dialog_with_recipients">Do you want to restore draft message with recipients: %s?</string>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">You received %1$d message</item>
+        <item quantity="other">You received %1$d messages</item>
+    </plurals>
+    <plurals name="message_selected_messages_count">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+    <string name="message_messages_deleted">Messages deleted</string>
+    <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <!--Note-->
+    <string name="note_no_items">No info about notes</string>
+    <string name="note_points">Points</string>
+    <plurals name="note_number_item">
+        <item quantity="one">%d note</item>
+        <item quantity="other">%d notes</item>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">New note</item>
+        <item quantity="other">New notes</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">You received %1$d note</item>
+        <item quantity="other">You received %1$d notes</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--Homework-->
+    <string name="homework_no_items">No info about homework</string>
+    <string name="homework_mark_as_done">Mark as done</string>
+    <string name="homework_mark_as_undone">Mark as undone</string>
+    <string name="homework_add">Add homework</string>
+    <string name="homework_add_success">Homework added successfully</string>
+    <string name="homework_delete_success">Homework deleted successfully</string>
+    <string name="homework_attachments">Attachments</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">New homework</item>
+        <item quantity="other">New homework</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">You received %d new homework</item>
+        <item quantity="other">You received %d new homework</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d homework</item>
+        <item quantity="other">%d homework</item>
+    </plurals>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Lucky number</string>
+    <string name="lucky_number_header">Today\'s lucky number is</string>
+    <string name="lucky_number_empty">No info about the lucky number</string>
+    <string name="lucky_number_notify_new_item_title">Lucky number for today</string>
+    <string name="lucky_number_notify_new_item">Today\'s lucky number is: %s</string>
+    <string name="lucky_number_history_button">Show history</string>
+    <!--Lucky number history-->
+    <string name="lucky_number_history_title">Lucky number history</string>
+    <string name="lucky_number_history_empty">No info about lucky numbers</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile devices</string>
+    <string name="mobile_devices_no_items">No devices</string>
+    <string name="mobile_devices_unregister">Deregister</string>
+    <string name="mobile_device_removed">Device removed</string>
+    <string name="mobile_device_qr">QR code</string>
+    <string name="mobile_device_token">Token</string>
+    <string name="mobile_device_symbol">Symbol</string>
+    <string name="mobile_device_pin">PIN</string>
+    <!--School and teachers-->
+    <string name="schoolandteachers_title">School and teachers</string>
+    <!--School-->
+    <string name="school_title">School</string>
+    <string name="school_no_info">No info about school</string>
+    <string name="school_name">School name</string>
+    <string name="school_address">School address</string>
+    <string name="school_telephone">Telephone</string>
+    <string name="school_headmaster">Name of headmaster</string>
+    <string name="school_pedagogue">Name of pedagogue</string>
+    <string name="school_address_button">Show on map</string>
+    <string name="school_telephone_button">Call</string>
+    <!--Teacher-->
+    <string name="teachers_title">Teachers</string>
+    <string name="teacher_no_items">No info about teachers</string>
+    <string name="teacher_no_subject">No subject</string>
+    <!--Conference-->
+    <string name="conferences_title">Conferences</string>
+    <string name="conference_no_items">No info about conferences</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d conference</item>
+        <item quantity="other">%d conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">New conference</item>
+        <item quantity="other">New conferences</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">You have %1$d new conference</item>
+        <item quantity="other">You have %1$d new conferences</item>
+    </plurals>
+    <string name="conferences_present">Present at conference</string>
+    <string name="conference_agenda">Agenda</string>
+    <string name="conference_place">Place</string>
+    <string name="conference_topic">Topic</string>
+    <!--Director information-->
+    <string name="school_announcement_title">School announcements</string>
+    <string name="school_announcement_no_items">No school announcements</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d school announcement</item>
+        <item quantity="other">%d school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">New school announcement</item>
+        <item quantity="other">New school announcements</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">You have %1$d new school announcement</item>
+        <item quantity="other">You have %1$d new school announcements</item>
+    </plurals>
+    <!--Account-->
+    <string name="account_add_new">Add account</string>
+    <string name="account_logout">Logout</string>
+    <string name="account_confirm">Do you want to log out this student?</string>
+    <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_details_edit">Edit data</string>
+    <string name="account_quick_manager">Accounts manager</string>
+    <string name="account_select_student">Select student</string>
+    <string name="account_family">Family</string>
+    <string name="account_contact">Contact</string>
+    <string name="account_address">Residence details</string>
+    <string name="account_personal_data">Personal information</string>
+    <!--About-->
+    <string name="about_version">App version</string>
+    <string name="about_contributor">Contributors</string>
+    <string name="about_contributor_summary">List of Wulkanowy developers</string>
+    <string name="about_feedback">Report a bug</string>
+    <string name="about_feedback_summary">Send a bug report via e-mail</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_summary">Read Frequently Asked Questions</string>
+    <string name="about_discord">Discord server</string>
+    <string name="about_discord_summary">Join the Wulkanowy community</string>
+    <string name="about_facebook">Facebook fanpage</string>
+    <string name="about_twitter">Twitter page</string>
+    <string name="about_twitter_summary">Follow us on twitter</string>
+    <string name="about_facebook_summary">Like our facebook fanpage</string>
+    <string name="about_privacy">Privacy policy</string>
+    <string name="about_privacy_summary">Rules for collecting personal data</string>
+    <string name="about_system">System settings</string>
+    <string name="about_system_summary">Open system settings</string>
+    <string name="about_homepage">Homepage</string>
+    <string name="about_homepage_summary">Visit the website and help develop the application</string>
+    <string name="about_licenses">Licenses</string>
+    <string name="about_licenses_summary">Licenses of libraries used in the application</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">License</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Avatar</string>
+    <string name="contributor_see_more">See more on GitHub</string>
+    <!--Student info-->
+    <string name="student_info_empty">No info about student or student family</string>
+    <string name="student_info_first_name">Name</string>
+    <string name="student_info_second_name">Second name</string>
+    <string name="student_info_gender">Gender</string>
+    <string name="student_info_polish_citizenship">Polish citizenship</string>
+    <string name="student_info_family_name">Family name</string>
+    <string name="student_info_parents_name">Mother\'s and father\'s names</string>
+    <string name="student_info_phone">Phone</string>
+    <string name="student_info_cellphone">Cellphone</string>
+    <string name="student_info_email">E-mail</string>
+    <string name="student_info_address">Address of residence</string>
+    <string name="student_info_registered_address">Address of registration</string>
+    <string name="student_info_correspondence_address">Correspondence address</string>
+    <string name="student_info_full_name">Surname and first name</string>
+    <string name="student_info_kinship">Degree of kinship</string>
+    <string name="student_info_guardian_address">Address</string>
+    <string name="student_info_phones">Phones</string>
+    <string name="student_info_male">Male</string>
+    <string name="student_info_female">Female</string>
+    <string name="student_info_last_name">Last name</string>
+    <string name="student_info_guardian">Guardian</string>
+    <!--Account edit-->
+    <string name="account_edit_nick_hint">Nick</string>
+    <string name="account_edit_header">Add nick</string>
+    <string name="account_edit_avatar_title">Choose avatar color</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lessons</string>
+    <string name="dashboard_timetable_title_tomorrow">(Tomorrow)</string>
+    <string name="dashboard_timetable_title_today_and_tomorrow">(Today and tomorrow)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">In a moment:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Soon:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">First:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Now:</string>
+    <string name="dashboard_timetable_second_lesson_value_end">End of lessons</string>
+    <string name="dashboard_timetable_second_lessons_title">Next:</string>
+    <string name="dashboard_timetable_third_title">Later:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">%1$d more lesson</item>
+        <item quantity="other">%1$d more lessons</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">until %1$s</string>
+    <string name="dashboard_timetable_no_lessons">No upcoming lessons</string>
+    <string name="dashboard_timetable_error">An error occurred while loading the lessons</string>
+    <string name="dashboard_homework_title">Homework</string>
+    <string name="dashboard_homework_no_homework">No homework to do</string>
+    <string name="dashboard_homework_error">An error occurred while loading the homework</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">%1$d more homework</item>
+        <item quantity="other">%1$d more homework</item>
+    </plurals>
+    <string name="dashboard_homework_time">due %1$s</string>
+    <string name="dashboard_grade_title">Last grades</string>
+    <string name="dashboard_grade_no_grade">No new grades</string>
+    <string name="dashboard_grade_error">An error occurred while loading the grades</string>
+    <string name="dashboard_announcements_title">School announcements</string>
+    <string name="dashboard_announcements_no_announcements">No current announcements</string>
+    <string name="dashboard_announcements_error">An error occurred while loading the announcements</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">%1$d more announcement</item>
+        <item quantity="other">%1$d more announcements</item>
+    </plurals>
+    <string name="dashboard_exams_title">Exams</string>
+    <string name="dashboard_exams_no_exams">No upcoming exams</string>
+    <string name="dashboard_exams_error">An error occurred while loading the exams</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">%1$d more exam</item>
+        <item quantity="other">%1$d more exams</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Conferences</string>
+    <string name="dashboard_conferences_no_conferences">No upcoming conferences</string>
+    <string name="dashboard_conferences_error">An error occurred while loading the conferences</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">%1$d more conference</item>
+        <item quantity="other">%1$d more conferences</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">An error occurred while loading data</string>
+    <string name="dashboard_horizontal_group_no_data">None</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
+    <!--Generic-->
+    <string name="all_content">Content</string>
+    <string name="all_retry">Retry</string>
+    <string name="all_description">Description</string>
+    <string name="all_no_description">No description</string>
+    <string name="all_teacher">Teacher</string>
+    <string name="all_date">Date</string>
+    <string name="all_entry_date">Entry date</string>
+    <string name="all_color">Color</string>
+    <string name="all_details">Details</string>
+    <string name="all_category">Category</string>
+    <string name="all_close">Close</string>
+    <string name="all_no_data">No data</string>
+    <string name="all_subject">Subject</string>
+    <string name="all_prev">Prev</string>
+    <string name="all_next">Next</string>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search…</string>
+    <string name="all_yes">Yes</string>
+    <string name="all_no">No</string>
+    <string name="all_save">Save</string>
+    <string name="all_title">Title</string>
+    <string name="all_add">Add</string>
+    <string name="all_copied">Copied</string>
+    <string name="all_undo">Undo</string>
+    <string name="all_change">Change</string>
+    <string name="all_add_to_calendar">Add to calendar</string>
+    <string name="all_cancel">Cancel</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">No lessons</string>
+    <string name="widget_timetable_last_synchronization">Synchronized on %1$s at %2$s</string>
+    <string name="widget_timetable_theme_title">Choose theme</string>
+    <string name="widget_timetable_theme_light">Light</string>
+    <string name="widget_timetable_theme_dark">Dark</string>
+    <string name="widget_timetable_theme_system">System Theme</string>
+    <!--Preferences-->
+    <string name="pref_view_header">App</string>
+    <string name="pref_view_list">Default view</string>
+    <string name="pref_view_grade_average_mode">Calculated average options</string>
+    <string name="pref_view_grade_average_force_calc">Force average calculation by app</string>
+    <string name="pref_view_present">Show presence</string>
+    <string name="pref_view_app_theme">Theme</string>
+    <string name="pref_view_expand_grade">Grades expanding</string>
+    <string name="pref_view_timetable_show_timers">Mark current lesson</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
+    <string name="pref_view_grade_color_scheme">Grades color scheme</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting</string>
+    <string name="pref_view_app_language">Language</string>
+    <string name="pref_view_menu_order_title">Menu configuration</string>
+    <string name="pref_view_menu_order_summary">Set the order of functions in the menu</string>
+    <string name="pref_notify_header">Notifications</string>
+    <string name="pref_notify_header_other">Other</string>
+    <string name="pref_notify_switch">Show notifications</string>
+    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_upcoming_lessons_persistent_switch">Make upcoming lesson notification persistent</string>
+    <string name="pref_notify_upcoming_lessons_persistent_summary">Turn off when notification is not showing in your watch/band</string>
+    <string name="pref_notify_open_system_settings">Open system notification settings</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_debug_switch">Show debug notifications</string>
+    <string name="pref_notify_disabled_summary">Synchronization is disabled</string>
+    <string name="pref_notify_notifications_piggyback_header">Official app notifications</string>
+    <string name="pref_notify_notifications_piggyback">Capture official app notifications</string>
+    <string name="pref_notify_notifications_piggyback_cancel_original">Remove official app notifications after capture</string>
+    <string name="pref_notification_piggyback_popup_title">Capture notifications</string>
+    <string name="pref_notification_piggyback_popup_description">With this feature you can gain a substitute of push notifications like in the official app. All you need to do is allow Wulkanowy to receive all notifications in your system settings.\n\nHow it works?\nWhen you get a notification in Dziennik VULCAN, Wulkanowy will be notified (that\'s what these extra permissions are for) and will trigger a sync so that can send its own notification.\n\nFOR ADVANCED USERS ONLY</string>
+    <string name="pref_notification_exact_alarm_popup_title">Upcoming lesson notifications</string>
+    <string name="pref_notification_exact_alarm_popup_descriptions">You must allow the Wulkanowy app to set alarms and reminders in your system settings to use this feature.</string>
+    <string name="pref_notification_go_to_settings">Go to settings</string>
+    <string name="pref_services_header">Synchronization</string>
+    <string name="pref_services_switch">Automatic update</string>
+    <string name="pref_services_suspended">Suspended on holidays</string>
+    <string name="pref_services_interval">Updates interval</string>
+    <string name="pref_services_wifi">Wi-Fi only</string>
+    <string name="pref_services_force_sync">Sync now</string>
+    <string name="pref_services_message_sync_success">Synced!</string>
+    <string name="pref_services_message_sync_failed">Sync failed</string>
+    <string name="pref_services_sync_in_progress">Sync in progress</string>
+    <string name="pref_services_last_full_sync_date">Last full sync: %s</string>
+    <string name="pref_other_grade_modifier_plus">Value of the plus</string>
+    <string name="pref_other_grade_modifier_minus">Value of the minus</string>
+    <string name="pref_other_fill_message_content">Reply with message history</string>
+    <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_ads_support_category_name">Support</string>
+    <string name="pref_ads_privacy_policy">Privacy Policy</string>
+    <string name="pref_ads_agreements">Agreements</string>
+    <string name="pref_ads_consent">Consent to processing of data related to ads</string>
+    <string name="pref_ads_show_in_app">Show ads in app</string>
+    <string name="pref_ads_support">Watch single ad to support project</string>
+    <string name="pref_ads_privacy_title">Consent to data processing</string>
+    <string name="pref_ads_privacy_description">To view an advertisement you must agree to the data processing terms of our Privacy Policy</string>
+    <string name="pref_ads_privacy_agree">Agree</string>
+    <string name="pref_ads_privacy_link">Privacy policy</string>
+    <string name="pref_ads_loading">Ad is loading</string>
+    <string name="pref_ads_once_per_visit">Thank you for your support, come back later for more ads</string>
+    <string name="pref_ads_consent_title">Can we use your data to display ads?</string>
+    <string name="pref_ads_consent_description">You can change your choice anytime in the app settings. We may use your data to display ads tailored to you or, using less of your data, display non-personalized ads. Please see our Privacy Policy for details</string>
+    <string name="pref_ads_summary_personalized">Personalized ads</string>
+    <string name="pref_ads_summary_non_personalized">Non-personalized ads</string>
+    <string name="pref_ads_over_18_years_old">I am over 18 years old</string>
+    <string name="pref_ads_option_personalized">Yes, personalized ads</string>
+    <string name="pref_ads_option_non_personalized">Yes, non-personalized ads</string>
+    <string name="pref_settings_advanced_title">Advanced</string>
+    <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
+    <string name="pref_settings_notifications_title">Notifications</string>
+    <string name="pref_settings_sync_title">Synchronization</string>
+    <string name="pref_settings_ads_title">Advertisements</string>
+    <string name="pref_grades_appearance_header">Grades</string>
+    <string name="pref_dashboard_appearance_header">Dashboard</string>
+    <string name="pref_dashboard_appearance_tiles_title">Tiles visibility</string>
+    <string name="pref_attendance_appearance_view">Attendance</string>
+    <string name="pref_timetable_appearance_view">Timetable</string>
+    <string name="pref_grades_advanced_header">Grades</string>
+    <string name="pref_counted_average_advanced_header">Calculated average</string>
+    <string name="pref_messages_advanced_header">Messages</string>
+    <string name="pref_appearance_category">Appearance &amp; Behavior</string>
+    <string name="pref_appearance_category_summary">Languages, themes, subjects sorting</string>
+    <string name="pref_notifications_category_summary">App notifications, fix problems</string>
+    <string name="pref_notifications_category">Notifications</string>
+    <string name="pref_sync_category">Synchronization</string>
+    <string name="pref_sync_category_summary">Automatic update, synchronization interval</string>
+    <string name="pref_advanced_category_summary">Plus and minus values, average calculation</string>
+    <string name="pref_advanced_category">Advanced</string>
+    <string name="pref_about_category_summary">App version, contributors, social portals</string>
+    <string name="pref_ads_category_summary">Displaying advertisements, project support</string>
+    <!--Notification Channels-->
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_new_homework">New homework</string>
+    <string name="channel_new_conference">New conferences</string>
+    <string name="channel_new_exam">New exams</string>
+    <string name="channel_lucky_number">Lucky number</string>
+    <string name="channel_new_message">New messages</string>
+    <string name="channel_new_notes">New notes</string>
+    <string name="channel_new_school_announcement">New school announcements</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
+    <string name="channel_debug">Debug</string>
+    <string name="channel_change_timetable">Timetable change</string>
+    <string name="channel_new_attendance">New attendance</string>
+    <!--Colors-->
+    <string name="all_black">Black</string>
+    <string name="all_red">Red</string>
+    <string name="all_blue">Blue</string>
+    <string name="all_green">Green</string>
+    <string name="all_purple">Purple</string>
+    <string name="all_empty_color">No color</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>
+    <string name="update_download_success_button">Restart</string>
+    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+    <!--Menu order-->
+    <string name="menu_order_confirm_title">Application restart</string>
+    <string name="menu_order_confirm_content">The application must restart for the changes to be saved</string>
+    <string name="menu_order_confirm_restart">Restart</string>
+    <!--Auth-->
+    <string name="auth_api_error">Authorization has been rejected. The data provided does not match the records in the secretary\'s office.</string>
+    <string name="auth_invalid_error">Invalid PESEL</string>
+    <string name="auth_pesel">PESEL</string>
+    <string name="auth_button">Authorize</string>
+    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_title">Authorization</string>
+    <string name="auth_description">To operate the application, we need to confirm your identity. Please enter the student\'s PESEL &lt;b&gt;%1$s&lt;/b&gt; in the field below</string>
+    <string name="auth_button_skip">Skip for now</string>
+    <!--Errors-->
+    <string name="error_no_internet">No internet connection</string>
+    <string name="error_invalid_device_datetime">An error occurred. Check your device clock</string>
+    <string name="error_timeout">Connection to register failed. Servers can be overloaded. Please try again later</string>
+    <string name="error_login_failed">Loading data failed. Please try again later</string>
+    <string name="error_password_change_required">Register password change required</string>
+    <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
+    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
+    <string name="error_unknown_app">Unknown application error. Please try again later</string>
+    <string name="error_unknown">An unexpected error occurred</string>
+    <string name="error_feature_disabled">Feature disabled by your school</string>
+    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
+    <string name="error_field_required">This field is required</string>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 30a587cc..f89e38fc 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -37,7 +37,7 @@
     <string name="login_login_pesel_email_hint">Логін, PESEL або e-mail</string>
     <string name="login_password_hint">Пароль</string>
     <string name="login_host_hint">Тип щоденника UONET+</string>
-    <string name="login_domain_suffix_hint">Custom domain suffix</string>
+    <string name="login_domain_suffix_hint">Користувацький суфікс домену</string>
     <string name="login_type_api">Мobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
@@ -814,8 +814,8 @@
     <string name="auth_api_error">Авторизацію відхилено. Надані дані не збігаються із записами в кабінеті секретаря.</string>
     <string name="auth_invalid_error">Неправильний PESEL</string>
     <string name="auth_pesel">Число PESEL</string>
-    <string name="auth_button">Authorize</string>
-    <string name="auth_success">Authorization completed successfully</string>
+    <string name="auth_button">Авторизовать</string>
+    <string name="auth_success">Авторизація пройшла успішно</string>
     <string name="auth_title">Авторизувати</string>
     <string name="auth_description">Для роботи програми нам потрібно підтвердити вашу особу. Будь ласка, введіть число PESEL &lt;b&gt;%1$s&lt;/b&gt; студента в поле нижче</string>
     <string name="auth_button_skip">Поки що пропустити</string>

From 64cc24ae6012470b59c9e7038c2145147f09c29a Mon Sep 17 00:00:00 2001
From: Mateusz Idziejczak <idziejczak3@gmail.com>
Date: Wed, 26 Jul 2023 22:17:58 +0200
Subject: [PATCH 365/429] Add incognito mode in messages (#1970)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 .../data/repositories/MessageRepository.kt    | 22 ++++++++++++++-----
 .../repositories/PreferencesRepository.kt     |  6 +++++
 .../ui/modules/message/MessageFragment.kt     |  9 +++++++-
 .../ui/modules/message/MessagePresenter.kt    | 13 ++++++++++-
 .../ui/modules/message/MessageView.kt         |  3 +++
 .../message/preview/MessagePreviewFragment.kt |  5 +++++
 .../preview/MessagePreviewPresenter.kt        | 13 ++++++++++-
 .../message/preview/MessagePreviewView.kt     |  3 +++
 .../modules/message/tab/MessageTabFragment.kt | 17 +++++++++-----
 .../message/tab/MessageTabPresenter.kt        |  5 +++--
 .../ui/modules/message/tab/MessageTabView.kt  |  3 ++-
 .../main/res/values/preferences_defaults.xml  |  1 +
 app/src/main/res/values/preferences_keys.xml  |  1 +
 app/src/main/res/values/strings.xml           |  5 +++++
 .../res/xml/scheme_preferences_advanced.xml   |  7 ++++++
 15 files changed, 96 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
index 53d9bead..c8fccb23 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt
@@ -3,18 +3,26 @@ package io.github.wulkanowy.data.repositories
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.*
+import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MailboxDao
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
-import io.github.wulkanowy.data.db.entities.*
+import io.github.wulkanowy.data.db.entities.Mailbox
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.networkBoundResource
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.pojos.MessageDraft
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.domain.messages.GetMailboxByStudentUseCase
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
@@ -25,7 +33,6 @@ import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import timber.log.Timber
@@ -97,7 +104,7 @@ class MessageRepository @Inject constructor(
         shouldFetch = {
             checkNotNull(it) { "This message no longer exist!" }
             Timber.d("Message content in db empty: ${it.message.content.isBlank()}")
-            it.message.unread || it.message.content.isBlank()
+            (it.message.unread && markAsRead) || it.message.content.isBlank()
         },
         query = {
             messagesDb.loadMessageWithAttachment(message.messageGlobalKey)
@@ -113,7 +120,10 @@ class MessageRepository @Inject constructor(
             messagesDb.updateAll(
                 listOf(old.message.apply {
                     id = message.id
-                    unread = !markAsRead
+                    unread = when {
+                        markAsRead -> false
+                        else -> unread
+                    }
                     sender = new.sender
                     recipients = new.recipients.singleOrNull() ?: "Wielu adresatów"
                     content = content.ifBlank { new.content }
@@ -123,7 +133,7 @@ class MessageRepository @Inject constructor(
                 items = new.attachments.mapToEntities(message.messageGlobalKey),
             )
 
-            Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
+            Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read: $markAsRead")
         }
     )
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 348a4054..1b489340 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -343,6 +343,12 @@ class PreferencesRepository @Inject constructor(
             )
         }
 
+    var isIncognitoMode: Boolean
+        get() = getBoolean(R.string.pref_key_incognito_moge, R.bool.pref_default_incognito_mode)
+        set(value) = sharedPref.edit {
+            putBoolean(context.getString(R.string.pref_key_incognito_moge), value)
+        }
+
     var installationId: String
         get() = sharedPref.getString(PREF_KEY_INSTALLATION_ID, null).orEmpty()
         private set(value) = sharedPref.edit { putString(PREF_KEY_INSTALLATION_ID, value) }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 4317fb7f..02bc13a1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -11,7 +11,9 @@ import androidx.core.view.updateMargins
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.enums.MessageFolder.*
+import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
+import io.github.wulkanowy.data.enums.MessageFolder.SENT
+import io.github.wulkanowy.data.enums.MessageFolder.TRASHED
 import io.github.wulkanowy.databinding.FragmentMessageBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
@@ -49,6 +51,7 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMessageBinding.bind(view)
+        messageContainer = binding.messageViewPager
         presenter.onAttachView(this)
     }
 
@@ -95,6 +98,10 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_m
         binding.messageProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
+    override fun showMessage(messageId: Int) {
+        showMessage(getString(messageId))
+    }
+
     override fun showNewMessage(show: Boolean) {
         binding.openSendMessageButton.run {
             if (show) show() else hide()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index cf6bad19..37a2d422 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -1,5 +1,7 @@
 package io.github.wulkanowy.ui.modules.message
 
+import io.github.wulkanowy.R
+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
@@ -9,7 +11,8 @@ import javax.inject.Inject
 
 class MessagePresenter @Inject constructor(
     errorHandler: ErrorHandler,
-    studentRepository: StudentRepository
+    studentRepository: StudentRepository,
+    private val preferencesRepository: PreferencesRepository,
 ) : BasePresenter<MessageView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: MessageView) {
@@ -19,6 +22,14 @@ class MessagePresenter @Inject constructor(
             Timber.i("Message view was initialized")
             loadData()
         }
+
+        showIncognitoModeReminderMessage()
+    }
+
+    private fun showIncognitoModeReminderMessage() {
+        if (preferencesRepository.isIncognitoMode) {
+            view?.showMessage(R.string.message_incognito_mode_on)
+        }
     }
 
     fun onPageSelected(index: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
index def4a275..7fdc6e18 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message
 
+import androidx.annotation.StringRes
 import io.github.wulkanowy.ui.base.BaseView
 
 interface MessageView : BaseView {
@@ -12,6 +13,8 @@ interface MessageView : BaseView {
 
     fun showProgress(show: Boolean)
 
+    fun showMessage(@StringRes messageId: Int)
+
     fun showNewMessage(show: Boolean)
 
     fun showTabLayout(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 6c54d9fc..3ed685cd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -12,6 +12,7 @@ import android.view.View.VISIBLE
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.annotation.StringRes
 import androidx.core.content.getSystemService
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -164,6 +165,10 @@ class MessagePreviewFragment :
         binding.messagePreviewErrorRetry.setOnClickListener { callback() }
     }
 
+    override fun showMessage(@StringRes messageId: Int) {
+        showMessage(getString(messageId))
+    }
+
     override fun openMessageReply(message: Message?) {
         context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message, true)) }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index 56f23b6f..cd7b7284 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -2,11 +2,13 @@ package io.github.wulkanowy.ui.modules.message.preview
 
 import android.annotation.SuppressLint
 import androidx.core.text.parseAsHtml
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.repositories.MessageRepository
+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
@@ -20,6 +22,7 @@ class MessagePreviewPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
+    private val preferencesRepository: PreferencesRepository,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
 
@@ -54,7 +57,11 @@ class MessagePreviewPresenter @Inject constructor(
     private fun loadData(messageToLoad: Message) {
         flatResourceFlow {
             val student = studentRepository.getCurrentStudent()
-            messageRepository.getMessage(student, messageToLoad, true)
+            messageRepository.getMessage(
+                student = student,
+                message = messageToLoad,
+                markAsRead = !preferencesRepository.isIncognitoMode,
+            )
         }
             .logResourceStatus("message ${messageToLoad.messageId} preview")
             .onResourceData {
@@ -65,6 +72,10 @@ class MessagePreviewPresenter @Inject constructor(
                         setMessageWithAttachment(it)
                         showContent(true)
                         initOptions()
+
+                        if (preferencesRepository.isIncognitoMode && it.message.unread) {
+                            showMessage(R.string.message_incognito_description)
+                        }
                     }
                 } else {
                     view?.run {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index c5a94793..7f5f140b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
+import androidx.annotation.StringRes
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.ui.base.BaseView
@@ -43,4 +44,6 @@ interface MessagePreviewView : BaseView {
     fun popView()
 
     fun printDocument(html: String, jobName: String)
+
+    fun showMessage(@StringRes messageId: Int)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index 592cbd60..4364e868 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -7,6 +7,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.View.*
 import android.widget.CompoundButton
+import androidx.annotation.StringRes
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 import androidx.core.os.bundleOf
@@ -134,14 +135,20 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         }
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.action_menu_message_tab, menu)
 
-        val searchView = menu.findItem(R.id.action_search).actionView as SearchView
-        searchView.queryHint = getString(R.string.all_search_hint)
-        searchView.maxWidth = Int.MAX_VALUE
+        initializeSearchView(menu)
+    }
+
+    private fun initializeSearchView(menu: Menu) {
+        val searchView = (menu.findItem(R.id.action_search).actionView as SearchView).apply {
+            queryHint = getString(R.string.all_search_hint)
+            maxWidth = Int.MAX_VALUE
+        }
         searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String) = false
             override fun onQueryTextChange(query: String): Boolean {
@@ -207,8 +214,8 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         binding.messageTabSwipe.isRefreshing = show
     }
 
-    override fun showMessagesDeleted() {
-        showMessage(getString(R.string.message_messages_deleted))
+    override fun showMessage(@StringRes messageId: Int) {
+        showMessage(getString(messageId))
     }
 
     override fun notifyParentShowNewMessage(show: Boolean) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index ec92e9c2..90f93b14 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
@@ -26,7 +27,7 @@ class MessageTabPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val analytics: AnalyticsHelper
+    private val analytics: AnalyticsHelper,
 ) : BasePresenter<MessageTabView>(errorHandler, studentRepository) {
 
     lateinit var folder: MessageFolder
@@ -135,7 +136,7 @@ class MessageTabPresenter @Inject constructor(
                 messageRepository.deleteMessages(student, selectedMailbox, messageList)
             }
                 .onFailure(errorHandler::dispatch)
-                .onSuccess { view?.showMessagesDeleted() }
+                .onSuccess { view?.showMessage(R.string.message_messages_deleted) }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index 6ece6621..247af434 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
+import androidx.annotation.StringRes
 import io.github.wulkanowy.data.db.entities.Mailbox
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.BaseView
@@ -26,7 +27,7 @@ interface MessageTabView : BaseView {
 
     fun showEmpty(show: Boolean)
 
-    fun showMessagesDeleted()
+    fun showMessage(@StringRes messageId: Int)
 
     fun showErrorView(show: Boolean)
 
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index 6c81100d..fefd9b13 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -38,4 +38,5 @@
     </string-array>
     <bool name="pref_default_ads_enabled">false</bool>
     <bool name="pref_default_ads_consent_data_processing">false</bool>
+    <bool name="pref_default_incognito_mode">false</bool>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 716639c0..e7fa542a 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -39,5 +39,6 @@
     <string name="pref_key_ads_privacy_policy">ads_privacy_policy</string>
     <string name="pref_key_ads_consent_data_processing">ads_consent_data_processing</string>
     <string name="pref_key_ads_over_eighteen">ads_over_eighteen</string>
+    <string name="pref_key_incognito_moge">incognito_mode</string>
     <string name="pref_key_menu_order">appearance_menu_order</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 98c316cb..9dc7e796 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -339,6 +339,8 @@
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
     <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
 
 
     <!--Note-->
@@ -728,6 +730,9 @@
     <string name="pref_other_grade_modifier_minus">Value of the minus</string>
     <string name="pref_other_fill_message_content">Reply with message history</string>
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
+
     <string name="pref_ads_support_category_name">Support</string>
     <string name="pref_ads_privacy_policy">Privacy Policy</string>
     <string name="pref_ads_agreements">Agreements</string>
diff --git a/app/src/main/res/xml/scheme_preferences_advanced.xml b/app/src/main/res/xml/scheme_preferences_advanced.xml
index 95f6f383..8185de81 100644
--- a/app/src/main/res/xml/scheme_preferences_advanced.xml
+++ b/app/src/main/res/xml/scheme_preferences_advanced.xml
@@ -53,5 +53,12 @@
             app:key="@string/pref_key_fill_message_content"
             app:singleLineTitle="false"
             app:title="@string/pref_other_fill_message_content" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_incognito_mode"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_incognito_moge"
+            app:singleLineTitle="false"
+            app:title="@string/pref_other_incognito_mode"
+            app:summary="@string/pref_other_incognito_mode_summary" />
     </PreferenceCategory>
 </PreferenceScreen>

From 7f6a13a9ee8cae095855b9798b4220b5bd127299 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:35:29 +0000
Subject: [PATCH 366/429] Bump coroutines from 1.7.2 to 1.7.3 (#2267)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f8603cc8..e188d709 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -187,7 +187,7 @@ ext {
     room = "2.5.2"
     chucker = "3.5.2"
     mockk = "1.13.5"
-    coroutines = "1.7.2"
+    coroutines = "1.7.3"
 }
 
 dependencies {

From fc2adff997dd24f2fc75d3cf7bcc60a564bf3716 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:35:38 +0000
Subject: [PATCH 367/429] Bump androidx.fragment:fragment-ktx from 1.6.0 to
 1.6.1 (#2269)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e188d709..d43b667c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -202,7 +202,7 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.7.2"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.6.0"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
     implementation "androidx.annotation:annotation:1.6.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"

From 0f129109ba25cace9a0e09cc4ed7d26668daa5ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 19:00:17 +0000
Subject: [PATCH 368/429] Bump com.android.tools.build:gradle from 8.0.2 to
 8.1.0 (#2266)

---
 app/build.gradle                         | 26 ++++++++++++------------
 build.gradle                             |  6 +++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d43b667c..74ef02bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,3 +1,6 @@
+import com.github.triplet.gradle.androidpublisher.ReleaseStatus
+import ru.cian.huawei.publish.ReleaseNote
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
@@ -17,7 +20,7 @@ apply from: 'hooks.gradle'
 
 android {
     namespace 'io.github.wulkanowy'
-    compileSdkVersion 33
+    compileSdk 33
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
@@ -78,7 +81,7 @@ android {
         }
     }
 
-    flavorDimensions "platform"
+    flavorDimensions += "platform"
 
     productFlavors {
         hms {
@@ -117,20 +120,20 @@ android {
         }
     }
 
-    testOptions.unitTests {
-        includeAndroidResources = true
+    testOptions {
+        unitTests.includeAndroidResources = true
         // workaround HMS test errors https://github.com/robolectric/robolectric/issues/2750
-        all { jvmArgs '-noverify' }
+        unitTests.all { jvmArgs '-noverify' }
     }
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
         freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
@@ -152,14 +155,11 @@ kapt {
 ksp {
     arg("room.schemaLocation", "$projectDir/schemas".toString())
 }
-kotlin {
-    jvmToolchain(11)
-}
 
 play {
     defaultToAppBundles = false
     track = 'production'
-    releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
+    releaseStatus = ReleaseStatus.IN_PROGRESS
     userFraction = 0.25d
     updatePriority = 1
     enabled.set(false)
@@ -172,7 +172,7 @@ huaweiPublish {
             buildFormat = "aab"
             deployType = "publish"
             releaseNotes = [
-                new ru.cian.huawei.publish.ReleaseNote(
+                new ReleaseNote(
                     "pl-PL",
                     "$projectDir/src/main/play/release-notes/pl-PL/default.txt"
                 )
diff --git a/build.gradle b/build.gradle
index 9584caac..c5a6f598 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,12 +14,12 @@ 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.11"
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.1.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
-        classpath "com.github.triplet.gradle:play-publisher:3.6.0"
+        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.0.3225"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
@@ -37,6 +37,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8707e8b5..9b0a13f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 50326c7a48644d6f5997df130d8d88a1496d7188 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 19:00:37 +0000
Subject: [PATCH 369/429] Bump androidx.recyclerview:recyclerview from 1.3.0 to
 1.3.1 (#2268)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 74ef02bc..197ea356 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -206,7 +206,7 @@ dependencies {
     implementation "androidx.annotation:annotation:1.6.0"
 
     implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation "androidx.recyclerview:recyclerview:1.3.0"
+    implementation "androidx.recyclerview:recyclerview:1.3.1"
     implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"

From 74820f9571cb9cf6259f45b73409552277ae975a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 31 Jul 2023 21:32:07 +0200
Subject: [PATCH 370/429] New Crowdin updates (#2265)

---
 app/src/main/res/values-cs/strings.xml     | 6 +++++-
 app/src/main/res/values-da-rDK/strings.xml | 4 ++++
 app/src/main/res/values-de/strings.xml     | 4 ++++
 app/src/main/res/values-es-rES/strings.xml | 4 ++++
 app/src/main/res/values-it-rIT/strings.xml | 4 ++++
 app/src/main/res/values-pl/strings.xml     | 4 ++++
 app/src/main/res/values-ru/strings.xml     | 4 ++++
 app/src/main/res/values-sk/strings.xml     | 6 +++++-
 app/src/main/res/values-uk/strings.xml     | 4 ++++
 9 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 964329da..ff461d42 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -37,7 +37,7 @@
     <string name="login_login_pesel_email_hint">Přihlášení, číslo PESEL nebo e-mail</string>
     <string name="login_password_hint">Heslo</string>
     <string name="login_host_hint">Variace deníku UONET+</string>
-    <string name="login_domain_suffix_hint">Custom domain suffix</string>
+    <string name="login_domain_suffix_hint">Vlastní přípona domény</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybridní</string>
@@ -352,6 +352,8 @@
     </plurals>
     <string name="message_messages_deleted">Zprávy odstraněné</string>
     <string name="message_mailbox_chooser_title">Vyberte poštovní schránku</string>
+    <string name="message_incognito_mode_on">Anonymní režim je zapnutý</string>
+    <string name="message_incognito_description">Díky anonymnímu režimu není odesílatel upozorněn, když si zprávu přečtete</string>
     <!--Note-->
     <string name="note_no_items">Žádné informace o poznámkách</string>
     <string name="note_points">Body</string>
@@ -738,6 +740,8 @@
     <string name="pref_other_grade_modifier_minus">Hodnota mínusu</string>
     <string name="pref_other_fill_message_content">Odpovědět s historií zpráv</string>
     <string name="pref_other_optional_arithmetic_average">Vypočítat aritmetický průměr, pokud žádná známka nemá váhu</string>
+    <string name="pref_other_incognito_mode">Anonymní režim</string>
+    <string name="pref_other_incognito_mode_summary">Neinformovat o přečtení zprávy</string>
     <string name="pref_ads_support_category_name">Podpora</string>
     <string name="pref_ads_privacy_policy">Ochrana osobních údajů</string>
     <string name="pref_ads_agreements">Souhlasy</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 5c7d02a0..259a4264 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -310,6 +310,8 @@
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
     <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
     <string name="note_points">Points</string>
@@ -650,6 +652,8 @@
     <string name="pref_other_grade_modifier_minus">Value of the minus</string>
     <string name="pref_other_fill_message_content">Reply with message history</string>
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
     <string name="pref_ads_support_category_name">Support</string>
     <string name="pref_ads_privacy_policy">Privacy Policy</string>
     <string name="pref_ads_agreements">Agreements</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 96423e35..1836d047 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -310,6 +310,8 @@
     </plurals>
     <string name="message_messages_deleted">Nachrichten gelöscht</string>
     <string name="message_mailbox_chooser_title">Postfach auswählen</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
     <!--Note-->
     <string name="note_no_items">Keine Informationen über Eintragen</string>
     <string name="note_points">Punkte</string>
@@ -650,6 +652,8 @@
     <string name="pref_other_grade_modifier_minus">Wert des Minus</string>
     <string name="pref_other_fill_message_content">Antwort mit Nachrichtenhistorie</string>
     <string name="pref_other_optional_arithmetic_average">Arithmetisches Mittel anzeigen, wenn keine Gewichte angegeben sind</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
     <string name="pref_ads_support_category_name">Unterstützung</string>
     <string name="pref_ads_privacy_policy">Datenschutz-Bestimmungen</string>
     <string name="pref_ads_agreements">Vereinbarungen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 5c7d02a0..259a4264 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -310,6 +310,8 @@
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
     <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
     <string name="note_points">Points</string>
@@ -650,6 +652,8 @@
     <string name="pref_other_grade_modifier_minus">Value of the minus</string>
     <string name="pref_other_fill_message_content">Reply with message history</string>
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
     <string name="pref_ads_support_category_name">Support</string>
     <string name="pref_ads_privacy_policy">Privacy Policy</string>
     <string name="pref_ads_agreements">Agreements</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 5c7d02a0..259a4264 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -310,6 +310,8 @@
     </plurals>
     <string name="message_messages_deleted">Messages deleted</string>
     <string name="message_mailbox_chooser_title">Choose mailbox</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
     <string name="note_points">Points</string>
@@ -650,6 +652,8 @@
     <string name="pref_other_grade_modifier_minus">Value of the minus</string>
     <string name="pref_other_fill_message_content">Reply with message history</string>
     <string name="pref_other_optional_arithmetic_average">Show arithmetic average when no weights provided</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
     <string name="pref_ads_support_category_name">Support</string>
     <string name="pref_ads_privacy_policy">Privacy Policy</string>
     <string name="pref_ads_agreements">Agreements</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 2c707797..0c1bbf78 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -352,6 +352,8 @@
     </plurals>
     <string name="message_messages_deleted">Wiadomości zostały usunięte</string>
     <string name="message_mailbox_chooser_title">Wybierz skrzynkę</string>
+    <string name="message_incognito_mode_on">Tryb incognito jest włączony</string>
+    <string name="message_incognito_description">Dzięki trybowi incognito nadawca nie zobaczy, że przeczytałeś tę wiadomość</string>
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
     <string name="note_points">Punkty</string>
@@ -738,6 +740,8 @@
     <string name="pref_other_grade_modifier_minus">Wartość minusa</string>
     <string name="pref_other_fill_message_content">Odpowiadaj z historią wiadomości</string>
     <string name="pref_other_optional_arithmetic_average">Licz średnią arytmetyczną, gdy żadna ocena nie ma wagi</string>
+    <string name="pref_other_incognito_mode">Tryb incognito</string>
+    <string name="pref_other_incognito_mode_summary">Nie informuj o przeczytaniu wiadomości</string>
     <string name="pref_ads_support_category_name">Wsparcie</string>
     <string name="pref_ads_privacy_policy">Polityka prywatności</string>
     <string name="pref_ads_agreements">Zgody</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index eb8be002..60697174 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -352,6 +352,8 @@
     </plurals>
     <string name="message_messages_deleted">Сообщение удалено</string>
     <string name="message_mailbox_chooser_title">Выбрать почтовый ящик</string>
+    <string name="message_incognito_mode_on">Incognito mode is on</string>
+    <string name="message_incognito_description">Thanks to incognito mode sender is not notified when you read the message</string>
     <!--Note-->
     <string name="note_no_items">Нет записей о замечаниях и свершениях</string>
     <string name="note_points">Баллы</string>
@@ -738,6 +740,8 @@
     <string name="pref_other_grade_modifier_minus">Стоимость минуса</string>
     <string name="pref_other_fill_message_content">Отвечать с историей сообщений</string>
     <string name="pref_other_optional_arithmetic_average">Показывать среднее арифметическое при отсутствии стоимости</string>
+    <string name="pref_other_incognito_mode">Incognito mode</string>
+    <string name="pref_other_incognito_mode_summary">Do not inform about reading the message</string>
     <string name="pref_ads_support_category_name">Поддержка</string>
     <string name="pref_ads_privacy_policy">Политика приватности</string>
     <string name="pref_ads_agreements">Соглашения</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index bcbd832a..20d8818b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -37,7 +37,7 @@
     <string name="login_login_pesel_email_hint">Prihlásenie, číslo PESEL alebo e-mail</string>
     <string name="login_password_hint">Heslo</string>
     <string name="login_host_hint">Variácia denníka UONET+</string>
-    <string name="login_domain_suffix_hint">Custom domain suffix</string>
+    <string name="login_domain_suffix_hint">Vlastná prípona domény</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybridné</string>
@@ -352,6 +352,8 @@
     </plurals>
     <string name="message_messages_deleted">Správy odstránené</string>
     <string name="message_mailbox_chooser_title">Vyberte poštovú schránku</string>
+    <string name="message_incognito_mode_on">Režim inkognito je zapnutý</string>
+    <string name="message_incognito_description">Vďaka inkognito režimu nie je odosielateľ upozornený, keď si správu prečítate</string>
     <!--Note-->
     <string name="note_no_items">Žiadne informácie o poznámkach</string>
     <string name="note_points">Body</string>
@@ -738,6 +740,8 @@
     <string name="pref_other_grade_modifier_minus">Hodnota mínusu</string>
     <string name="pref_other_fill_message_content">Odpovedať s históriou správ</string>
     <string name="pref_other_optional_arithmetic_average">Vypočítať aritmetický priemer, ak žiadna známka nemá váhu</string>
+    <string name="pref_other_incognito_mode">Režim inkognito</string>
+    <string name="pref_other_incognito_mode_summary">Neinformovať o prečítaní správy</string>
     <string name="pref_ads_support_category_name">Podpora</string>
     <string name="pref_ads_privacy_policy">Ochrana osobných údajov</string>
     <string name="pref_ads_agreements">Súhlasy</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f89e38fc..db5c3cb0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -352,6 +352,8 @@
     </plurals>
     <string name="message_messages_deleted">Листи видалено</string>
     <string name="message_mailbox_chooser_title">Вибрати поштову скриньку</string>
+    <string name="message_incognito_mode_on">Режим анонімності включено</string>
+    <string name="message_incognito_description">Завдяки режиму анонімності, відправник не буде сповіщений коли ви прочитаєте повідомлення</string>
     <!--Note-->
     <string name="note_no_items">Немає інформації о зауваженнях</string>
     <string name="note_points">Бали</string>
@@ -738,6 +740,8 @@
     <string name="pref_other_grade_modifier_minus">Вартість мінуса</string>
     <string name="pref_other_fill_message_content">Відповісти з історією повідомлень</string>
     <string name="pref_other_optional_arithmetic_average">Вилічити середню аритметичну, якщо оцінка немає вартості</string>
+    <string name="pref_other_incognito_mode">Анонімний режим</string>
+    <string name="pref_other_incognito_mode_summary">Не повідомляти про прочитання повідомлення</string>
     <string name="pref_ads_support_category_name">Підтримка</string>
     <string name="pref_ads_privacy_policy">Політика конфіденційності</string>
     <string name="pref_ads_agreements">Угоди</string>

From 722b4e58126de65c05dcee6c048cd410a7db6db0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:19:33 +0000
Subject: [PATCH 371/429] Bump androidx.preference:preference-ktx from 1.2.0 to
 1.2.1 (#2274)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 197ea356..8ff34207 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -205,7 +205,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:1.6.1"
     implementation "androidx.annotation:annotation:1.6.0"
 
-    implementation "androidx.preference:preference-ktx:1.2.0"
+    implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.1"
     implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"

From c4396036ce7790fb4c35714393b6235be3c36512 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:19:49 +0000
Subject: [PATCH 372/429] Bump com.google.firebase:firebase-bom from 32.2.0 to
 32.2.2 (#2271)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8ff34207..5f148144 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,7 +247,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.2.0')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.2')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From e21c17ea99005a578d47f101b020ce1faa9b9985 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:20:05 +0000
Subject: [PATCH 373/429] Bump com.google.firebase:firebase-crashlytics-gradle
 from 2.9.7 to 2.9.8 (#2270)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c5a6f598..2b52c068 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.1.300'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.8'
         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.0.3225"

From 8fbe341607467ea821e3b58b38193af2fe7fc639 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:20:19 +0000
Subject: [PATCH 374/429] Bump com.huawei.hms:hianalytics from 6.10.0.302 to
 6.10.0.303 (#2272)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5f148144..824c8376 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -256,7 +256,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:22.2.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.302'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.303'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From 7d5a29d4053fecdf7e1b1c6e4cf0d7cdf554789a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:20:45 +0000
Subject: [PATCH 375/429] Bump org.gradle.toolchains.foojay-resolver-convention
 (#2276)

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index af9bb737..16731297 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.6.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }
 include ':app'

From 024ca897084bf1b939afb747ec4be1220d89ace8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:39:04 +0000
Subject: [PATCH 376/429] Bump mockk from 1.13.5 to 1.13.7 (#2275)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 824c8376..37b165c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.5.2"
     chucker = "3.5.2"
-    mockk = "1.13.5"
+    mockk = "1.13.7"
     coroutines = "1.7.3"
 }
 

From 533157709b3db6ea03827b75660a1c77761cac7f Mon Sep 17 00:00:00 2001
From: Antoni Paduch <70513486+janAte1@users.noreply.github.com>
Date: Tue, 22 Aug 2023 23:47:12 +0200
Subject: [PATCH 377/429] Add option to show empty tiles in the timetable
 (#2236)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mikołaj Pich <m.pich@outlook.com>
---
 app/src/main/assets/contributors.json         |   4 +
 .../wulkanowy/data/enums/TimetableGapsMode.kt |  11 ++
 .../repositories/PreferencesRepository.kt     |   9 +-
 .../widgets/TimetableWidgetService.kt         |  12 +-
 .../ui/modules/timetable/TimetableAdapter.kt  |  47 ++++++--
 .../ui/modules/timetable/TimetableItem.kt     |   6 +
 .../modules/timetable/TimetablePresenter.kt   |  71 +++++++++---
 .../timetablewidget/TimetableWidgetFactory.kt | 107 ++++++++++++++----
 .../timetablewidget/TimetableWidgetItem.kt    |  26 +++++
 .../main/res/layout/item_timetable_empty.xml  |  43 +++++++
 .../layout/item_widget_timetable_empty.xml    |  36 ++++++
 .../main/res/values-pl/preferences_values.xml |   5 +
 app/src/main/res/values-pl/strings.xml        |   7 ++
 .../main/res/values/preferences_defaults.xml  |   1 +
 app/src/main/res/values/preferences_keys.xml  |   1 +
 .../main/res/values/preferences_values.xml    |  11 ++
 app/src/main/res/values/strings.xml           |   5 +
 .../res/xml/scheme_preferences_appearance.xml |   8 ++
 18 files changed, 363 insertions(+), 47 deletions(-)
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/enums/TimetableGapsMode.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt
 create mode 100644 app/src/main/res/layout/item_timetable_empty.xml
 create mode 100644 app/src/main/res/layout/item_widget_timetable_empty.xml

diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
index b2849931..a7629c22 100644
--- a/app/src/main/assets/contributors.json
+++ b/app/src/main/assets/contributors.json
@@ -50,5 +50,9 @@
   {
     "displayName": "Tomasz F.",
     "githubUsername": "Pengwius"
+  },
+  {
+    "displayName": "Antoni Paduch",
+    "githubUsername": "janAte1"
   }
 ]
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/TimetableGapsMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/TimetableGapsMode.kt
new file mode 100644
index 00000000..c8310c02
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/TimetableGapsMode.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.enums
+
+enum class TimetableGapsMode(val value: String) {
+    NO_GAPS("no_gaps"),
+    BETWEEN_LESSONS("between"),
+    BETWEEN_AND_BEFORE_LESSONS("before_and_between");
+
+    companion object {
+        fun getByValue(value: String) = entries.find { it.value == value } ?: BETWEEN_LESSONS
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
index 1b489340..85c74072 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt
@@ -15,7 +15,6 @@ import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
 import io.github.wulkanowy.ui.modules.settings.appearance.menuorder.AppMenuItem
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.time.Instant
@@ -201,6 +200,14 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_timetable_show_timers
         )
 
+    val showTimetableGaps: TimetableGapsMode
+        get() = TimetableGapsMode.getByValue(
+            getString(
+                R.string.pref_key_timetable_show_gaps,
+                R.string.pref_default_timetable_show_gaps
+            )
+        )
+
     val showSubjectsWithoutGrades: Boolean
         get() = getBoolean(
             R.string.pref_key_subjects_without_grades,
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index d48556fa..ffdb07ec 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.widget.RemoteViewsService
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
@@ -26,10 +27,19 @@ class TimetableWidgetService : RemoteViewsService() {
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
+    @Inject
+    lateinit var prefRepository: PreferencesRepository
+
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
         Timber.d("TimetableWidgetFactory created")
         return TimetableWidgetFactory(
-            timetableRepo, studentRepo, semesterRepo, sharedPref, applicationContext, intent
+            timetableRepository = timetableRepo,
+            studentRepository = studentRepo,
+            semesterRepository = semesterRepo,
+            sharedPref = sharedPref,
+            prefRepository = prefRepository,
+            context = applicationContext,
+            intent = intent,
         )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
index d917e7d5..1201937c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -12,7 +12,9 @@ import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.databinding.ItemTimetableBinding
+import io.github.wulkanowy.databinding.ItemTimetableEmptyBinding
 import io.github.wulkanowy.databinding.ItemTimetableSmallBinding
+import io.github.wulkanowy.utils.getPlural
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.toFormattedString
 import javax.inject.Inject
@@ -29,9 +31,14 @@ class TimetableAdapter @Inject constructor() :
             TimetableItemType.SMALL -> SmallViewHolder(
                 ItemTimetableSmallBinding.inflate(inflater, parent, false)
             )
+
             TimetableItemType.NORMAL -> NormalViewHolder(
                 ItemTimetableBinding.inflate(inflater, parent, false)
             )
+
+            TimetableItemType.EMPTY -> EmptyViewHolder(
+                ItemTimetableEmptyBinding.inflate(inflater, parent, false)
+            )
         }
     }
 
@@ -40,12 +47,12 @@ class TimetableAdapter @Inject constructor() :
         position: Int,
         payloads: MutableList<Any>
     ) {
-        if (payloads.isEmpty()) return super.onBindViewHolder(holder, position, payloads)
-
-        if (holder is NormalViewHolder) updateTimeLeft(
-            binding = holder.binding,
-            timeLeft = (getItem(position) as TimetableItem.Normal).timeLeft,
-        )
+        if (payloads.isNotEmpty() && holder is NormalViewHolder) {
+            updateTimeLeft(
+                binding = holder.binding,
+                timeLeft = (getItem(position) as TimetableItem.Normal).timeLeft,
+            )
+        } else super.onBindViewHolder(holder, position, payloads)
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
@@ -54,10 +61,16 @@ class TimetableAdapter @Inject constructor() :
                 binding = holder.binding,
                 item = getItem(position) as TimetableItem.Small,
             )
+
             is NormalViewHolder -> bindNormalView(
                 binding = holder.binding,
                 item = getItem(position) as TimetableItem.Normal,
             )
+
+            is EmptyViewHolder -> bindEmptyView(
+                binding = holder.binding,
+                item = getItem(position) as TimetableItem.Empty,
+            )
         }
     }
 
@@ -100,6 +113,19 @@ class TimetableAdapter @Inject constructor() :
         }
     }
 
+    private fun bindEmptyView(binding: ItemTimetableEmptyBinding, item: TimetableItem.Empty) {
+        with(binding) {
+            timetableEmptyItemNumber.text = when (item.numFrom) {
+                item.numTo -> item.numFrom.toString()
+                else -> "${item.numFrom}-${item.numTo}"
+            }
+            timetableEmptyItemSubject.text = timetableEmptyItemSubject.context.getPlural(
+                R.plurals.timetable_no_lesson,
+                item.numTo - item.numFrom + 1
+            )
+        }
+    }
+
     private fun updateTimeLeft(binding: ItemTimetableBinding, timeLeft: TimeLeft?) {
         with(binding) {
             when {
@@ -137,6 +163,7 @@ class TimetableAdapter @Inject constructor() :
                     timetableItemTimeLeft.visibility = VISIBLE
                     timetableItemTimeLeft.text = root.context.getString(R.string.timetable_finished)
                 }
+
                 else -> {
                     timetableItemTimeUntil.visibility = GONE
                     timetableItemTimeLeft.visibility = GONE
@@ -191,7 +218,8 @@ class TimetableAdapter @Inject constructor() :
                 )
             } else {
                 timetableItemDescription.visibility = GONE
-                timetableItemRoom.isVisible = lesson.room.isNotBlank() || lesson.roomOld.isNotBlank()
+                timetableItemRoom.isVisible =
+                    lesson.room.isNotBlank() || lesson.roomOld.isNotBlank()
                 timetableItemGroup.isVisible = item.showGroupsInPlan && lesson.group.isNotBlank()
                 timetableItemTeacher.visibility = VISIBLE
             }
@@ -274,6 +302,9 @@ class TimetableAdapter @Inject constructor() :
     private class SmallViewHolder(val binding: ItemTimetableSmallBinding) :
         RecyclerView.ViewHolder(binding.root)
 
+    private class EmptyViewHolder(val binding: ItemTimetableEmptyBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
     companion object {
         private val differ = object : DiffUtil.ItemCallback<TimetableItem>() {
             override fun areItemsTheSame(oldItem: TimetableItem, newItem: TimetableItem): Boolean =
@@ -281,9 +312,11 @@ class TimetableAdapter @Inject constructor() :
                     oldItem is TimetableItem.Small && newItem is TimetableItem.Small -> {
                         oldItem.lesson.start == newItem.lesson.start
                     }
+
                     oldItem is TimetableItem.Normal && newItem is TimetableItem.Normal -> {
                         oldItem.lesson.start == newItem.lesson.start
                     }
+
                     else -> oldItem == newItem
                 }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
index 92716ace..105ece38 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
@@ -16,6 +16,11 @@ sealed class TimetableItem(val type: TimetableItemType) {
         val timeLeft: TimeLeft?,
         val onClick: (Timetable) -> Unit,
     ) : TimetableItem(TimetableItemType.NORMAL)
+
+    data class Empty(
+        val numFrom: Int,
+        val numTo: Int
+    ) : TimetableItem(TimetableItemType.EMPTY)
 }
 
 data class TimeLeft(
@@ -27,4 +32,5 @@ data class TimeLeft(
 enum class TimetableItemType {
     SMALL,
     NORMAL,
+    EMPTY
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index d0687408..0f8395de 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,23 +1,44 @@
 package io.github.wulkanowy.ui.modules.timetable
 
-import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.enums.TimetableGapsMode.BETWEEN_AND_BEFORE_LESSONS
+import io.github.wulkanowy.data.enums.TimetableGapsMode.NO_GAPS
 import io.github.wulkanowy.data.enums.TimetableMode
+import io.github.wulkanowy.data.flatResourceFlow
+import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.onResourceData
+import io.github.wulkanowy.data.onResourceError
+import io.github.wulkanowy.data.onResourceIntermediate
+import io.github.wulkanowy.data.onResourceNotLoading
+import io.github.wulkanowy.data.onResourceSuccess
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.capitalise
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.isJustFinished
+import io.github.wulkanowy.utils.isShowTimeUntil
+import io.github.wulkanowy.utils.left
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.until
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.time.Instant
 import java.time.LocalDate
-import java.time.LocalDate.*
-import java.util.*
+import java.time.LocalDate.now
+import java.time.LocalDate.of
+import java.time.LocalDate.ofEpochDay
+import java.util.Timer
 import javax.inject.Inject
 import kotlin.concurrent.timer
 
@@ -192,16 +213,38 @@ class TimetablePresenter @Inject constructor(
                 compareBy({ item -> item.number }, { item -> !item.isStudentPlan })
             )
 
-        return filteredItems.mapIndexed { i, it ->
-            if (it.isStudentPlan) TimetableItem.Normal(
-                lesson = it,
-                showGroupsInPlan = prefRepository.showGroupsInPlan,
-                timeLeft = filteredItems.getTimeLeftForLesson(it, i),
-                onClick = ::onTimetableItemSelected
-            ) else TimetableItem.Small(
-                lesson = it,
-                onClick = ::onTimetableItemSelected
-            )
+        var prevNum = when (prefRepository.showTimetableGaps) {
+            BETWEEN_AND_BEFORE_LESSONS -> 0
+            else -> null
+        }
+        return buildList {
+            filteredItems.forEachIndexed { i, it ->
+                if (prefRepository.showTimetableGaps != NO_GAPS && prevNum != null && it.number > prevNum!! + 1) {
+                    val emptyLesson = TimetableItem.Empty(
+                        numFrom = prevNum!! + 1,
+                        numTo = it.number - 1
+                    )
+                    add(emptyLesson)
+                }
+
+                if (it.isStudentPlan) {
+                    val normalLesson = TimetableItem.Normal(
+                        lesson = it,
+                        showGroupsInPlan = prefRepository.showGroupsInPlan,
+                        timeLeft = filteredItems.getTimeLeftForLesson(it, i),
+                        onClick = ::onTimetableItemSelected
+                    )
+                    add(normalLesson)
+                } else {
+                    val smallLesson = TimetableItem.Small(
+                        lesson = it,
+                        onClick = ::onTimetableItemSelected
+                    )
+                    add(smallLesson)
+                }
+
+                prevNum = it.number
+            }
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index d545413d..4e0578e2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -16,6 +16,9 @@ import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.enums.TimetableGapsMode.BETWEEN_AND_BEFORE_LESSONS
+import io.github.wulkanowy.data.enums.TimetableGapsMode.NO_GAPS
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
@@ -24,6 +27,7 @@ import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Co
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getTodayLastLessonEndDateTimeWidgetKey
 import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.utils.getPlural
 import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
@@ -35,11 +39,12 @@ class TimetableWidgetFactory(
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val sharedPref: SharedPrefProvider,
+    private val prefRepository: PreferencesRepository,
     private val context: Context,
     private val intent: Intent?
 ) : RemoteViewsService.RemoteViewsFactory {
 
-    private var lessons = emptyList<Timetable>()
+    private var items = emptyList<TimetableWidgetItem>()
 
     private var timetableCanceledColor: Int? = null
 
@@ -47,18 +52,13 @@ class TimetableWidgetFactory(
 
     private var timetableChangeColor: Int? = null
 
-    private var lastSyncInstant: Instant? = null
-
     override fun getLoadingView() = null
 
     override fun hasStableIds() = true
 
-    override fun getCount() = when {
-        lessons.isEmpty() -> 0
-        else -> lessons.size + 1
-    }
+    override fun getCount() = items.size
 
-    override fun getViewTypeCount() = 2
+    override fun getViewTypeCount() = 3
 
     override fun getItemId(position: Int) = position.toLong()
 
@@ -75,9 +75,10 @@ class TimetableWidgetFactory(
                 runBlocking {
                     val student = getStudent(studentId) ?: return@runBlocking
                     val semester = semesterRepository.getCurrentSemester(student)
-                    lessons = getLessons(student, semester, date)
-                    lastSyncInstant =
-                        timetableRepository.getLastRefreshTimestamp(semester, date, date)
+                    items = createItems(
+                        lessons = getLessons(student, semester, date),
+                        lastSync = timetableRepository.getLastRefreshTimestamp(semester, date, date)
+                    )
                     if (date == LocalDate.now()) {
                         updateTodayLastLessonEnd(appWidgetId)
                     }
@@ -101,8 +102,33 @@ class TimetableWidgetFactory(
         return lessons.sortedBy { it.number }
     }
 
+    private fun createItems(
+        lessons: List<Timetable>,
+        lastSync: Instant?,
+    ): List<TimetableWidgetItem> {
+        var prevNum = when (prefRepository.showTimetableGaps) {
+            BETWEEN_AND_BEFORE_LESSONS -> 0
+            else -> null
+        }
+        return buildList {
+            lessons.forEach {
+                if (prefRepository.showTimetableGaps != NO_GAPS && prevNum != null && it.number > prevNum!! + 1) {
+                    val emptyItem = TimetableWidgetItem.Empty(
+                        numFrom = prevNum!! + 1,
+                        numTo = it.number - 1
+                    )
+                    add(emptyItem)
+                }
+                add(TimetableWidgetItem.Normal(it))
+                prevNum = it.number
+            }
+            add(TimetableWidgetItem.Synchronized(lastSync ?: Instant.MIN))
+        }
+    }
+
     private fun updateTodayLastLessonEnd(appWidgetId: Int) {
-        val todayLastLessonEnd = lessons.maxOfOrNull { it.end } ?: return
+        val todayLastLessonEnd = items.filterIsInstance<TimetableWidgetItem.Normal>()
+            .maxOfOrNull { it.lesson.end } ?: return
         val key = getTodayLastLessonEndDateTimeWidgetKey(appWidgetId)
         sharedPref.putLong(key, todayLastLessonEnd.epochSecond, true)
     }
@@ -112,15 +138,15 @@ class TimetableWidgetFactory(
     }
 
     override fun getViewAt(position: Int): RemoteViews? {
-        if (position == lessons.size) {
-            val synchronizationInstant = lastSyncInstant ?: Instant.MIN
-            val synchronizationText = getSynchronizationInfoText(synchronizationInstant)
-            return RemoteViews(context.packageName, R.layout.item_widget_timetable_footer).apply {
-                setTextViewText(R.id.timetableWidgetSynchronizationTime, synchronizationText)
-            }
+        return when (val item = items.getOrNull(position) ?: return null) {
+            is TimetableWidgetItem.Normal -> getNormalItemRemoteView(item)
+            is TimetableWidgetItem.Empty -> getEmptyItemRemoteView(item)
+            is TimetableWidgetItem.Synchronized -> getSynchronizedItemRemoteView(item)
         }
+    }
 
-        val lesson = lessons.getOrNull(position) ?: return null
+    private fun getNormalItemRemoteView(item: TimetableWidgetItem.Normal): RemoteViews {
+        val lesson = item.lesson
 
         val lessonStartTime = lesson.start.toFormattedString(TIME_FORMAT_STYLE)
         val lessonEndTime = lesson.end.toFormattedString(TIME_FORMAT_STYLE)
@@ -130,30 +156,63 @@ class TimetableWidgetFactory(
             setTextViewText(R.id.timetableWidgetItemTimeStart, lessonStartTime)
             setTextViewText(R.id.timetableWidgetItemTimeFinish, lessonEndTime)
             setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
+
             setTextViewText(R.id.timetableWidgetItemTeacher, lesson.teacher)
             setTextViewText(R.id.timetableWidgetItemDescription, lesson.info)
             setOnClickFillInIntent(R.id.timetableWidgetItemContainer, Intent())
         }
-
         updateTheme()
         clearLessonStyles(remoteViews)
-
         if (lesson.room.isBlank()) {
             remoteViews.setViewVisibility(R.id.timetableWidgetItemRoom, GONE)
         } else {
             remoteViews.setTextViewText(R.id.timetableWidgetItemRoom, lesson.room)
         }
-
         when {
             lesson.canceled -> applyCancelledLessonStyles(remoteViews)
             lesson.changes or lesson.info.isNotBlank() -> applyChangedLessonStyles(
-                remoteViews, lesson
+                remoteViews = remoteViews,
+                lesson = lesson,
             )
         }
-
         return remoteViews
     }
 
+    private fun getEmptyItemRemoteView(item: TimetableWidgetItem.Empty): RemoteViews {
+        return RemoteViews(
+            context.packageName,
+            R.layout.item_widget_timetable_empty
+        ).apply {
+            setTextViewText(
+                R.id.timetableWidgetEmptyItemNumber,
+                when (item.numFrom) {
+                    item.numTo -> item.numFrom.toString()
+                    else -> "${item.numFrom}-${item.numTo}"
+                }
+            )
+            setTextViewText(
+                R.id.timetableWidgetEmptyItemText,
+                context.getPlural(
+                    R.plurals.timetable_no_lesson,
+                    item.numTo - item.numFrom + 1
+                )
+            )
+            setOnClickFillInIntent(R.id.timetableWidgetEmptyItemContainer, Intent())
+        }
+    }
+
+    private fun getSynchronizedItemRemoteView(item: TimetableWidgetItem.Synchronized): RemoteViews {
+        return RemoteViews(
+            context.packageName,
+            R.layout.item_widget_timetable_footer
+        ).apply {
+            setTextViewText(
+                R.id.timetableWidgetSynchronizationTime,
+                getSynchronizationInfoText(item.timestamp)
+            )
+        }
+    }
+
     private fun updateTheme() {
         when (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
             Configuration.UI_MODE_NIGHT_YES -> {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt
new file mode 100644
index 00000000..166b1a8f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetItem.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.ui.modules.timetablewidget
+
+import io.github.wulkanowy.data.db.entities.Timetable
+import java.time.Instant
+
+sealed class TimetableWidgetItem(val type: TimetableWidgetItemType) {
+
+    data class Normal(
+        val lesson: Timetable,
+    ) : TimetableWidgetItem(TimetableWidgetItemType.NORMAL)
+
+    data class Empty(
+        val numFrom: Int,
+        val numTo: Int
+    ) : TimetableWidgetItem(TimetableWidgetItemType.EMPTY)
+
+    data class Synchronized(
+        val timestamp: Instant,
+    ) : TimetableWidgetItem(TimetableWidgetItemType.SYNCHRONIZED)
+}
+
+enum class TimetableWidgetItemType {
+    NORMAL,
+    EMPTY,
+    SYNCHRONIZED,
+}
diff --git a/app/src/main/res/layout/item_timetable_empty.xml b/app/src/main/res/layout/item_timetable_empty.xml
new file mode 100644
index 00000000..12fddb75
--- /dev/null
+++ b/app/src/main/res/layout/item_timetable_empty.xml
@@ -0,0 +1,43 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:paddingStart="8dp"
+    android:paddingTop="6dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="6dp"
+    tools:context=".ui.modules.timetable.TimetableAdapter">
+
+    <TextView
+        android:id="@+id/timetableEmptyItemNumber"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:maxLength="5"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
+        android:textColor="?android:textColorHint"
+        android:textSize="32sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="1-4" />
+
+    <TextView
+        android:id="@+id/timetableEmptyItemSubject"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorHint"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="@+id/timetableEmptyItemNumber"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/timetableEmptyItemNumber"
+        app:layout_constraintTop_toTopOf="@+id/timetableEmptyItemNumber"
+        tools:text="No lessons" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_empty.xml b/app/src/main/res/layout/item_widget_timetable_empty.xml
new file mode 100644
index 00000000..a48b3645
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_timetable_empty.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/timetableWidgetEmptyItemContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/background_widget_item_timetable"
+    android:backgroundTint="?attr/colorSurface"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingHorizontal="12dp"
+    android:paddingVertical="8dp"
+    android:theme="@style/Wulkanowy.Widget.Theme"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
+
+    <TextView
+        android:id="@+id/timetableWidgetEmptyItemNumber"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceHeadline6"
+        android:textColor="?android:textColorHint"
+        android:textSize="22sp"
+        tools:text="1-4" />
+
+    <TextView
+        android:id="@+id/timetableWidgetEmptyItemText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:textAppearance="?attr/textAppearanceTitleMedium"
+        android:textColor="?android:textColorHint"
+        tools:text="No lessons" />
+
+</LinearLayout>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 45600574..8872b7ab 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Średnia ze średnich z obu semestrów</item>
         <item>Średnia wszystkich ocen z całego roku</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Nie pokauj</item>
+        <item>Tylko między lekcjami</item>
+        <item>Przed i między lekcjami</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Szczęśliwy numerek</item>
         <item>Nieprzeczytane wiadomości</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0c1bbf78..a2b5510e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -185,6 +185,12 @@
     <string name="timetable_notify_change_room">Zmiana sali z %1$s na %2$s</string>
     <string name="timetable_notify_change_teacher">Zmiana nauczyciela z %1$s na %2$s</string>
     <string name="timetable_notify_change_subject">Zmiana przedmiotu z %1$s na %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">Brak lekcji</item>
+        <item quantity="few">Brak lekcji</item>
+        <item quantity="many">Brak lekcji</item>
+        <item quantity="other">Brak lekcji</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Zmiana planu lekcji</item>
         <item quantity="few">Zmiany planu lekcji</item>
@@ -700,6 +706,7 @@
     <string name="pref_view_expand_grade">Rozwijanie ocen</string>
     <string name="pref_view_timetable_show_timers">Oznaczaj bieżącą lekcję</string>
     <string name="pref_view_timetable_show_groups">Pokazuj grupę obok przedmiotu</string>
+    <string name="pref_view_timetable_show_gaps">Pokazuj puste kafelki gdzie nie ma lekcji</string>
     <string name="pref_view_grade_statistics_list">Pokazuj listę wykresów w ocenach klasy</string>
     <string name="pref_view_subjects_without_grades">Pokazuj przedmioty bez ocen</string>
     <string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index fefd9b13..8d69f25c 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -23,6 +23,7 @@
     <string name="pref_default_timetable_show_whole_class">no</string>
     <string name="pref_default_grade_sorting_mode">alphabetic</string>
     <bool name="pref_default_timetable_show_timers">false</bool>
+    <string name="pref_default_timetable_show_gaps">between</string>
     <bool name="pref_default_subjects_without_grades">false</bool>
     <bool name="pref_default_optional_arithmetic_average">false</bool>
     <string name="pref_default_last_sync_date">0</string>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index e7fa542a..c48381e8 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -28,6 +28,7 @@
     <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
     <string name="pref_key_timetable_show_groups">show_groups_in_plan</string>
     <string name="pref_key_timetable_show_timers">timetable_show_timers</string>
+    <string name="pref_key_timetable_show_gaps">timetable_show_gaps</string>
     <string name="pref_key_subjects_without_grades">subjects_without_grades</string>
     <string name="pref_key_optional_arithmetic_average">optional_arithmetic_average</string>
     <string name="pref_key_message_draft">message_draft</string>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 312f0b87..f56707c8 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -123,6 +123,17 @@
         <item>all_year</item>
     </string-array>
 
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
+    <string-array name="timetable_show_gaps_values" translatable="false">
+        <item>no_gaps</item>
+        <item>between</item>
+        <item>before_and_between</item>
+    </string-array>
+
     <string-array name="dashboard_tile_entries">
         <item>Lucky number</item>
         <item>Unread messages</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9dc7e796..ce277bdc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -186,6 +186,10 @@
     <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
     <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
     <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Timetable change</item>
         <item quantity="other">Timetable changes</item>
@@ -690,6 +694,7 @@
     <string name="pref_view_expand_grade">Grades expanding</string>
     <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
     <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
diff --git a/app/src/main/res/xml/scheme_preferences_appearance.xml b/app/src/main/res/xml/scheme_preferences_appearance.xml
index 62216c76..7177d396 100644
--- a/app/src/main/res/xml/scheme_preferences_appearance.xml
+++ b/app/src/main/res/xml/scheme_preferences_appearance.xml
@@ -111,5 +111,13 @@
                    app:title="@string/pref_view_timetable_show_whole_class"
                    app:useSimpleSummaryProvider="true" />
         -->
+        <ListPreference
+            app:defaultValue="@string/pref_default_timetable_show_gaps"
+            app:entries="@array/timetable_show_gaps_entries"
+            app:entryValues="@array/timetable_show_gaps_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_timetable_show_gaps"
+            app:title="@string/pref_view_timetable_show_gaps"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 </PreferenceScreen>

From 2e2b13384a214fed9599a713fe7cbeedf0eb9cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Wed, 23 Aug 2023 12:24:17 +0200
Subject: [PATCH 378/429] Try to switch to next school year before it starts
 (#2278)

---
 app/build.gradle                              |  2 +-
 .../data/repositories/SemesterRepository.kt   |  4 +--
 .../wulkanowy/utils/SemesterExtension.kt      | 17 ++++++++--
 .../repositories/SemesterRepositoryTest.kt    | 23 +++++++------
 .../utils/SemesterExtensionKtTest.kt          | 34 +++++++++++++++++++
 5 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 37b165c1..136c5430 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -191,7 +191,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.8'
+    implementation 'io.github.wulkanowy:sdk:2.0.9-SNAPSHOT'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
index 92bb3708..dd44df70 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
@@ -41,7 +41,7 @@ class SemesterRepository @Inject constructor(
 
         val isRefreshOnModeChangeRequired = when {
             Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.HEBE -> {
-                semesters.firstOrNull { it.isCurrent }?.let {
+                semesters.firstOrNull { it.isCurrent() }?.let {
                     0 == it.diaryId && 0 == it.kindergartenDiaryId
                 } == true
             }
@@ -49,7 +49,7 @@ class SemesterRepository @Inject constructor(
         }
 
         val isRefreshOnNoCurrentAppropriate =
-            refreshOnNoCurrent && !semesters.any { semester -> semester.isCurrent }
+            refreshOnNoCurrent && !semesters.any { semester -> semester.isCurrent() }
 
         return forceRefresh || isNoSemesters || isRefreshOnModeChangeRequired || isRefreshOnNoCurrentAppropriate
     }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
index 380d6bf6..e3b8a3b4 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -1,16 +1,27 @@
 package io.github.wulkanowy.utils
 
 import io.github.wulkanowy.data.db.entities.Semester
+import java.time.LocalDate
 import java.time.LocalDate.now
+import java.time.Month
 
-inline val Semester.isCurrent: Boolean
-    get() = now() in start..end
+fun Semester.isCurrent(now: LocalDate = now()): Boolean {
+    val shiftedStart = if (start.month == Month.SEPTEMBER) {
+        start.minusDays(3)
+    } else start
+
+    val shiftedEnd = if (end.month == Month.AUGUST || end.month == Month.SEPTEMBER) {
+        end.minusDays(3)
+    } else end
+
+    return now in shiftedStart..shiftedEnd
+}
 
 fun List<Semester>.getCurrentOrLast(): Semester {
     if (isEmpty()) throw RuntimeException("Empty semester list")
 
     // when there is only one current semester
-    singleOrNull { it.isCurrent }?.let { return it }
+    singleOrNull { it.isCurrent() }?.let { return it }
 
     // when there is more than one current semester - find one with higher id
     singleOrNull { semester -> semester.semesterId == maxByOrNull { it.semesterId }?.semesterId }?.let { return it }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
index d8256869..31098d2e 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/SemesterRepositoryTest.kt
@@ -15,6 +15,7 @@ import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
 import io.mockk.just
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
@@ -81,15 +82,15 @@ class SemesterRepositoryTest {
     }
 
     @Test
-    fun getSemesters_invalidDiary_scrapper() {
+    fun getSemesters_invalidDiary_scrapper() = runTest {
         val badSemesters = listOf(
-            getSemesterPojo(0, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(0, 2, now().minusMonths(3), now())
+            getSemesterPojo(0, 2, now().minusMonths(6), now()),
+            getSemesterPojo(0, 2, now(), now().plusMonths(6)),
         )
 
         val goodSemesters = listOf(
-            getSemesterPojo(1, 1, now().minusMonths(6), now().minusMonths(3)),
-            getSemesterPojo(1, 2, now().minusMonths(3), now())
+            getSemesterPojo(1, 2, now().minusMonths(6), now()),
+            getSemesterPojo(2, 3, now(), now().plusMonths(6)),
         )
 
         coEvery { semesterDb.loadAll(student.studentId, student.classId) } returnsMany listOf(
@@ -101,7 +102,9 @@ class SemesterRepositoryTest {
         coEvery { semesterDb.deleteAll(any()) } just Runs
         coEvery { semesterDb.insertSemesters(any()) } returns listOf()
 
-        val items = runBlocking { semesterRepository.getSemesters(student.copy(loginMode = Sdk.Mode.SCRAPPER.name)) }
+        val items = semesterRepository.getSemesters(
+            student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+        )
         assertEquals(2, items.size)
         assertNotEquals(0, items[0].diaryId)
     }
@@ -188,15 +191,15 @@ class SemesterRepositoryTest {
     }
 
     @Test
-    fun getSemesters_doubleCurrent_refreshOnNoCurrent() {
+    fun getSemesters_doubleCurrent_refreshOnNoCurrent() = runTest {
         val semesters = listOf(
-            getSemesterEntity(1, 1, now(), now()),
-            getSemesterEntity(1, 2, now(), now())
+            getSemesterEntity(1, 1, now().minusMonths(1), now().plusMonths(1)),
+            getSemesterEntity(1, 2, now().minusMonths(1), now().plusMonths(1))
         )
 
         coEvery { semesterDb.loadAll(student.studentId, student.classId) } returns semesters
 
-        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        val items = semesterRepository.getSemesters(student, refreshOnNoCurrent = true)
         assertEquals(2, items.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt b/app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt
index b7d3ecc9..e8ba8a87 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/SemesterExtensionKtTest.kt
@@ -8,6 +8,40 @@ import kotlin.test.assertEquals
 
 class SemesterExtensionKtTest {
 
+    @Test
+    fun `check is first semester is current`() {
+        val first = getSemesterEntity(
+            semesterName = 1,
+            start = LocalDate.of(2023, 9, 1),
+            end = LocalDate.of(2024, 1, 31),
+        )
+
+        // first boundary - school-year start
+        assertEquals(false, first.isCurrent(LocalDate.of(2023, 8, 28)))
+        assertEquals(true, first.isCurrent(LocalDate.of(2023, 8, 29)))
+
+        // second boundary
+        assertEquals(true, first.isCurrent(LocalDate.of(2024, 1, 31)))
+        assertEquals(false, first.isCurrent(LocalDate.of(2024, 2, 1)))
+    }
+
+    @Test
+    fun `check is second semester is current`() {
+        val second = getSemesterEntity(
+            semesterName = 2,
+            start = LocalDate.of(2024, 2, 1),
+            end = LocalDate.of(2024, 9, 1),
+        )
+
+        // first boundary
+        assertEquals(false, second.isCurrent(LocalDate.of(2024, 1, 31)))
+        assertEquals(true, second.isCurrent(LocalDate.of(2024, 2, 1)))
+
+        // second boundary - school-year end
+        assertEquals(true, second.isCurrent(LocalDate.of(2024, 8, 29)))
+        assertEquals(false, second.isCurrent(LocalDate.of(2024, 8, 30)))
+    }
+
     @Test(expected = IllegalArgumentException::class)
     fun `get current semester when current is doubled`() {
         val semesters = listOf(

From fbce9e58d034fe5616736d06bd4e5235f573d593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 23 Aug 2023 19:46:53 +0200
Subject: [PATCH 379/429] New Crowdin updates (#2277)

---
 app/src/main/res/values-cs/preferences_values.xml     | 5 +++++
 app/src/main/res/values-cs/strings.xml                | 7 +++++++
 app/src/main/res/values-da-rDK/preferences_values.xml | 5 +++++
 app/src/main/res/values-da-rDK/strings.xml            | 5 +++++
 app/src/main/res/values-de/preferences_values.xml     | 5 +++++
 app/src/main/res/values-de/strings.xml                | 5 +++++
 app/src/main/res/values-es-rES/preferences_values.xml | 5 +++++
 app/src/main/res/values-es-rES/strings.xml            | 5 +++++
 app/src/main/res/values-it-rIT/preferences_values.xml | 5 +++++
 app/src/main/res/values-it-rIT/strings.xml            | 5 +++++
 app/src/main/res/values-ru/preferences_values.xml     | 5 +++++
 app/src/main/res/values-ru/strings.xml                | 7 +++++++
 app/src/main/res/values-sk/preferences_values.xml     | 5 +++++
 app/src/main/res/values-sk/strings.xml                | 7 +++++++
 app/src/main/res/values-uk/preferences_values.xml     | 5 +++++
 app/src/main/res/values-uk/strings.xml                | 7 +++++++
 16 files changed, 88 insertions(+)

diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
index 23073adf..2cf40263 100644
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Průměr z průměrů z obou semestrů</item>
         <item>Průměr známek z celého roku</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Šťastné číslo</item>
         <item>Nepřečtené zprávy</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ff461d42..a63a0aa1 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -185,6 +185,12 @@
     <string name="timetable_notify_change_room">Změna učebny z %1$s na %2$s</string>
     <string name="timetable_notify_change_teacher">Změna učitele z %1$s na %2$s</string>
     <string name="timetable_notify_change_subject">Změna předmětu z %1$s na %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="few">No lessons</item>
+        <item quantity="many">No lessons</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Změna plánu lekcí</item>
         <item quantity="few">Změny plánu lekcí</item>
@@ -700,6 +706,7 @@
     <string name="pref_view_expand_grade">Rozvíjení známek</string>
     <string name="pref_view_timetable_show_timers">Označit aktuální lekci</string>
     <string name="pref_view_timetable_show_groups">Zobrazit skupiny vedle předmětů</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Zobrazit seznam grafů v známkách třídy</string>
     <string name="pref_view_subjects_without_grades">Zobrazit předměty bez známek</string>
     <string name="pref_view_grade_color_scheme">Známky barevné schéma</string>
diff --git a/app/src/main/res/values-da-rDK/preferences_values.xml b/app/src/main/res/values-da-rDK/preferences_values.xml
index ac2b6e9e..5aff12de 100644
--- a/app/src/main/res/values-da-rDK/preferences_values.xml
+++ b/app/src/main/res/values-da-rDK/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Average of averages from both semesters</item>
         <item>Average of grades from the whole year</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Lucky number</item>
         <item>Unread messages</item>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 259a4264..2abf1a4a 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -171,6 +171,10 @@
     <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
     <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
     <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Timetable change</item>
         <item quantity="other">Timetable changes</item>
@@ -612,6 +616,7 @@
     <string name="pref_view_expand_grade">Grades expanding</string>
     <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
     <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index d9cac195..d1001c74 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Durchschnittswert der Durchschnittswerte beider Semester</item>
         <item>Durchschnitt der Noten aus dem ganzen Jahr</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Glückszahl</item>
         <item>Ungelesene Nachrichten</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1836d047..f08a504a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -171,6 +171,10 @@
     <string name="timetable_notify_change_room">Änderung des Raumes von %1$s zu %2$s</string>
     <string name="timetable_notify_change_teacher">Wechsel des Lehrers von %1$s zu %2$s</string>
     <string name="timetable_notify_change_subject">Thema von %1$s zu %2$s wechseln</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Änderung des Zeitplans</item>
         <item quantity="other">Änderungen des Zeitplans</item>
@@ -612,6 +616,7 @@
     <string name="pref_view_expand_grade">Steigende Sorten</string>
     <string name="pref_view_timetable_show_timers">Aktuelle Lektion markieren</string>
     <string name="pref_view_timetable_show_groups">Gruppen neben Schulfächen anzeigen</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
     <string name="pref_view_subjects_without_grades">Schulfächer ohne Noten anzeigen</string>
     <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
diff --git a/app/src/main/res/values-es-rES/preferences_values.xml b/app/src/main/res/values-es-rES/preferences_values.xml
index ac2b6e9e..5aff12de 100644
--- a/app/src/main/res/values-es-rES/preferences_values.xml
+++ b/app/src/main/res/values-es-rES/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Average of averages from both semesters</item>
         <item>Average of grades from the whole year</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Lucky number</item>
         <item>Unread messages</item>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 259a4264..2abf1a4a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -171,6 +171,10 @@
     <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
     <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
     <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Timetable change</item>
         <item quantity="other">Timetable changes</item>
@@ -612,6 +616,7 @@
     <string name="pref_view_expand_grade">Grades expanding</string>
     <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
     <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
diff --git a/app/src/main/res/values-it-rIT/preferences_values.xml b/app/src/main/res/values-it-rIT/preferences_values.xml
index ac2b6e9e..5aff12de 100644
--- a/app/src/main/res/values-it-rIT/preferences_values.xml
+++ b/app/src/main/res/values-it-rIT/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Average of averages from both semesters</item>
         <item>Average of grades from the whole year</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Lucky number</item>
         <item>Unread messages</item>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 259a4264..2abf1a4a 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -171,6 +171,10 @@
     <string name="timetable_notify_change_room">Change of room from %1$s to %2$s</string>
     <string name="timetable_notify_change_teacher">Change of teacher from %1$s to %2$s</string>
     <string name="timetable_notify_change_subject">Change of subject from %1$s to %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Timetable change</item>
         <item quantity="other">Timetable changes</item>
@@ -612,6 +616,7 @@
     <string name="pref_view_expand_grade">Grades expanding</string>
     <string name="pref_view_timetable_show_timers">Mark current lesson</string>
     <string name="pref_view_timetable_show_groups">Show groups next to subjects</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
     <string name="pref_view_subjects_without_grades">Show subjects without grades</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index 8a8c260d..df3629c0 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Средняя из средних оценок семестров</item>
         <item>Средняя из оценок со всего года</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Счастливый номер</item>
         <item>Непрочитанные письма</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 60697174..d075dac6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -185,6 +185,12 @@
     <string name="timetable_notify_change_room">Аудитория изменена с %1$s на %2$s</string>
     <string name="timetable_notify_change_teacher">Учитель изменён с %1$s на %2$s</string>
     <string name="timetable_notify_change_subject">Тема изменена с %1$s на %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="few">No lessons</item>
+        <item quantity="many">No lessons</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Изменение расписания</item>
         <item quantity="few">Изменения расписания</item>
@@ -700,6 +706,7 @@
     <string name="pref_view_expand_grade">Разворачивание оценок</string>
     <string name="pref_view_timetable_show_timers">Отметить текущий урок</string>
     <string name="pref_view_timetable_show_groups">Показать группы рядом с темами</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
     <string name="pref_view_subjects_without_grades">Показать предметы без оценок</string>
     <string name="pref_view_grade_color_scheme">Цветовая схема оценок</string>
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
index e4331315..fd393394 100644
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Priemer z priemerov z oboch semestrov</item>
         <item>Priemer známok z celého roka</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Šťastné číslo</item>
         <item>Neprečítané správy</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 20d8818b..d1990e35 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -185,6 +185,12 @@
     <string name="timetable_notify_change_room">Zmena učebne z %1$s na %2$s</string>
     <string name="timetable_notify_change_teacher">Zmena učiteľa z %1$s na %2$s</string>
     <string name="timetable_notify_change_subject">Zmena predmetu z %1$s na %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="few">No lessons</item>
+        <item quantity="many">No lessons</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Zmena plánu lekcií</item>
         <item quantity="few">Zmeny plánu lekcií</item>
@@ -700,6 +706,7 @@
     <string name="pref_view_expand_grade">Rozvijanie známok</string>
     <string name="pref_view_timetable_show_timers">Označiť aktuálne lekciu</string>
     <string name="pref_view_timetable_show_groups">Zobraziť skupiny vedľa predmetov</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Zobraziť zoznam grafov v známkach triedy</string>
     <string name="pref_view_subjects_without_grades">Zobraziť predmety bez známok</string>
     <string name="pref_view_grade_color_scheme">Známky farebnú schému</string>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index 44acd18e..55cf905b 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -51,6 +51,11 @@
         <item>Середнє значення з обох семестрів</item>
         <item>Середня оцінка з цілого року</item>
     </string-array>
+    <string-array name="timetable_show_gaps_entries">
+        <item>Don\'t show</item>
+        <item>Only between lessons</item>
+        <item>Before and between lessons</item>
+    </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Щасливий номер</item>
         <item>Непрочитані листи</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index db5c3cb0..876562d3 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -185,6 +185,12 @@
     <string name="timetable_notify_change_room">Зміна аудіторії з %1$s на %2$s</string>
     <string name="timetable_notify_change_teacher">Зміна вчителя з %1$s на %2$s</string>
     <string name="timetable_notify_change_subject">Зміна теми з %1$s на %2$s</string>
+    <plurals name="timetable_no_lesson">
+        <item quantity="one">No lesson</item>
+        <item quantity="few">No lessons</item>
+        <item quantity="many">No lessons</item>
+        <item quantity="other">No lessons</item>
+    </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Зміна у розкладі</item>
         <item quantity="few">Зміни у розкладі</item>
@@ -700,6 +706,7 @@
     <string name="pref_view_expand_grade">Розгортання оцінок</string>
     <string name="pref_view_timetable_show_timers">Позначити поточний урок</string>
     <string name="pref_view_timetable_show_groups">Показувати групи поруч з темами</string>
+    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
     <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
     <string name="pref_view_subjects_without_grades">Показати предмети без оцінок</string>
     <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>

From 3dfc55c4d196cb767704e8f6f73ac1e25f611df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Thu, 24 Aug 2023 11:33:40 +0200
Subject: [PATCH 380/429] Add admin messages to login screen (#2280)

---
 app/build.gradle                              |    2 +-
 .../57.json                                   | 2443 +++++++++++++++++
 .../java/io/github/wulkanowy/data/Resource.kt |    2 +-
 .../github/wulkanowy/data/db/AppDatabase.kt   |    3 +-
 .../io/github/wulkanowy/data/db/Converters.kt |    6 +
 .../data/db/entities/AdminMessage.kt          |    4 +-
 .../data/db/migrations/Migration57.kt         |   10 +
 .../wulkanowy/data/enums/MessageType.kt       |    9 +
 .../repositories/AdminMessageRepository.kt    |   45 +-
 .../GetAppropriateAdminMessageUseCase.kt      |   64 +
 .../dashboard/DashboardItemMoveCallback.kt    |    3 +-
 .../modules/dashboard/DashboardPresenter.kt   |   34 +-
 .../dashboard/adapters/DashboardAdapter.kt    |   45 +-
 .../viewholders/AdminMessageViewHolder.kt     |   52 +
 .../modules/login/form/LoginFormFragment.kt   |   15 +
 .../modules/login/form/LoginFormPresenter.kt  |   40 +-
 .../ui/modules/login/form/LoginFormView.kt    |    5 +
 .../main/res/layout/fragment_login_form.xml   |   15 +-
 .../login/form/LoginFormPresenterTest.kt      |   10 +
 19 files changed, 2722 insertions(+), 85 deletions(-)
 create mode 100644 app/schemas/io.github.wulkanowy.data.db.AppDatabase/57.json
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration57.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/viewholders/AdminMessageViewHolder.kt

diff --git a/app/build.gradle b/app/build.gradle
index 136c5430..d0ae8894 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 130
+        versionCode 131 // todo: already bumped for 2.1.0 version
         versionName "2.0.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/57.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/57.json
new file mode 100644
index 00000000..2eff1223
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/57.json
@@ -0,0 +1,2443 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 57,
+    "identityHash": "d15dbe7d7e4d7df98ec98d9a3a4b5fcd",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`scrapper_base_url` TEXT NOT NULL, `scrapper_domain_suffix` TEXT NOT NULL DEFAULT '', `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperDomainSuffix",
+            "columnName": "scrapper_domain_suffix",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "nick",
+            "columnName": "nick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarColor",
+            "columnName": "avatar_color",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `kindergarten_diary_id` INTEGER NOT NULL DEFAULT 0, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "kindergartenDiaryId",
+            "columnName": "kindergarten_diary_id",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "kindergarten_diary_id",
+              "semester_id"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_kindergarten_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `kindergarten_diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `class_average` TEXT NOT NULL, `student_average` TEXT NOT NULL, `class_amounts` TEXT NOT NULL, `student_amounts` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAverage",
+            "columnName": "class_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAverage",
+            "columnName": "student_average",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classAmounts",
+            "columnName": "class_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentAmounts",
+            "columnName": "student_amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amounts",
+            "columnName": "amounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentGrade",
+            "columnName": "student_grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`email` TEXT NOT NULL, `message_global_key` TEXT NOT NULL, `mailbox_key` TEXT NOT NULL, `message_id` INTEGER NOT NULL, `correspondents` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `read_by` INTEGER, `unread_by` INTEGER, `has_attachments` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `sender` TEXT, `recipients` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mailboxKey",
+            "columnName": "mailbox_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondents",
+            "columnName": "correspondents",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "recipients",
+            "columnName": "recipients",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`message_global_key` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`message_global_key`, `url`, `filename`))",
+        "fields": [
+          {
+            "fieldPath": "messageGlobalKey",
+            "columnName": "message_global_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "message_global_key",
+            "url",
+            "filename"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `is_added_by_user` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Mailboxes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`globalKey` TEXT NOT NULL, `email` TEXT NOT NULL, `symbol` TEXT NOT NULL, `schoolId` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `studentName` TEXT NOT NULL, `schoolNameShort` TEXT NOT NULL, `type` TEXT NOT NULL, PRIMARY KEY(`globalKey`))",
+        "fields": [
+          {
+            "fieldPath": "globalKey",
+            "columnName": "globalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolId",
+            "columnName": "schoolId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "studentName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolNameShort",
+            "columnName": "schoolNameShort",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "globalKey"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`mailboxGlobalKey` TEXT NOT NULL, `studentMailboxGlobalKey` TEXT NOT NULL, `fullName` TEXT NOT NULL, `userName` TEXT NOT NULL, `schoolShortName` TEXT NOT NULL, `type` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "mailboxGlobalKey",
+            "columnName": "mailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentMailboxGlobalKey",
+            "columnName": "studentMailboxGlobalKey",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "fullName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "userName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "schoolShortName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `subject` TEXT NOT NULL, `agenda` TEXT NOT NULL, `present_on_conference` TEXT NOT NULL, `conference_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "agenda",
+            "columnName": "agenda",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presentOnConference",
+            "columnName": "present_on_conference",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conferenceId",
+            "columnName": "conference_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `repeat_id` BLOB DEFAULT NULL, `is_added_by_user` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "repeatId",
+            "columnName": "repeat_id",
+            "affinity": "BLOB",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "isAddedByUser",
+            "columnName": "is_added_by_user",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `full_name` TEXT NOT NULL, `first_name` TEXT NOT NULL, `second_name` TEXT NOT NULL, `surname` TEXT NOT NULL, `birth_date` INTEGER NOT NULL, `birth_place` TEXT NOT NULL, `gender` TEXT NOT NULL, `has_polish_citizenship` INTEGER NOT NULL, `family_name` TEXT NOT NULL, `parents_names` TEXT NOT NULL, `address` TEXT NOT NULL, `registered_address` TEXT NOT NULL, `correspondence_address` TEXT NOT NULL, `phone_number` TEXT NOT NULL, `cell_phone_number` TEXT NOT NULL, `email` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `first_guardian_full_name` TEXT, `first_guardian_kinship` TEXT, `first_guardian_address` TEXT, `first_guardian_phones` TEXT, `first_guardian_email` TEXT, `second_guardian_full_name` TEXT, `second_guardian_kinship` TEXT, `second_guardian_address` TEXT, `second_guardian_phones` TEXT, `second_guardian_email` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "first_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondName",
+            "columnName": "second_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "surname",
+            "columnName": "surname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthDate",
+            "columnName": "birth_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "birthPlace",
+            "columnName": "birth_place",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gender",
+            "columnName": "gender",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasPolishCitizenship",
+            "columnName": "has_polish_citizenship",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "familyName",
+            "columnName": "family_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "parentsNames",
+            "columnName": "parents_names",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registeredAddress",
+            "columnName": "registered_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "correspondenceAddress",
+            "columnName": "correspondence_address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "phoneNumber",
+            "columnName": "phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "cellPhoneNumber",
+            "columnName": "cell_phone_number",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstGuardian.fullName",
+            "columnName": "first_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.kinship",
+            "columnName": "first_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.address",
+            "columnName": "first_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.phones",
+            "columnName": "first_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstGuardian.email",
+            "columnName": "first_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.fullName",
+            "columnName": "second_guardian_full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.kinship",
+            "columnName": "second_guardian_kinship",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.address",
+            "columnName": "second_guardian_address",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.phones",
+            "columnName": "second_guardian_phones",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "secondGuardian.email",
+            "columnName": "second_guardian_email",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableHeaders",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`user_login_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notifications",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`student_id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `type` TEXT NOT NULL, `destination` TEXT NOT NULL DEFAULT '{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}', `date` INTEGER NOT NULL, `data` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "destination",
+            "columnName": "destination",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{\"type\":\"io.github.wulkanowy.ui.modules.Destination.Dashboard\"}'"
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AdminMessages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `content` TEXT NOT NULL, `version_name` INTEGER, `version_max` INTEGER, `target_register_host` TEXT, `target_flavor` TEXT, `destination_url` TEXT, `priority` TEXT NOT NULL, `types` TEXT NOT NULL DEFAULT '[]', `is_dismissible` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "versionMin",
+            "columnName": "version_name",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "versionMax",
+            "columnName": "version_max",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetRegisterHost",
+            "columnName": "target_register_host",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "targetFlavor",
+            "columnName": "target_flavor",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "destinationUrl",
+            "columnName": "destination_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "priority",
+            "columnName": "priority",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          },
+          {
+            "fieldPath": "isDismissible",
+            "columnName": "is_dismissible",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd15dbe7d7e4d7df98ec98d9a3a4b5fcd')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/Resource.kt b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
index 6b611e47..2c5bf0ea 100644
--- a/app/src/main/java/io/github/wulkanowy/data/Resource.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
@@ -148,7 +148,7 @@ inline fun <ResultType, RequestType, T> networkBoundResource(
     crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
     crossinline onFetchFailed: (Throwable) -> Unit = { },
     crossinline shouldFetch: (ResultType) -> Boolean = { true },
-    crossinline mapResult: (ResultType) -> T
+    crossinline mapResult: (ResultType) -> T,
 ) = flow {
     emit(Resource.Loading())
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 882a7016..48a2942c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -50,6 +50,7 @@ import javax.inject.Singleton
         AutoMigration(from = 51, to = 52),
         AutoMigration(from = 54, to = 55, spec = Migration55::class),
         AutoMigration(from = 55, to = 56),
+        AutoMigration(from = 56, to = 57, spec = Migration57::class),
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -58,7 +59,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 56
+        const val VERSION_SCHEMA = 57
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index 9d3beae1..7bc8d12a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
+import io.github.wulkanowy.data.enums.MessageType
 import io.github.wulkanowy.ui.modules.Destination
 import io.github.wulkanowy.utils.toTimestamp
 import kotlinx.serialization.SerializationException
@@ -68,4 +69,9 @@ class Converters {
     @TypeConverter
     fun stringToDestination(destination: String): Destination = json.decodeFromString(destination)
 
+    @TypeConverter
+    fun messageTypesToString(types: List<MessageType>): String = json.encodeToString(types)
+
+    @TypeConverter
+    fun stringToMessageTypes(text: String): List<MessageType> = json.decodeFromString(text)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt
index 97fec69b..875c2a3a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/AdminMessage.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import io.github.wulkanowy.data.enums.MessageType
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -33,7 +34,8 @@ data class AdminMessage(
 
     val priority: String,
 
-    val type: String,
+    @ColumnInfo(name = "types", defaultValue = "[]")
+    val types: List<MessageType> = emptyList(),
 
     @ColumnInfo(name = "is_dismissible")
     val isDismissible: Boolean = false
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration57.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration57.kt
new file mode 100644
index 00000000..2fc8718f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration57.kt
@@ -0,0 +1,10 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.DeleteColumn
+import androidx.room.migration.AutoMigrationSpec
+
+@DeleteColumn(
+    tableName = "AdminMessages",
+    columnName = "type",
+)
+class Migration57 : AutoMigrationSpec
diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt b/app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt
new file mode 100644
index 00000000..531684e4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/MessageType.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.data.enums
+
+enum class MessageType {
+    GENERAL_MESSAGE,
+    DASHBOARD_MESSAGE,
+    LOGIN_MESSAGE,
+    PASS_RESET_MESSAGE,
+    ERROR_OVERRIDE,
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt
index c9655b72..b831ee75 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AdminMessageRepository.kt
@@ -1,10 +1,11 @@
 package io.github.wulkanowy.data.repositories
 
+import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.api.AdminMessageService
 import io.github.wulkanowy.data.db.dao.AdminMessageDao
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.networkBoundResource
-import io.github.wulkanowy.utils.AppInfo
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -13,34 +14,20 @@ import javax.inject.Singleton
 class AdminMessageRepository @Inject constructor(
     private val adminMessageService: AdminMessageService,
     private val adminMessageDao: AdminMessageDao,
-    private val appInfo: AppInfo
 ) {
+
     private val saveFetchResultMutex = Mutex()
 
-    suspend fun getAdminMessages(student: Student) = networkBoundResource(
-        mutex = saveFetchResultMutex,
-        isResultEmpty = { it == null },
-        query = { adminMessageDao.loadAll() },
-        fetch = { adminMessageService.getAdminMessages() },
-        shouldFetch = { true },
-        saveFetchResult = { oldItems, newItems ->
-            adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
-        },
-        showSavedOnLoading = false,
-        mapResult = { adminMessages ->
-            adminMessages.filter { adminMessage ->
-                val isCorrectRegister = adminMessage.targetRegisterHost?.let {
-                    student.scrapperBaseUrl.contains(it, true)
-                } ?: true
-                val isCorrectFlavor =
-                    adminMessage.targetFlavor?.equals(appInfo.buildFlavor, true) ?: true
-                val isCorrectMaxVersion =
-                    adminMessage.versionMax?.let { it >= appInfo.versionCode } ?: true
-                val isCorrectMinVersion =
-                    adminMessage.versionMin?.let { it <= appInfo.versionCode } ?: true
-
-                isCorrectRegister && isCorrectFlavor && isCorrectMaxVersion && isCorrectMinVersion
-            }.maxByOrNull { it.id }
-        }
-    )
+    fun getAdminMessages(): Flow<Resource<List<AdminMessage>>> =
+        networkBoundResource(
+            mutex = saveFetchResultMutex,
+            isResultEmpty = { false },
+            query = { adminMessageDao.loadAll() },
+            fetch = { adminMessageService.getAdminMessages() },
+            shouldFetch = { true },
+            saveFetchResult = { oldItems, newItems ->
+                adminMessageDao.removeOldAndSaveNew(oldItems, newItems)
+            },
+            showSavedOnLoading = false,
+        )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt b/app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt
new file mode 100644
index 00000000..b55bf899
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/domain/adminmessage/GetAppropriateAdminMessageUseCase.kt
@@ -0,0 +1,64 @@
+package io.github.wulkanowy.domain.adminmessage
+
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.db.entities.AdminMessage
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.enums.MessageType
+import io.github.wulkanowy.data.mapResourceData
+import io.github.wulkanowy.data.repositories.AdminMessageRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.utils.AppInfo
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class GetAppropriateAdminMessageUseCase @Inject constructor(
+    private val adminMessageRepository: AdminMessageRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val appInfo: AppInfo
+) {
+
+    operator fun invoke(student: Student, type: MessageType): Flow<Resource<AdminMessage?>> {
+        return invoke(student.scrapperBaseUrl, type)
+    }
+
+    operator fun invoke(scrapperBaseUrl: String, type: MessageType): Flow<Resource<AdminMessage?>> {
+        return adminMessageRepository.getAdminMessages().mapResourceData { adminMessages ->
+            adminMessages
+                .asSequence()
+                .filter { it.isNotDismissed() }
+                .filter { it.isVersionMatch() }
+                .filter { it.isRegisterHostMatch(scrapperBaseUrl) }
+                .filter { it.isFlavorMatch() }
+                .filter { it.isTypeMatch(type) }
+                .maxByOrNull { it.id }
+        }
+    }
+
+    private fun AdminMessage.isNotDismissed(): Boolean {
+        return id !in preferencesRepository.dismissedAdminMessageIds
+    }
+
+    private fun AdminMessage.isRegisterHostMatch(scrapperBaseUrl: String): Boolean {
+        return targetRegisterHost?.let {
+            scrapperBaseUrl.contains(it, true)
+        } ?: true
+    }
+
+    private fun AdminMessage.isFlavorMatch(): Boolean {
+        return targetFlavor?.equals(appInfo.buildFlavor, true) ?: true
+    }
+
+    private fun AdminMessage.isVersionMatch(): Boolean {
+        val isCorrectMaxVersion = versionMax?.let { it >= appInfo.versionCode } ?: true
+        val isCorrectMinVersion = versionMin?.let { it <= appInfo.versionCode } ?: true
+
+        return isCorrectMaxVersion && isCorrectMinVersion
+    }
+
+    private fun AdminMessage.isTypeMatch(messageType: MessageType): Boolean {
+        if (messageType in types) return true
+        if (MessageType.GENERAL_MESSAGE in types) return true
+
+        return false
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt
index 9c15acc3..f033b594 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.dashboard
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.ui.modules.dashboard.adapters.DashboardAdapter
+import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import java.util.*
 
 class DashboardItemMoveCallback(
@@ -55,5 +56,5 @@ class DashboardItemMoveCallback(
     }
 
     private val RecyclerView.ViewHolder.isAdminMessageOrAccountItem: Boolean
-        get() = this is DashboardAdapter.AdminMessageViewHolder || this is DashboardAdapter.AccountViewHolder
+        get() = this is AdminMessageViewHolder || this is DashboardAdapter.AccountViewHolder
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index ac2c896d..ecf084c6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -5,7 +5,9 @@ import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.enums.MessageFolder
+import io.github.wulkanowy.data.enums.MessageType
 import io.github.wulkanowy.data.repositories.*
+import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AdsHelper
@@ -32,7 +34,7 @@ class DashboardPresenter @Inject constructor(
     private val conferenceRepository: ConferenceRepository,
     private val preferencesRepository: PreferencesRepository,
     private val schoolAnnouncementRepository: SchoolAnnouncementRepository,
-    private val adminMessageRepository: AdminMessageRepository,
+    private val getAppropriateAdminMessageUseCase: GetAppropriateAdminMessageUseCase,
     private val adsHelper: AdsHelper
 ) : BasePresenter<DashboardView>(errorHandler, studentRepository) {
 
@@ -159,19 +161,23 @@ class DashboardPresenter @Inject constructor(
                     DashboardItem.Type.ACCOUNT -> {
                         updateData(DashboardItem.Account(student), forceRefresh)
                     }
+
                     DashboardItem.Type.HORIZONTAL_GROUP -> {
                         loadHorizontalGroup(student, forceRefresh)
                     }
+
                     DashboardItem.Type.LESSONS -> loadLessons(student, forceRefresh)
                     DashboardItem.Type.GRADES -> loadGrades(student, forceRefresh)
                     DashboardItem.Type.HOMEWORK -> loadHomework(student, forceRefresh)
                     DashboardItem.Type.ANNOUNCEMENTS -> {
                         loadSchoolAnnouncements(student, forceRefresh)
                     }
+
                     DashboardItem.Type.EXAMS -> loadExams(student, forceRefresh)
                     DashboardItem.Type.CONFERENCES -> {
                         loadConferences(student, forceRefresh)
                     }
+
                     DashboardItem.Type.ADS -> loadAds(forceRefresh)
                     DashboardItem.Type.ADMIN_MESSAGE -> loadAdminMessage(student, forceRefresh)
                 }
@@ -355,6 +361,7 @@ class DashboardPresenter @Inject constructor(
                             firstLoadedItemList += DashboardItem.Type.GRADES
                         }
                     }
+
                     is Resource.Success -> {
                         Timber.i("Loading dashboard grades result: Success")
                         updateData(
@@ -365,6 +372,7 @@ class DashboardPresenter @Inject constructor(
                             forceRefresh
                         )
                     }
+
                     is Resource.Error -> {
                         Timber.i("Loading dashboard grades result: An exception occurred")
                         errorHandler.dispatch(it.error)
@@ -402,12 +410,14 @@ class DashboardPresenter @Inject constructor(
                             firstLoadedItemList += DashboardItem.Type.LESSONS
                         }
                     }
+
                     is Resource.Success -> {
                         Timber.i("Loading dashboard lessons result: Success")
                         updateData(
                             DashboardItem.Lessons(it.data), forceRefresh
                         )
                     }
+
                     is Resource.Error -> {
                         Timber.i("Loading dashboard lessons result: An exception occurred")
                         errorHandler.dispatch(it.error)
@@ -457,10 +467,12 @@ class DashboardPresenter @Inject constructor(
                             firstLoadedItemList += DashboardItem.Type.HOMEWORK
                         }
                     }
+
                     is Resource.Success -> {
                         Timber.i("Loading dashboard homework result: Success")
                         updateData(DashboardItem.Homework(it.data), forceRefresh)
                     }
+
                     is Resource.Error -> {
                         Timber.i("Loading dashboard homework result: An exception occurred")
                         errorHandler.dispatch(it.error)
@@ -489,10 +501,12 @@ class DashboardPresenter @Inject constructor(
                             firstLoadedItemList += DashboardItem.Type.ANNOUNCEMENTS
                         }
                     }
+
                     is Resource.Success -> {
                         Timber.i("Loading dashboard announcements result: Success")
                         updateData(DashboardItem.Announcements(it.data), forceRefresh)
                     }
+
                     is Resource.Error -> {
                         Timber.i("Loading dashboard announcements result: An exception occurred")
                         errorHandler.dispatch(it.error)
@@ -530,10 +544,12 @@ class DashboardPresenter @Inject constructor(
                             firstLoadedItemList += DashboardItem.Type.EXAMS
                         }
                     }
+
                     is Resource.Success -> {
                         Timber.i("Loading dashboard exams result: Success")
                         updateData(DashboardItem.Exams(it.data), forceRefresh)
                     }
+
                     is Resource.Error -> {
                         Timber.i("Loading dashboard exams result: An exception occurred")
                         errorHandler.dispatch(it.error)
@@ -569,10 +585,12 @@ class DashboardPresenter @Inject constructor(
                             firstLoadedItemList += DashboardItem.Type.CONFERENCES
                         }
                     }
+
                     is Resource.Success -> {
                         Timber.i("Loading dashboard conferences result: Success")
                         updateData(DashboardItem.Conferences(it.data), forceRefresh)
                     }
+
                     is Resource.Error -> {
                         Timber.i("Loading dashboard conferences result: An exception occurred")
                         errorHandler.dispatch(it.error)
@@ -584,12 +602,12 @@ class DashboardPresenter @Inject constructor(
     }
 
     private fun loadAdminMessage(student: Student, forceRefresh: Boolean) {
-        flatResourceFlow { adminMessageRepository.getAdminMessages(student) }
-            .filter {
-                val data = it.dataOrNull ?: return@filter true
-                val isDismissed = data.id in preferencesRepository.dismissedAdminMessageIds
-                !isDismissed
-            }
+        flatResourceFlow {
+            getAppropriateAdminMessageUseCase(
+                student = student,
+                type = MessageType.DASHBOARD_MESSAGE,
+            )
+        }
             .onEach {
                 when (it) {
                     is Resource.Loading -> {
@@ -597,6 +615,7 @@ class DashboardPresenter @Inject constructor(
                         if (forceRefresh) return@onEach
                         updateData(DashboardItem.AdminMessages(), forceRefresh)
                     }
+
                     is Resource.Success -> {
                         Timber.i("Loading dashboard admin message result: Success")
                         updateData(
@@ -604,6 +623,7 @@ class DashboardPresenter @Inject constructor(
                             forceRefresh = forceRefresh
                         )
                     }
+
                     is Resource.Error -> {
                         Timber.i("Loading dashboard admin message result: An exception occurred")
                         Timber.e(it.error)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
index 4ad4e9d6..7c74cae8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/adapters/DashboardAdapter.kt
@@ -1,8 +1,6 @@
 package io.github.wulkanowy.ui.modules.dashboard.adapters
 
 import android.annotation.SuppressLint
-import android.content.res.ColorStateList
-import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Handler
 import android.os.Looper
@@ -24,6 +22,7 @@ import io.github.wulkanowy.data.db.entities.TimetableHeader
 import io.github.wulkanowy.data.enums.GradeColorTheme
 import io.github.wulkanowy.databinding.*
 import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import io.github.wulkanowy.utils.*
 import timber.log.Timber
 import java.time.Duration
@@ -109,7 +108,9 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                 ItemDashboardConferencesBinding.inflate(inflater, parent, false)
             )
             DashboardItem.Type.ADMIN_MESSAGE.ordinal -> AdminMessageViewHolder(
-                ItemDashboardAdminMessageBinding.inflate(inflater, parent, false)
+                ItemDashboardAdminMessageBinding.inflate(inflater, parent, false),
+                onAdminMessageDismissClickListener = onAdminMessageDismissClickListener,
+                onAdminMessageClickListener = onAdminMessageClickListener,
             )
             DashboardItem.Type.ADS.ordinal -> AdsViewHolder(
                 ItemDashboardAdsBinding.inflate(inflater, parent, false)
@@ -128,7 +129,7 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             is AnnouncementsViewHolder -> bindAnnouncementsViewHolder(holder, position)
             is ExamsViewHolder -> bindExamsViewHolder(holder, position)
             is ConferencesViewHolder -> bindConferencesViewHolder(holder, position)
-            is AdminMessageViewHolder -> bindAdminMessage(holder, position)
+            is AdminMessageViewHolder -> holder.bind((items[position] as DashboardItem.AdminMessages).adminMessage)
             is AdsViewHolder -> bindAdsViewHolder(holder, position)
         }
     }
@@ -733,39 +734,6 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         }
     }
 
-    private fun bindAdminMessage(adminMessageViewHolder: AdminMessageViewHolder, position: Int) {
-        val item = (items[position] as DashboardItem.AdminMessages).adminMessage ?: return
-        val context = adminMessageViewHolder.binding.root.context
-        val (backgroundColor, textColor) = when (item.priority) {
-            "HIGH" -> {
-                context.getThemeAttrColor(R.attr.colorMessageHigh) to
-                    context.getThemeAttrColor(R.attr.colorOnMessageHigh)
-            }
-            "MEDIUM" -> {
-                context.getThemeAttrColor(R.attr.colorMessageMedium) to Color.BLACK
-            }
-            else -> null to context.getThemeAttrColor(R.attr.colorOnSurface)
-        }
-
-        with(adminMessageViewHolder.binding) {
-            dashboardAdminMessageItemTitle.text = item.title
-            dashboardAdminMessageItemTitle.setTextColor(textColor)
-            dashboardAdminMessageItemDescription.text = item.content
-            dashboardAdminMessageItemDescription.setTextColor(textColor)
-            dashboardAdminMessageItemIcon.setColorFilter(textColor)
-            dashboardAdminMessageItemDismiss.isVisible = item.isDismissible
-            dashboardAdminMessageItemDismiss.setTextColor(textColor)
-            dashboardAdminMessageItemDismiss.setOnClickListener {
-                onAdminMessageDismissClickListener(item)
-            }
-
-            root.setCardBackgroundColor(backgroundColor?.let { ColorStateList.valueOf(it) })
-            item.destinationUrl?.let { url ->
-                root.setOnClickListener { onAdminMessageClickListener(url) }
-            }
-        }
-    }
-
     private fun bindAdsViewHolder(adsViewHolder: AdsViewHolder, position: Int) {
         val item = (items[position] as DashboardItem.Ads).adBanner ?: return
         val binding = adsViewHolder.binding
@@ -819,9 +787,6 @@ class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
         val adapter by lazy { DashboardConferencesAdapter() }
     }
 
-    class AdminMessageViewHolder(val binding: ItemDashboardAdminMessageBinding) :
-        RecyclerView.ViewHolder(binding.root)
-
     class AdsViewHolder(val binding: ItemDashboardAdsBinding) :
         RecyclerView.ViewHolder(binding.root)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/viewholders/AdminMessageViewHolder.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/viewholders/AdminMessageViewHolder.kt
new file mode 100644
index 00000000..81099801
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/viewholders/AdminMessageViewHolder.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.ui.modules.dashboard.viewholders
+
+import android.content.res.ColorStateList
+import android.graphics.Color
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AdminMessage
+import io.github.wulkanowy.databinding.ItemDashboardAdminMessageBinding
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
+import io.github.wulkanowy.utils.getThemeAttrColor
+
+class AdminMessageViewHolder(
+    private val binding: ItemDashboardAdminMessageBinding,
+    private val onAdminMessageDismissClickListener: (AdminMessage) -> Unit,
+    private val onAdminMessageClickListener: (String?) -> Unit,
+) : RecyclerView.ViewHolder(binding.root) {
+
+    fun bind(item: AdminMessage?) {
+        item ?: return
+
+        val context = binding.root.context
+        val (backgroundColor, textColor) = when (item.priority) {
+            "HIGH" -> {
+                context.getThemeAttrColor(R.attr.colorMessageHigh) to
+                    context.getThemeAttrColor(R.attr.colorOnMessageHigh)
+            }
+            "MEDIUM" -> {
+                context.getThemeAttrColor(R.attr.colorMessageMedium) to Color.BLACK
+            }
+            else -> null to context.getThemeAttrColor(R.attr.colorOnSurface)
+        }
+
+        with(binding) {
+            dashboardAdminMessageItemTitle.text = item.title
+            dashboardAdminMessageItemTitle.setTextColor(textColor)
+            dashboardAdminMessageItemDescription.text = item.content
+            dashboardAdminMessageItemDescription.setTextColor(textColor)
+            dashboardAdminMessageItemIcon.setColorFilter(textColor)
+            dashboardAdminMessageItemDismiss.isVisible = item.isDismissible
+            dashboardAdminMessageItemDismiss.setTextColor(textColor)
+            dashboardAdminMessageItemDismiss.setOnClickListener {
+                onAdminMessageDismissClickListener(item)
+            }
+
+            root.setCardBackgroundColor(backgroundColor?.let { ColorStateList.valueOf(it) })
+            item.destinationUrl?.let { url ->
+                root.setOnClickListener { onAdminMessageClickListener(url) }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 1085ff50..ff7fd864 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -9,10 +9,12 @@ import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.utils.*
@@ -207,6 +209,19 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun showAdminMessage(message: AdminMessage?) {
+        AdminMessageViewHolder(
+            binding = binding.loginFormMessage,
+            onAdminMessageDismissClickListener = presenter::onAdminMessageDismissed,
+            onAdminMessageClickListener = presenter::onAdminMessageSelected,
+        ).bind(message)
+        binding.loginFormMessage.root.isVisible = message != null
+    }
+
+    override fun openInternetBrowser(url: String) {
+        requireContext().openInternetBrowser(url)
+    }
+
     override fun showDomainSuffixInput(show: Boolean) {
         binding.loginFormDomainSuffixLayout.isVisible = show
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 85f42841..4e0404d9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -1,13 +1,19 @@
 package io.github.wulkanowy.ui.modules.login.form
 
 import androidx.core.net.toUri
+import io.github.wulkanowy.data.db.entities.AdminMessage
+import io.github.wulkanowy.data.enums.MessageType
+import io.github.wulkanowy.data.flatResourceFlow
 import io.github.wulkanowy.data.logResourceStatus
+import io.github.wulkanowy.data.onResourceData
 import io.github.wulkanowy.data.onResourceError
 import io.github.wulkanowy.data.onResourceLoading
 import io.github.wulkanowy.data.onResourceNotLoading
 import io.github.wulkanowy.data.onResourceSuccess
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
+import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -22,7 +28,9 @@ class LoginFormPresenter @Inject constructor(
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val appInfo: AppInfo,
-    private val analytics: AnalyticsHelper
+    private val analytics: AnalyticsHelper,
+    private val getAppropriateAdminMessageUseCase: GetAppropriateAdminMessageUseCase,
+    private val preferencesRepository: PreferencesRepository,
 ) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository) {
 
     private var lastError: Throwable? = null
@@ -41,6 +49,31 @@ class LoginFormPresenter @Inject constructor(
                 Timber.i("Entered wrong username or password")
             }
         }
+
+        reloadAdminMessage()
+    }
+
+    private fun reloadAdminMessage() {
+        flatResourceFlow {
+            getAppropriateAdminMessageUseCase(
+                scrapperBaseUrl = view?.formHostValue.orEmpty(),
+                type = MessageType.LOGIN_MESSAGE,
+            )
+        }
+            .logResourceStatus("load login admin message")
+            .onResourceData { view?.showAdminMessage(it) }
+            .onResourceError { view?.showAdminMessage(null) }
+            .launch()
+    }
+
+    fun onAdminMessageSelected(url: String?) {
+        url?.let { view?.openInternetBrowser(it) }
+    }
+
+    fun onAdminMessageDismissed(adminMessage: AdminMessage) {
+        preferencesRepository.dismissedAdminMessageIds += adminMessage.id
+
+        view?.showAdminMessage(null)
     }
 
     fun onPrivacyLinkClick() {
@@ -63,6 +96,7 @@ class LoginFormPresenter @Inject constructor(
             }
             updateCustomDomainSuffixVisibility()
             updateUsernameLabel()
+            reloadAdminMessage()
         }
     }
 
@@ -103,7 +137,9 @@ class LoginFormPresenter @Inject constructor(
         val email = view?.formUsernameValue.orEmpty().trim()
         val password = view?.formPassValue.orEmpty().trim()
         val host = view?.formHostValue.orEmpty().trim()
-        val domainSuffix = view?.formDomainSuffix.orEmpty().trim()
+        val domainSuffix = view?.formDomainSuffix.orEmpty().trim().takeIf {
+            "customSuffix" in host
+        }.orEmpty()
         val symbol = view?.formHostSymbol.orEmpty().trim()
 
         if (!validateCredentials(email, password, host)) return
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 5fb26062..5b4dcadf 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.form
 
+import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
@@ -58,6 +59,10 @@ interface LoginFormView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun showAdminMessage(message: AdminMessage?)
+
+    fun openInternetBrowser(url: String)
+
     fun showDomainSuffixInput(show: Boolean)
 
     fun showOtherOptionsButton(show: Boolean)
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index 39f3146c..fc5e5f35 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -105,6 +105,18 @@
                     android:background="?android:attr/listDivider" />
             </LinearLayout>
 
+            <include
+                android:id="@+id/login_form_message"
+                layout="@layout/item_dashboard_admin_message"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="16dp"
+                android:visibility="gone"
+                app:layout_constraintTop_toBottomOf="@id/loginFormContact"
+                app:layout_constraintVertical_chainStyle="packed"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/loginFormHeader"
                 android:layout_width="match_parent"
@@ -119,9 +131,8 @@
                 app:layout_constraintBottom_toTopOf="@+id/loginFormUsernameLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormContact"
+                app:layout_constraintTop_toBottomOf="@+id/login_form_message"
                 app:layout_constraintVertical_bias="0"
-                app:layout_constraintVertical_chainStyle="packed"
                 app:layout_goneMarginTop="64dp" />
 
             <TextView
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index a6440f72..cf43df63 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -2,7 +2,9 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import io.github.wulkanowy.MainCoroutineRule
 import io.github.wulkanowy.data.pojos.RegisterUser
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.scrapper.Scrapper
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
@@ -40,6 +42,12 @@ class LoginFormPresenterTest {
     @MockK
     lateinit var appInfo: AppInfo
 
+    @MockK
+    lateinit var getAppropriateAdminMessageUseCase: GetAppropriateAdminMessageUseCase
+
+    @MockK
+    lateinit var preferencesRepository: PreferencesRepository
+
     private lateinit var presenter: LoginFormPresenter
 
     private val registerUser = RegisterUser(
@@ -72,6 +80,8 @@ class LoginFormPresenterTest {
             loginErrorHandler = errorHandler,
             appInfo = appInfo,
             analytics = analytics,
+            getAppropriateAdminMessageUseCase = getAppropriateAdminMessageUseCase,
+            preferencesRepository = preferencesRepository,
         )
         presenter.onAttachView(loginFormView)
     }

From 8f78324940a3702890c782e7c38fb765f00bfb34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Fri, 25 Aug 2023 00:01:36 +0200
Subject: [PATCH 381/429] Version 2.1.0

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d0ae8894..b09078a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,8 +27,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 131 // todo: already bumped for 2.1.0 version
-        versionName "2.0.8"
+        versionCode 131
+        versionName "2.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -161,7 +161,7 @@ play {
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
     userFraction = 0.25d
-    updatePriority = 1
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -191,7 +191,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.9-SNAPSHOT'
+    implementation 'io.github.wulkanowy:sdk:2.1.0'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index e881cfda..aa934ce9 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,7 +1,8 @@
-Wersja 2.0.8
+Wersja 2.1.0
 
-— poprawiliśmy wyświetlanie kilku rodzajów zmian w planie lekcji
-— dodaliśmy limit znaków w okienku usprawiedliwiania
-— naprawiliśmy wyświetlanie frekwencji w szkołach, gdzie działa już system eduOne (ciągle jednak brak opcji usprawiedliwiania)
+— dodaliśmy tryb incognito w wiadomościach
+— dodaliśmy wyświetlanie pustych lekcji (okienek) w planie lekcji
+— poprawiliśmy widżet planu lekcji (będzie teraz trochę bardziej kompaktowy)
+— zmieniliśmy datę rozpoczęcia roku szkolnego na 3 dni przed 1 września (sorry)
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From 10f9812495f83ec7be0ffcea927b9eb95bdd9adc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:04:34 +0000
Subject: [PATCH 382/429] Bump com.android.tools.build:gradle from 8.1.0 to
 8.1.1 (#2286)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2b52c068..7adbb469 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ 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.11"
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.1.300'

From 5238e4d187ec314fc180630e0ba1ad687065a7da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:04:57 +0000
Subject: [PATCH 383/429] Bump com.google.android.gms:play-services-ads from
 22.2.0 to 22.3.0 (#2285)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b09078a9..7d8cc08b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -254,7 +254,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-config-ktx'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:22.2.0'
+    playImplementation 'com.google.android.gms:play-services-ads:22.3.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.303'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.300'

From aff56a83118e33259039d66c6d89bbfb4e2796f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:05:12 +0000
Subject: [PATCH 384/429] Bump com.google.firebase:firebase-bom from 32.2.2 to
 32.2.3 (#2284)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7d8cc08b..03c6c837 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,7 +247,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.2.2')
+    playImplementation platform('com.google.firebase:firebase-bom:32.2.3')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From a77b3d4cd73961f0b17c01dd3866f95fc4b176b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:05:29 +0000
Subject: [PATCH 385/429] Bump com.google.firebase:firebase-crashlytics-gradle
 from 2.9.8 to 2.9.9 (#2283)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7adbb469..3f4d6d73 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.1.300'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.8'
+        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.0.3225"

From 50a177d18c01f1ecbdc04169034a0e49780cae9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:05:47 +0000
Subject: [PATCH 386/429] Bump org.jetbrains.kotlinx:kotlinx-serialization-json
 (#2282)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 03c6c837..b578b4cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,7 +195,7 @@ dependencies {
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     implementation "androidx.core:core-ktx:1.10.1"

From c82e6ae95bb25845a15fc067a5858a43c3b39f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 1 Sep 2023 19:06:48 +0200
Subject: [PATCH 387/429] New Crowdin updates (#2287)

---
 app/src/main/res/values-uk/preferences_values.xml |  6 +++---
 app/src/main/res/values-uk/strings.xml            | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index 55cf905b..c02efb54 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -52,9 +52,9 @@
         <item>Середня оцінка з цілого року</item>
     </string-array>
     <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
+        <item>Не показувати</item>
+        <item>Тільки між уроками</item>
+        <item>Перед і між уроками</item>
     </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Щасливий номер</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 876562d3..d01dcfba 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -186,10 +186,10 @@
     <string name="timetable_notify_change_teacher">Зміна вчителя з %1$s на %2$s</string>
     <string name="timetable_notify_change_subject">Зміна теми з %1$s на %2$s</string>
     <plurals name="timetable_no_lesson">
-        <item quantity="one">No lesson</item>
-        <item quantity="few">No lessons</item>
-        <item quantity="many">No lessons</item>
-        <item quantity="other">No lessons</item>
+        <item quantity="one">Немає уроку</item>
+        <item quantity="few">Немає уроків</item>
+        <item quantity="many">Немає уроків</item>
+        <item quantity="other">Немає уроків</item>
     </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Зміна у розкладі</item>
@@ -706,7 +706,7 @@
     <string name="pref_view_expand_grade">Розгортання оцінок</string>
     <string name="pref_view_timetable_show_timers">Позначити поточний урок</string>
     <string name="pref_view_timetable_show_groups">Показувати групи поруч з темами</string>
-    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
+    <string name="pref_view_timetable_show_gaps">Показувати порожні плитки там, де немає уроків</string>
     <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
     <string name="pref_view_subjects_without_grades">Показати предмети без оцінок</string>
     <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>

From 8cc69728aac101c6821e08ef062c0470fcbc40f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:29:02 +0000
Subject: [PATCH 388/429] Bump kotlin_version from 1.9.0 to 1.9.10 (#2281)

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3f4d6d73..ba792ef1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.9.0'
+        kotlin_version = '1.9.10'
         about_libraries = '10.8.3'
         hilt_version = "2.47"
     }
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         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.11"
+        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.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'

From 8478b8b7ed08043a2f75e7d298f6e2f6dcfa6b70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:13:24 +0000
Subject: [PATCH 389/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2291)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ba792ef1..b1e35375 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         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.0.3225"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.1.3277"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From 017d46e5dbb3e828074d22ab311787d390fc98ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:13:39 +0000
Subject: [PATCH 390/429] Bump hilt_version from 2.47 to 2.48 (#2290)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b1e35375..51f4be8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.9.10'
         about_libraries = '10.8.3'
-        hilt_version = "2.47"
+        hilt_version = "2.48"
     }
     repositories {
         mavenCentral()

From 0a402378099d02629187a04cb6761a16bfb56ee9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 18:30:02 +0000
Subject: [PATCH 391/429] Bump com.github.bastienpaulfr:Treessence from 1.0.5
 to 1.1.2 (#2289)

---
 app/build.gradle                                              | 2 +-
 app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt   | 4 ++--
 app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt         | 2 +-
 app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt    | 2 +-
 .../play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt   | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b578b4cd..fb03ca16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,7 +239,7 @@ dependencies {
 
     implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation 'com.github.bastienpaulfr:Treessence:1.0.5'
+    implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation "io.coil-kt:coil:2.4.0"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.1"
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
index 377e8366..2b1f1d30 100644
--- a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.utils
 
 import android.util.Log
 import com.huawei.agconnect.crash.AGConnectCrash
-import fr.bipi.tressence.base.FormatterPriorityTree
-import fr.bipi.tressence.common.StackTraceRecorder
+import fr.bipi.treessence.base.FormatterPriorityTree
+import fr.bipi.treessence.common.StackTraceRecorder
 
 class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
 
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index a39a3874..dc106101 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -6,7 +6,7 @@ import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
 import com.yariksoffice.lingver.Lingver
 import dagger.hilt.android.HiltAndroidApp
-import fr.bipi.tressence.file.FileLoggerTree
+import fr.bipi.treessence.file.FileLoggerTree
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.*
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
index 1e9f49a6..00ed2c11 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -7,7 +7,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import fr.bipi.tressence.common.filters.Filter
+import fr.bipi.treessence.common.filters.Filter
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
 import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import timber.log.Timber
diff --git a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index f980bc4b..2e5fad62 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.utils
 
 import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import fr.bipi.tressence.base.FormatterPriorityTree
-import fr.bipi.tressence.common.StackTraceRecorder
+import fr.bipi.treessence.base.FormatterPriorityTree
+import fr.bipi.treessence.common.StackTraceRecorder
 
 class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
 

From db02f0c1e12d815a1d0f619ebe99816a18654811 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:32:56 +0000
Subject: [PATCH 392/429] Bump com.google.android.gms:play-services-ads from
 22.3.0 to 22.4.0 (#2301)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index fb03ca16..d1fbfd16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -254,7 +254,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-config-ktx'
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
-    playImplementation 'com.google.android.gms:play-services-ads:22.3.0'
+    playImplementation 'com.google.android.gms:play-services-ads:22.4.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.303'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.300'

From 05a804832bd993f3afc5b588ba1eb292548c1a82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:33:10 +0000
Subject: [PATCH 393/429] Bump com.google.gms:google-services from 4.3.15 to
 4.4.0 (#2300)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 51f4be8f..8aec83fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         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.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.huawei.agconnect:agcp:1.9.1.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath "com.github.triplet.gradle:play-publisher:3.8.4"

From 81d8f7ea4826441f9d5b632d83889fadf949a6ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:33:30 +0000
Subject: [PATCH 394/429] Bump androidx.lifecycle:lifecycle-livedata-ktx from
 2.6.1 to 2.6.2 (#2295)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d1fbfd16..46c6ed71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -219,7 +219,7 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"

From 09d16cf6d8b5f6016fdeadf6da3ec26b632d518a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:33:50 +0000
Subject: [PATCH 395/429] Bump androidx.annotation:annotation from 1.6.0 to
 1.7.0 (#2293)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 46c6ed71..5b4eeacd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -203,7 +203,7 @@ dependencies {
     implementation "androidx.activity:activity-ktx:1.7.2"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.6.1"
-    implementation "androidx.annotation:annotation:1.6.0"
+    implementation "androidx.annotation:annotation:1.7.0"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.1"

From aabd7345c1521066666f376fdc0c5c0e9b1a65ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:49:25 +0000
Subject: [PATCH 396/429] Bump com.google.firebase:firebase-bom from 32.2.3 to
 32.3.1 (#2299)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5b4eeacd..6def2c13 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -247,7 +247,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.2.3')
+    playImplementation platform('com.google.firebase:firebase-bom:32.3.1')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From 1d8d71709ff84c04bb36ae43d52bd186aebcaf7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:49:46 +0000
Subject: [PATCH 397/429] Bump com.huawei.agconnect:agconnect-crash from
 1.9.1.300 to 1.9.1.301 (#2298)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6def2c13..57755d74 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -257,7 +257,7 @@ dependencies {
     playImplementation 'com.google.android.gms:play-services-ads:22.4.0'
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.303'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.301'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 

From ff2aa6f195990be56bdc87a115075a5ef57e7bb3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 20:59:38 +0000
Subject: [PATCH 398/429] Bump com.huawei.agconnect:agcp from 1.9.1.300 to
 1.9.1.301 (#2297)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8aec83fb..e7543d97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:8.1.1'
         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.300'
+        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"

From c4a3da93ca41cb78806ddfd6aff1ab42e72739c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Sep 2023 21:00:06 +0000
Subject: [PATCH 399/429] Bump com.huawei.hms:hianalytics from 6.10.0.303 to
 6.12.0.300 (#2294)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 57755d74..191a574e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -256,7 +256,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:22.4.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.303'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.301'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"

From afd0c8513a034a89bb240f0592d442793b1edb7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 17:43:16 +0000
Subject: [PATCH 400/429] Bump mockk from 1.13.7 to 1.13.8 (#2305)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 191a574e..abe1a4b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,7 +186,7 @@ ext {
     android_hilt = "1.0.0"
     room = "2.5.2"
     chucker = "3.5.2"
-    mockk = "1.13.7"
+    mockk = "1.13.8"
     coroutines = "1.7.3"
 }
 

From 646b4a149d64b55ac9699d62332831ad65c8a32e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 17:43:41 +0000
Subject: [PATCH 401/429] Bump about_libraries from 10.8.3 to 10.9.0 (#2304)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e7543d97..651e9ca1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '1.9.10'
-        about_libraries = '10.8.3'
+        about_libraries = '10.9.0'
         hilt_version = "2.48"
     }
     repositories {

From 0fa197d5204a5a56b51da2a497dd5241bc60c5cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Mon, 25 Sep 2023 19:43:57 +0200
Subject: [PATCH 402/429] New Crowdin updates (#2303)

---
 app/src/main/res/values-cs/preferences_values.xml |  6 +++---
 app/src/main/res/values-cs/strings.xml            | 10 +++++-----
 app/src/main/res/values-sk/preferences_values.xml |  6 +++---
 app/src/main/res/values-sk/strings.xml            | 10 +++++-----
 app/src/main/res/values-uk/strings.xml            |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
index 2cf40263..1590c47a 100644
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@@ -52,9 +52,9 @@
         <item>Průměr známek z celého roku</item>
     </string-array>
     <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
+        <item>Nezobrazovat</item>
+        <item>Pouze mezi lekcemi</item>
+        <item>Před a mezi lekcemi</item>
     </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Šťastné číslo</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a63a0aa1..e9e04932 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -186,10 +186,10 @@
     <string name="timetable_notify_change_teacher">Změna učitele z %1$s na %2$s</string>
     <string name="timetable_notify_change_subject">Změna předmětu z %1$s na %2$s</string>
     <plurals name="timetable_no_lesson">
-        <item quantity="one">No lesson</item>
-        <item quantity="few">No lessons</item>
-        <item quantity="many">No lessons</item>
-        <item quantity="other">No lessons</item>
+        <item quantity="one">Žádné lekce</item>
+        <item quantity="few">Žádné lekce</item>
+        <item quantity="many">Žádné lekce</item>
+        <item quantity="other">Žádné lekce</item>
     </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Změna plánu lekcí</item>
@@ -706,7 +706,7 @@
     <string name="pref_view_expand_grade">Rozvíjení známek</string>
     <string name="pref_view_timetable_show_timers">Označit aktuální lekci</string>
     <string name="pref_view_timetable_show_groups">Zobrazit skupiny vedle předmětů</string>
-    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
+    <string name="pref_view_timetable_show_gaps">Zobrazit prázdné dlaždice, kde není žádná lekce</string>
     <string name="pref_view_grade_statistics_list">Zobrazit seznam grafů v známkách třídy</string>
     <string name="pref_view_subjects_without_grades">Zobrazit předměty bez známek</string>
     <string name="pref_view_grade_color_scheme">Známky barevné schéma</string>
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
index fd393394..6cd22154 100644
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@@ -52,9 +52,9 @@
         <item>Priemer známok z celého roka</item>
     </string-array>
     <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
+        <item>Nezobrazovať</item>
+        <item>Iba medzi lekciami</item>
+        <item>Pred a medzi lekciami</item>
     </string-array>
     <string-array name="dashboard_tile_entries">
         <item>Šťastné číslo</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d1990e35..d059927e 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -186,10 +186,10 @@
     <string name="timetable_notify_change_teacher">Zmena učiteľa z %1$s na %2$s</string>
     <string name="timetable_notify_change_subject">Zmena predmetu z %1$s na %2$s</string>
     <plurals name="timetable_no_lesson">
-        <item quantity="one">No lesson</item>
-        <item quantity="few">No lessons</item>
-        <item quantity="many">No lessons</item>
-        <item quantity="other">No lessons</item>
+        <item quantity="one">Žiadne lekcie</item>
+        <item quantity="few">Žiadne lekcie</item>
+        <item quantity="many">Žiadne lekcie</item>
+        <item quantity="other">Žiadne lekcie</item>
     </plurals>
     <plurals name="timetable_notify_new_items_title">
         <item quantity="one">Zmena plánu lekcií</item>
@@ -706,7 +706,7 @@
     <string name="pref_view_expand_grade">Rozvijanie známok</string>
     <string name="pref_view_timetable_show_timers">Označiť aktuálne lekciu</string>
     <string name="pref_view_timetable_show_groups">Zobraziť skupiny vedľa predmetov</string>
-    <string name="pref_view_timetable_show_gaps">Show empty tiles where there\'s no lesson</string>
+    <string name="pref_view_timetable_show_gaps">Zobraziť prázdne dlaždice, kde nie je žiadne lekcie</string>
     <string name="pref_view_grade_statistics_list">Zobraziť zoznam grafov v známkach triedy</string>
     <string name="pref_view_subjects_without_grades">Zobraziť predmety bez známok</string>
     <string name="pref_view_grade_color_scheme">Známky farebnú schému</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index d01dcfba..b46b9afe 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -55,7 +55,7 @@
     <string name="login_invalid_login">Використовуйте призначений логін замість адреси e-mail</string>
     <string name="login_invalid_custom_email">Використовуйте призначений логін або адресу e-mail в @%1$s</string>
     <string name="login_invalid_symbol">Неправильний symbol</string>
-    <string name="login_incorrect_symbol">Студента не знайдено. Перевірте symbol та обранний тип щоденника UONET+</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>
     <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>

From 95b4d53fac498f81ef82d74b0836763fbd43c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 25 Sep 2023 19:44:13 +0200
Subject: [PATCH 403/429] Add schools API integration (#2302)

---
 app/build.gradle                              |  3 +
 .../github/wulkanowy/utils/IntegrityHelper.kt | 11 +++
 .../github/wulkanowy/utils/IntegrityHelper.kt | 11 +++
 .../io/github/wulkanowy/data/DataModule.kt    | 17 ++++-
 .../wulkanowy/data/api/SchoolsService.kt      | 14 ++++
 .../github/wulkanowy/data/pojos/LoginEvent.kt | 21 ++++++
 .../data/repositories/SchoolsRepository.kt    | 68 +++++++++++++++++++
 .../LoginStudentSelectPresenter.kt            | 29 +++++---
 .../java/io/github/wulkanowy/utils/AppInfo.kt |  3 +-
 .../github/wulkanowy/utils/IntegrityHelper.kt | 27 ++++++++
 .../LoginStudentSelectPresenterTest.kt        |  6 ++
 11 files changed, 195 insertions(+), 15 deletions(-)
 create mode 100644 app/src/fdroid/java/io/github/wulkanowy/utils/IntegrityHelper.kt
 create mode 100644 app/src/hms/java/io/github/wulkanowy/utils/IntegrityHelper.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/pojos/LoginEvent.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt
 create mode 100644 app/src/play/java/io/github/wulkanowy/utils/IntegrityHelper.kt

diff --git a/app/build.gradle b/app/build.gradle
index abe1a4b1..d85d0a3d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,6 +69,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
+            buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
         debug {
             minifyEnabled false
@@ -78,6 +79,7 @@ android {
             versionNameSuffix "-dev"
             ext.enableCrashlytics = project.hasProperty("enableFirebase")
             buildConfigField "String", "MESSAGES_BASE_URL", "\"https://messages.wulkanowy.net.pl\""
+            buildConfigField "String", "SCHOOLS_BASE_URL", '"https://schools.wulkanowy.net.pl"'
         }
     }
 
@@ -255,6 +257,7 @@ dependencies {
     playImplementation 'com.google.android.play:core:1.10.3'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:22.4.0'
+    playImplementation "com.google.android.play:integrity:1.2.0"
 
     hmsImplementation 'com.huawei.hms:hianalytics:6.12.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.1.301'
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/IntegrityHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/IntegrityHelper.kt
new file mode 100644
index 00000000..7af68058
--- /dev/null
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/IntegrityHelper.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class IntegrityHelper @Inject constructor() {
+
+    @Suppress("UNUSED_PARAMETER")
+    fun getIntegrityToken(requestId: String): String? = null
+}
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/IntegrityHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/IntegrityHelper.kt
new file mode 100644
index 00000000..7af68058
--- /dev/null
+++ b/app/src/hms/java/io/github/wulkanowy/utils/IntegrityHelper.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.utils
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class IntegrityHelper @Inject constructor() {
+
+    @Suppress("UNUSED_PARAMETER")
+    fun getIntegrityToken(requestId: String): String? = null
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
index c9e4990f..bea3f706 100644
--- a/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/DataModule.kt
@@ -14,6 +14,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import io.github.wulkanowy.data.api.AdminMessageService
+import io.github.wulkanowy.data.api.SchoolsService
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.PreferencesRepository
@@ -82,19 +83,29 @@ internal class DataModule {
 
     @Singleton
     @Provides
-    fun provideRetrofit(
+    fun provideAdminMessageService(
         okHttpClient: OkHttpClient,
         json: Json,
         appInfo: AppInfo
-    ): Retrofit = Retrofit.Builder()
+    ): AdminMessageService = Retrofit.Builder()
         .baseUrl(appInfo.messagesBaseUrl)
         .client(okHttpClient)
         .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
         .build()
+        .create()
 
     @Singleton
     @Provides
-    fun provideAdminMessageService(retrofit: Retrofit): AdminMessageService = retrofit.create()
+    fun provideSchoolsService(
+        okHttpClient: OkHttpClient,
+        json: Json,
+        appInfo: AppInfo,
+    ): SchoolsService = Retrofit.Builder()
+        .baseUrl(appInfo.schoolsBaseUrl)
+        .client(okHttpClient)
+        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+        .build()
+        .create()
 
     @Singleton
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt b/app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt
new file mode 100644
index 00000000..a7da9b63
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/api/SchoolsService.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.api
+
+import io.github.wulkanowy.data.pojos.IntegrityRequest
+import io.github.wulkanowy.data.pojos.LoginEvent
+import retrofit2.http.Body
+import retrofit2.http.POST
+import javax.inject.Singleton
+
+@Singleton
+interface SchoolsService {
+
+    @POST("/log/loginEvent")
+    suspend fun logLoginEvent(@Body request: IntegrityRequest<LoginEvent>)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/LoginEvent.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/LoginEvent.kt
new file mode 100644
index 00000000..c2b4d2de
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/LoginEvent.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.pojos
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LoginEvent(
+    val uuid: String,
+    val schoolName: String,
+    val schoolShort: String,
+    val schoolAddress: String,
+    val scraperBaseUrl: String,
+    val symbol: String,
+    val schoolId: String,
+    val loginType: String,
+)
+
+@Serializable
+data class IntegrityRequest<T>(
+    val tokenString: String,
+    val data: T,
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt
new file mode 100644
index 00000000..9c642934
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolsRepository.kt
@@ -0,0 +1,68 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.api.SchoolsService
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.pojos.IntegrityRequest
+import io.github.wulkanowy.data.pojos.LoginEvent
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.ui.modules.login.LoginData
+import io.github.wulkanowy.utils.IntegrityHelper
+import io.github.wulkanowy.utils.getCurrentOrLast
+import io.github.wulkanowy.utils.init
+import kotlinx.coroutines.withTimeout
+import timber.log.Timber
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.time.Duration.Companion.seconds
+
+@Singleton
+class SchoolsRepository @Inject constructor(
+    private val integrityHelper: IntegrityHelper,
+    private val schoolsService: SchoolsService,
+    private val sdk: Sdk,
+) {
+
+    suspend fun logSchoolLogin(loginData: LoginData, students: List<StudentWithSemesters>) {
+        students.forEach {
+            runCatching {
+                withTimeout(10.seconds) {
+                    logLogin(loginData, it.student, it.semesters.getCurrentOrLast())
+                }
+            }
+                .onFailure { Timber.e(it) }
+        }
+    }
+
+    private suspend fun logLogin(loginData: LoginData, student: Student, semester: Semester) {
+        val requestId = UUID.randomUUID().toString()
+        val token = integrityHelper.getIntegrityToken(requestId) ?: return
+
+        val schoolInfo = sdk
+            .init(student.copy(password = loginData.password))
+            .switchDiary(
+                diaryId = semester.diaryId,
+                kindergartenDiaryId = semester.kindergartenDiaryId,
+                schoolYear = semester.schoolYear
+            )
+            .getSchool()
+
+        schoolsService.logLoginEvent(
+            IntegrityRequest(
+                tokenString = token,
+                data = LoginEvent(
+                    uuid = requestId,
+                    schoolAddress = schoolInfo.address,
+                    schoolName = schoolInfo.name,
+                    schoolShort = student.schoolShortName,
+                    scraperBaseUrl = student.scrapperBaseUrl,
+                    loginType = student.loginType,
+                    symbol = student.symbol,
+                    schoolId = student.schoolSymbol,
+                )
+            )
+        )
+    }
+}
diff --git 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
index 70862e82..0da86e56 100644
--- 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
@@ -9,6 +9,7 @@ import io.github.wulkanowy.data.pojos.RegisterStudent
 import io.github.wulkanowy.data.pojos.RegisterSymbol
 import io.github.wulkanowy.data.pojos.RegisterUnit
 import io.github.wulkanowy.data.pojos.RegisterUser
+import io.github.wulkanowy.data.repositories.SchoolsRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
 import io.github.wulkanowy.sdk.scrapper.login.AccountPermissionException
@@ -26,6 +27,7 @@ import javax.inject.Inject
 
 class LoginStudentSelectPresenter @Inject constructor(
     studentRepository: StudentRepository,
+    private val schoolsRepository: SchoolsRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val syncManager: SyncManager,
     private val analytics: AnalyticsHelper,
@@ -236,17 +238,20 @@ class LoginStudentSelectPresenter @Inject constructor(
     }
 
     private fun registerStudents(students: List<LoginStudentSelectItem>) {
-        val studentsWithSemesters = students
-            .filterIsInstance<LoginStudentSelectItem.Student>().map { item ->
-                item.student.mapToStudentWithSemesters(
-                    user = registerUser,
-                    symbol = item.symbol,
-                    scrapperDomainSuffix = loginData.domainSuffix,
-                    unit = item.unit,
-                    colors = appInfo.defaultColorsForAvatar,
-                )
-            }
-        resourceFlow { studentRepository.saveStudents(studentsWithSemesters) }
+        val filteredStudents = students.filterIsInstance<LoginStudentSelectItem.Student>()
+        val studentsWithSemesters = filteredStudents.map { item ->
+            item.student.mapToStudentWithSemesters(
+                user = registerUser,
+                symbol = item.symbol,
+                scrapperDomainSuffix = loginData.domainSuffix,
+                unit = item.unit,
+                colors = appInfo.defaultColorsForAvatar,
+            )
+        }
+        resourceFlow {
+            studentRepository.saveStudents(studentsWithSemesters)
+            schoolsRepository.logSchoolLogin(loginData, studentsWithSemesters)
+        }
             .logResourceStatus("registration")
             .onEach {
                 when (it) {
@@ -254,11 +259,13 @@ class LoginStudentSelectPresenter @Inject constructor(
                         showProgress(true)
                         showContent(false)
                     }
+
                     is Resource.Success -> {
                         syncManager.startOneTimeSyncWorker(quiet = true)
                         view?.navigateToNext()
                         logRegisterEvent(studentsWithSemesters)
                     }
+
                     is Resource.Error -> {
                         view?.apply {
                             showProgress(false)
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
index 962e5b20..e16db53c 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -25,7 +25,8 @@ open class AppInfo @Inject constructor() {
 
     open val systemModel: String get() = Build.MODEL
 
-    open val messagesBaseUrl = BuildConfig.MESSAGES_BASE_URL
+    open val messagesBaseUrl: String = BuildConfig.MESSAGES_BASE_URL
+    open val schoolsBaseUrl: String = BuildConfig.SCHOOLS_BASE_URL
 
     @Suppress("DEPRECATION")
     open val systemLanguage: String
diff --git a/app/src/play/java/io/github/wulkanowy/utils/IntegrityHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/IntegrityHelper.kt
new file mode 100644
index 00000000..41df0487
--- /dev/null
+++ b/app/src/play/java/io/github/wulkanowy/utils/IntegrityHelper.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import com.google.android.play.core.integrity.IntegrityManagerFactory
+import com.google.android.play.core.integrity.IntegrityTokenRequest
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.tasks.await
+import java.util.UUID
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class IntegrityHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+) {
+
+    suspend fun getIntegrityToken(nonce: String): String? {
+        val integrityManager = IntegrityManagerFactory.create(context)
+
+        val integrityTokenResponse = integrityManager.requestIntegrityToken(
+            IntegrityTokenRequest.builder()
+                .setNonce(nonce)
+                .build()
+        )
+        return integrityTokenResponse.await().token()
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index 06aabec7..fad6436d 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -5,6 +5,7 @@ import io.github.wulkanowy.data.pojos.RegisterStudent
 import io.github.wulkanowy.data.pojos.RegisterSymbol
 import io.github.wulkanowy.data.pojos.RegisterUnit
 import io.github.wulkanowy.data.pojos.RegisterUser
+import io.github.wulkanowy.data.repositories.SchoolsRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.scrapper.Scrapper
@@ -40,6 +41,9 @@ class LoginStudentSelectPresenterTest {
     @MockK
     lateinit var studentRepository: StudentRepository
 
+    @MockK
+    lateinit var schoolsRepository: SchoolsRepository
+
     @MockK(relaxed = true)
     lateinit var analytics: AnalyticsHelper
 
@@ -110,6 +114,7 @@ class LoginStudentSelectPresenterTest {
         clearMocks(studentRepository, loginStudentSelectView)
 
         coEvery { studentRepository.getSavedStudents(false) } returns emptyList()
+        coEvery { schoolsRepository.logSchoolLogin(any(), any()) } just Runs
 
         every { loginStudentSelectView.initView() } just Runs
         every { loginStudentSelectView.symbols } returns emptyMap()
@@ -120,6 +125,7 @@ class LoginStudentSelectPresenterTest {
 
         presenter = LoginStudentSelectPresenter(
             studentRepository = studentRepository,
+            schoolsRepository = schoolsRepository,
             loginErrorHandler = errorHandler,
             syncManager = syncManager,
             analytics = analytics,

From 4d3b16ec8073285f724448f4e73dbe5b75b9e786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 21:01:25 +0200
Subject: [PATCH 404/429] Fix password toggle icon tint after clearing error
 (#2309)

---
 .../wulkanowy/ui/modules/login/form/LoginFormFragment.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index ff7fd864..aa2da311 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -184,7 +184,9 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
 
     override fun clearPassError() {
         binding.loginFormPassLayout.error = null
-        binding.loginFormPassLayout.setEndIconTintList(null)
+        binding.loginFormPassLayout.setEndIconTintList(
+            requireContext().getAttrColorStateList(R.attr.colorOnSurface)
+        )
         binding.loginFormErrorBox.isVisible = false
     }
 

From 183544646846be7f6fd1c160825b3a07e8c4e39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 21:01:59 +0200
Subject: [PATCH 405/429] Fix password reset related issues (#2308)

* Fix login hint in password reset field

* Don't hide first password reset button

* Change recover button label
---
 .../wulkanowy/ui/modules/login/form/LoginFormFragment.kt      | 3 +--
 .../ui/modules/login/recover/LoginRecoverPresenter.kt         | 4 ++--
 app/src/main/res/values/strings.xml                           | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index aa2da311..0a2ea5d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -238,8 +238,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
     }
 
     override fun showContact(show: Boolean) {
-        binding.loginFormContact.visibility = if (show) VISIBLE else GONE
-        binding.loginFormRecoverLink.visibility = if (show) GONE else VISIBLE
+        binding.loginFormContact.isVisible = show
     }
 
     override fun openPrivacyPolicyPage() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
index 3d049301..a424df40 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
@@ -46,7 +46,7 @@ class LoginRecoverPresenter @Inject constructor(
 
     fun updateFields() {
         view?.run {
-            setUsernameHint(if ("standard" in recoverHostValue) emailHintString else loginPeselEmailHintString)
+            setUsernameHint(if ("email" in recoverHostValue) emailHintString else loginPeselEmailHintString)
         }
     }
 
@@ -92,7 +92,7 @@ class LoginRecoverPresenter @Inject constructor(
             isCorrect = false
         }
 
-        if ("standard" in host && "@" !in username) {
+        if ("email" in host && "@" !in username) {
             view?.setUsernameError(view?.invalidEmailString.orEmpty())
             isCorrect = false
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce277bdc..7da41b3d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,7 +76,7 @@
     <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
     <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nIdentyfikator instalacji: %5$s\nOstatni błąd: %6$s\n\nNazwa szkoły i miejscowość: </string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Recover your account</string>
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>

From 26a95ecb995f701cd9eb7184499c7467c4c4527d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 21:02:36 +0200
Subject: [PATCH 406/429]  Auto select students for login  (#2307)

* Auto select students for login

* Add sign in icon to sign in button on student select screen
---
 .../LoginStudentSelectPresenter.kt            | 25 ++++++++++++++++++-
 app/src/main/res/drawable/ic_login.xml        |  5 ++++
 .../layout/fragment_login_student_select.xml  |  2 ++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_login.xml

diff --git 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
index 0da86e56..4e5cd510 100644
--- 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
@@ -21,6 +21,7 @@ import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.ifNullOrBlank
+import io.github.wulkanowy.utils.isCurrent
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
@@ -73,7 +74,14 @@ class LoginStudentSelectPresenter @Inject constructor(
             students = it.dataOrNull.orEmpty()
             when (it) {
                 is Resource.Loading -> Timber.d("Login student select students load started")
-                is Resource.Success -> refreshItems()
+                is Resource.Success -> {
+                    getStudentsWithCurrentlyActiveSemesters()
+                    selectedStudents.clear()
+                    selectedStudents.addAll(getStudentsWithCurrentlyActiveSemesters())
+                    view?.enableSignIn(selectedStudents.isNotEmpty())
+                    refreshItems()
+                }
+
                 is Resource.Error -> {
                     errorHandler.dispatch(it.error)
                     lastError = it.error
@@ -83,6 +91,21 @@ class LoginStudentSelectPresenter @Inject constructor(
         }.launch()
     }
 
+    private fun getStudentsWithCurrentlyActiveSemesters(): List<LoginStudentSelectItem.Student> {
+        val students = registerUser.symbols.flatMap { symbol ->
+            symbol.schools.flatMap { unit ->
+                unit.students.map {
+                    createStudentItem(it, symbol, unit, students)
+                }
+            }
+        }
+        return students.filter { student ->
+            student.student.semesters.any { semester ->
+                semester.isCurrent()
+            }
+        }
+    }
+
     private fun createItems(): List<LoginStudentSelectItem> = buildList {
         val notEmptySymbols = registerUser.symbols.filter { it.schools.isNotEmpty() }
         val emptySymbols = registerUser.symbols.filter { it.schools.isEmpty() }
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
new file mode 100644
index 00000000..57aef3dc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5,-5L11,7zM20,19h-8v2h8c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-8v2h8V19z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index c47b9ae3..04c80885 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -56,6 +56,8 @@
             android:layout_marginBottom="32dp"
             android:enabled="false"
             android:text="@string/login_sign_in"
+            app:icon="@drawable/ic_login"
+            app:iconGravity="end"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/loginStudentSelectRecycler" />

From 58d5196ac9847ff7db7033e9df95c8febf27b9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 22:25:23 +0200
Subject: [PATCH 407/429] Improve symbol input field (#2312)

---
 .../ui/modules/login/symbol/LoginSymbolFragment.kt    |  7 +++++++
 .../ui/modules/login/symbol/LoginSymbolPresenter.kt   | 11 +++++++++++
 .../ui/modules/login/symbol/LoginSymbolView.kt        |  2 ++
 app/src/main/res/layout/fragment_login_symbol.xml     |  4 +++-
 app/src/main/res/values/strings.xml                   |  4 +++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 692aaeb7..67957659 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -100,6 +100,13 @@ class LoginSymbolFragment :
         }
     }
 
+    override fun setErrorSymbolDefinitelyInvalid() {
+        with(binding.loginSymbolNameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_symbol_definitely)
+        }
+    }
+
     override fun setErrorSymbolRequire() {
         setErrorSymbol(getString(R.string.error_field_required))
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index 91fe1ac3..01855fce 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -53,6 +53,10 @@ class LoginSymbolPresenter @Inject constructor(
             view?.setErrorSymbolRequire()
             return
         }
+        if (isFormDefinitelyInvalid()) {
+            view?.setErrorSymbolDefinitelyInvalid()
+            return
+        }
 
         loginData = loginData.copy(
             symbol = view?.symbolValue?.getNormalizedSymbol(),
@@ -130,6 +134,13 @@ class LoginSymbolPresenter @Inject constructor(
         }.launch("login")
     }
 
+    private fun isFormDefinitelyInvalid(): Boolean {
+        val definitelyInvalidSymbols = listOf("vulcan", "uonet", "wulkanowy", "standardowa")
+        val normalizedSymbol = view?.symbolValue.orEmpty().getNormalizedSymbol()
+
+        return normalizedSymbol in definitelyInvalidSymbols
+    }
+
     fun onFaqClick() {
         view?.openFaqPage()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 6585c00f..3c10d574 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -18,6 +18,8 @@ interface LoginSymbolView : BaseView {
 
     fun setErrorSymbolInvalid()
 
+    fun setErrorSymbolDefinitelyInvalid()
+
     fun setErrorSymbolRequire()
 
     fun setErrorSymbol(message: String)
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index d928d65f..37f4c731 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -141,7 +141,9 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHelper">
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHelper"
+                app:placeholderText="@string/login_symbol_placeholder"
+                app:placeholderTextColor="?colorTertiary">
 
                 <AutoCompleteTextView
                     android:id="@+id/loginSymbolName"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7da41b3d..df40fe70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,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_sign_in">Sign in</string>
     <string name="login_invalid_password">Password too short</string>
     <string name="login_incorrect_password_default">Login details are incorrect</string>
@@ -59,7 +60,8 @@
     <string name="login_invalid_email">Invalid email</string>
     <string name="login_invalid_login">Use the assigned login instead of email</string>
     <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol</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_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
     <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>

From 711de0f77f0954d78b70c2e7d5689aa8bada7919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 22:26:19 +0200
Subject: [PATCH 408/429] Fix average calculation when there is no real
 semesters available (#2310)

---
 .../github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index 2d63aae4..ec4bd8e8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -58,7 +58,7 @@ class GradeAverageProvider @Inject constructor(
             when (params.gradeAverageMode) {
                 ONE_SEMESTER -> getGradeSubjects(
                     student = student,
-                    semester = semesters.single { it.semesterId == semesterId },
+                    semester = semesters.first { it.semesterId == semesterId },
                     forceRefresh = forceRefresh,
                     params = params,
                 )

From fca69e723427dbb67f90cc32bb8be09dad99903a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 22:27:08 +0200
Subject: [PATCH 409/429] Add form dialog to login e-mail support (#2306)

---
 .../modules/login/form/LoginFormFragment.kt   |  19 +--
 .../modules/login/form/LoginFormPresenter.kt  |  41 ++++--
 .../ui/modules/login/form/LoginFormView.kt    |   3 +-
 .../LoginStudentSelectFragment.kt             |  20 +--
 .../LoginStudentSelectPresenter.kt            |  33 ++---
 .../studentselect/LoginStudentSelectView.kt   |   3 +-
 .../login/support/LoginSupportDialog.kt       | 133 ++++++++++++++++++
 .../modules/login/support/LoginSupportInfo.kt |  12 ++
 .../login/symbol/LoginSymbolFragment.kt       |  25 ++--
 .../login/symbol/LoginSymbolPresenter.kt      |  19 ++-
 .../modules/login/symbol/LoginSymbolView.kt   |   3 +-
 .../wulkanowy/ui/modules/main/MainActivity.kt |   1 -
 .../main/res/layout/dialog_login_support.xml  |  92 ++++++++++++
 .../main/res/layout/fragment_dashboard.xml    |   5 +-
 app/src/main/res/values/strings.xml           |   8 +-
 app/src/main/res/values/styles.xml            |   1 -
 16 files changed, 322 insertions(+), 96 deletions(-)
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportDialog.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportInfo.kt
 create mode 100644 app/src/main/res/layout/dialog_login_support.xml

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index 0a2ea5d6..8e9b86fa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -17,6 +17,8 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.dashboard.viewholders.AdminMessageViewHolder
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportDialog
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 import io.github.wulkanowy.utils.*
 import javax.inject.Inject
 
@@ -282,20 +284,7 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
         presenter.updateCustomDomainSuffixVisibility()
     }
 
-    override fun openEmail(lastError: String) {
-        context?.openEmailClient(
-            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
-            email = "wulkanowyinc@gmail.com",
-            subject = requireContext().getString(R.string.login_email_subject),
-            body = requireContext().getString(
-                R.string.login_email_text,
-                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
-                appInfo.systemVersion.toString(),
-                "${appInfo.versionName}-${appInfo.buildFlavor}",
-                "$formHostValue/$formHostSymbol",
-                preferencesRepository.installationId,
-                lastError
-            )
-        )
+    override fun openEmail(supportInfo: LoginSupportInfo) {
+        LoginSupportDialog.newInstance(supportInfo).show(childFragmentManager, "support_dialog")
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 4e0404d9..ad535c38 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -17,6 +17,7 @@ import io.github.wulkanowy.domain.adminmessage.GetAppropriateAdminMessageUseCase
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.ifNullOrBlank
@@ -133,7 +134,7 @@ class LoginFormPresenter @Inject constructor(
         }
     }
 
-    fun onSignInClick() {
+    private fun getLoginData(): LoginData {
         val email = view?.formUsernameValue.orEmpty().trim()
         val password = view?.formPassValue.orEmpty().trim()
         val host = view?.formHostValue.orEmpty().trim()
@@ -142,15 +143,27 @@ class LoginFormPresenter @Inject constructor(
         }.orEmpty()
         val symbol = view?.formHostSymbol.orEmpty().trim()
 
-        if (!validateCredentials(email, password, host)) return
+        return LoginData(
+            login = email,
+            password = password,
+            baseUrl = host,
+            domainSuffix = domainSuffix,
+            symbol = symbol
+        )
+    }
+
+    fun onSignInClick() {
+        val loginData = getLoginData()
+
+        if (!validateCredentials(loginData.login, loginData.password, loginData.baseUrl)) return
 
         resourceFlow {
             studentRepository.getUserSubjectsFromScrapper(
-                email = email,
-                password = password,
-                scrapperBaseUrl = host,
-                domainSuffix = domainSuffix,
-                symbol = symbol
+                email = loginData.login,
+                password = loginData.password,
+                scrapperBaseUrl = loginData.baseUrl,
+                domainSuffix = loginData.domainSuffix,
+                symbol = loginData.symbol.orEmpty(),
             )
         }
             .logResourceStatus("login")
@@ -162,7 +175,6 @@ class LoginFormPresenter @Inject constructor(
                 }
             }
             .onResourceSuccess {
-                val loginData = LoginData(email, password, host, domainSuffix, symbol)
                 when (it.symbols.size) {
                     0 -> view?.navigateToSymbol(loginData)
                     else -> view?.navigateToStudentSelect(loginData, it)
@@ -170,7 +182,7 @@ class LoginFormPresenter @Inject constructor(
                 analytics.logEvent(
                     "registration_form",
                     "success" to true,
-                    "scrapperBaseUrl" to host,
+                    "scrapperBaseUrl" to loginData.baseUrl,
                     "error" to "No error"
                 )
             }
@@ -187,7 +199,7 @@ class LoginFormPresenter @Inject constructor(
                 analytics.logEvent(
                     "registration_form",
                     "success" to false,
-                    "scrapperBaseUrl" to host,
+                    "scrapperBaseUrl" to loginData.baseUrl,
                     "error" to it.message.ifNullOrBlank { "No message" }
                 )
             }
@@ -199,7 +211,14 @@ class LoginFormPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail(lastError?.message.ifNullOrBlank { "none" })
+        view?.openEmail(
+            LoginSupportInfo(
+                loginData = getLoginData(),
+                lastErrorMessage = lastError?.message,
+                registerUser = null,
+                enteredSymbol = null,
+            )
+        )
     }
 
     fun onRecoverClick() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 5b4dcadf..f2b7b100 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -4,6 +4,7 @@ import io.github.wulkanowy.data.db.entities.AdminMessage
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 
 interface LoginFormView : BaseView {
 
@@ -79,7 +80,7 @@ interface LoginFormView : BaseView {
 
     fun openFaqPage()
 
-    fun openEmail(lastError: String)
+    fun openEmail(supportInfo: LoginSupportInfo)
 
     fun openAdvancedLogin()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index c33d12fa..06efd8d9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -10,8 +10,11 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.auth.AuthDialog
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportDialog
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
@@ -106,21 +109,8 @@ class LoginStudentSelectFragment :
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openEmail(lastError: String) {
-        context?.openEmailClient(
-            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
-            email = "wulkanowyinc@gmail.com",
-            subject = requireContext().getString(R.string.login_email_subject),
-            body = requireContext().getString(
-                R.string.login_email_text,
-                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
-                appInfo.systemVersion.toString(),
-                "${appInfo.versionName}-${appInfo.buildFlavor}",
-                "Select users to log in",
-                preferencesRepository.installationId,
-                lastError
-            )
-        )
+    override fun openEmail(supportInfo: LoginSupportInfo) {
+        LoginSupportDialog.newInstance(supportInfo).show(childFragmentManager, "support_dialog")
     }
 
     override fun onDestroyView() {
diff --git 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
index 4e5cd510..cc9e422e 100644
--- 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
@@ -12,15 +12,14 @@ import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.data.repositories.SchoolsRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.resourceFlow
-import io.github.wulkanowy.sdk.scrapper.login.AccountPermissionException
 import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.ifNullOrBlank
 import io.github.wulkanowy.utils.isCurrent
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -311,28 +310,14 @@ class LoginStudentSelectPresenter @Inject constructor(
     }
 
     private fun onEmailClick() {
-        view?.openEmail(lastError?.message.ifNullOrBlank {
-            loginData.baseUrl + "/" + loginData.symbol + "\n" + registerUser.symbols.filterNot {
-                (it.error is AccountPermissionException || it.error is InvalidSymbolException) && it.symbol != loginData.symbol
-            }.joinToString(";\n") { symbol ->
-                buildString {
-                    append(" -")
-                    append(symbol.symbol)
-                    append("(${symbol.error?.message?.let { it.take(46) + "..." } ?: symbol.schools.size})")
-                    if (symbol.schools.isNotEmpty()) {
-                        append(": ")
-                    }
-                    append(symbol.schools.joinToString(", ") { unit ->
-                        buildString {
-                            append(unit.schoolShortName)
-                            append("(${unit.error?.message?.let { it.take(46) + "..." } ?: unit.students.size})")
-                        }
-                    })
-                }
-            } + "\nPozostałe: " + registerUser.symbols.filter {
-                it.error is AccountPermissionException || it.error is InvalidSymbolException
-            }.joinToString(", ") { it.symbol }
-        })
+        view?.openEmail(
+            LoginSupportInfo(
+                loginData = loginData,
+                registerUser = registerUser,
+                lastErrorMessage = lastError?.message,
+                enteredSymbol = loginData.symbol,
+            )
+        )
     }
 
     private fun logRegisterEvent(
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index 39f312bf..b69700f1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -2,6 +2,7 @@ package io.github.wulkanowy.ui.modules.login.studentselect
 
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 
 interface LoginStudentSelectView : BaseView {
 
@@ -23,5 +24,5 @@ interface LoginStudentSelectView : BaseView {
 
     fun openDiscordInvite()
 
-    fun openEmail(lastError: String)
+    fun openEmail(supportInfo: LoginSupportInfo)
 }
diff --git 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
new file mode 100644
index 00000000..d2b1d2ce
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportDialog.kt
@@ -0,0 +1,133 @@
+package io.github.wulkanowy.ui.modules.login.support
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.databinding.DialogLoginSupportBinding
+import io.github.wulkanowy.sdk.scrapper.login.AccountPermissionException
+import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.openEmailClient
+import io.github.wulkanowy.utils.serializable
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class LoginSupportDialog : BaseDialogFragment<DialogLoginSupportBinding>() {
+
+    @Inject
+    lateinit var appInfo: AppInfo
+
+    @Inject
+    lateinit var preferencesRepository: PreferencesRepository
+
+    private lateinit var supportInfo: LoginSupportInfo
+
+    companion object {
+        private const val ARGUMENT_KEY = "info"
+
+        fun newInstance(info: LoginSupportInfo) = LoginSupportDialog().apply {
+            arguments = bundleOf(ARGUMENT_KEY to info)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_FRAME, R.style.WulkanowyTheme_NoActionBar)
+        supportInfo = requireArguments().serializable(ARGUMENT_KEY)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val binding = DialogLoginSupportBinding.inflate(inflater)
+            .apply { binding = this }
+        binding.dialogLoginSupportToolbar.setNavigationOnClickListener { dismiss() }
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        with(binding) {
+            dialogLoginSupportSchoolInput.doOnTextChanged { _, _, _, _ ->
+                with(dialogLoginSupportSchoolLayout) {
+                    isErrorEnabled = false
+                    error = null
+                }
+            }
+            dialogLoginSupportSubmit.setOnClickListener {
+                if (dialogLoginSupportSchoolInput.text.isNullOrBlank()) {
+                    with(dialogLoginSupportSchoolLayout) {
+                        isErrorEnabled = true
+                        error = getString(R.string.error_field_required)
+                    }
+                } else {
+                    onSubmitClick()
+                    dismiss()
+                }
+            }
+        }
+    }
+
+    private fun onSubmitClick() {
+        with(binding) {
+            context?.openEmailClient(
+                chooserTitle = requireContext().getString(R.string.login_email_intent_title),
+                email = "wulkanowyinc@gmail.com",
+                subject = requireContext().getString(R.string.login_email_subject),
+                body = requireContext().getString(
+                    R.string.login_email_text,
+                    "${appInfo.systemManufacturer} ${appInfo.systemModel}",
+                    appInfo.systemVersion.toString(),
+                    "${appInfo.versionName}-${appInfo.buildFlavor}",
+                    supportInfo.loginData.baseUrl + "/" + supportInfo.loginData.symbol,
+                    preferencesRepository.installationId,
+                    getLastErrorFromStudentSelectScreen(),
+                    dialogLoginSupportSchoolInput.text.takeIf { !it.isNullOrBlank() }
+                        ?: return@with,
+                    dialogLoginSupportAdditionalInput.text,
+                )
+            )
+        }
+    }
+
+    private fun getLastErrorFromStudentSelectScreen(): String {
+        if (!supportInfo.lastErrorMessage.isNullOrBlank()) {
+            return supportInfo.lastErrorMessage!!
+        }
+        if (supportInfo.registerUser?.symbols.isNullOrEmpty()) {
+            return ""
+        }
+
+        return "\n" + supportInfo.registerUser?.symbols?.filterNot {
+            (it.error is AccountPermissionException || it.error is InvalidSymbolException) &&
+                it.symbol != supportInfo.enteredSymbol
+        }?.joinToString(";\n") { symbol ->
+            buildString {
+                append(" -")
+                append(symbol.symbol)
+                append("(${symbol.error?.message?.let { it.take(46) + "..." } ?: symbol.schools.size})")
+                if (symbol.schools.isNotEmpty()) {
+                    append(": ")
+                }
+                append(symbol.schools.joinToString(", ") { unit ->
+                    buildString {
+                        append(unit.schoolShortName)
+                        append("(${unit.error?.message?.let { it.take(46) + "..." } ?: unit.students.size})")
+                    }
+                })
+            }
+        } + "\nPozostałe: " + supportInfo.registerUser?.symbols?.filter {
+            it.error is AccountPermissionException || it.error is InvalidSymbolException
+        }?.joinToString(", ") { it.symbol }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportInfo.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportInfo.kt
new file mode 100644
index 00000000..3f101dd6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/support/LoginSupportInfo.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.login.support
+
+import io.github.wulkanowy.data.pojos.RegisterUser
+import io.github.wulkanowy.ui.modules.login.LoginData
+import java.io.Serializable
+
+data class LoginSupportInfo(
+    val loginData: LoginData,
+    val registerUser: RegisterUser?,
+    val lastErrorMessage: String?,
+    val enteredSymbol: String?,
+) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 67957659..23ebffe9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -18,7 +18,13 @@ import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginData
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportDialog
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.serializable
+import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -170,20 +176,7 @@ class LoginSymbolFragment :
         )
     }
 
-    override fun openEmail(host: String, lastError: String) {
-        context?.openEmailClient(
-            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
-            email = "wulkanowyinc@gmail.com",
-            subject = requireContext().getString(R.string.login_email_subject),
-            body = requireContext().getString(
-                R.string.login_email_text,
-                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
-                appInfo.systemVersion.toString(),
-                "${appInfo.versionName}-${appInfo.buildFlavor}",
-                "$host/${binding.loginSymbolName.text}",
-                preferencesRepository.installationId,
-                lastError
-            )
-        )
+    override fun openSupportDialog(supportInfo: LoginSupportInfo) {
+        LoginSupportDialog.newInstance(supportInfo).show(childFragmentManager, "support_dialog")
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index 01855fce..02bfde5d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -11,6 +11,7 @@ import io.github.wulkanowy.sdk.scrapper.login.InvalidSymbolException
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginData
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.ifNullOrBlank
 import kotlinx.coroutines.flow.onEach
@@ -78,6 +79,7 @@ class LoginSymbolPresenter @Inject constructor(
                     showProgress(true)
                     showContent(false)
                 }
+
                 is Resource.Success -> {
                     when (user.data.symbols.size) {
                         0 -> {
@@ -87,6 +89,7 @@ class LoginSymbolPresenter @Inject constructor(
                                 showContact(true)
                             }
                         }
+
                         else -> {
                             val enteredSymbolDetails = user.data.symbols
                                 .firstOrNull()
@@ -111,6 +114,7 @@ class LoginSymbolPresenter @Inject constructor(
                         "error" to "No error"
                     )
                 }
+
                 is Resource.Error -> {
                     Timber.i("Login with symbol result: An exception occurred")
                     analytics.logEvent(
@@ -146,12 +150,13 @@ class LoginSymbolPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail(loginData.baseUrl, lastError?.message.ifNullOrBlank {
-            registerUser?.symbols?.flatMap { symbol ->
-                symbol.schools.map { it.error?.message } + symbol.error?.message
-            }?.filterNotNull()?.distinct()?.joinToString(";") {
-                it.take(46) + "..."
-            } ?: "blank"
-        })
+        view?.openSupportDialog(
+            LoginSupportInfo(
+                loginData = loginData,
+                registerUser = registerUser,
+                lastErrorMessage = lastError?.message,
+                enteredSymbol = view?.symbolValue,
+            )
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 3c10d574..ace12f78 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.login.symbol
 import io.github.wulkanowy.data.pojos.RegisterUser
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.login.LoginData
+import io.github.wulkanowy.ui.modules.login.support.LoginSupportInfo
 
 interface LoginSymbolView : BaseView {
 
@@ -42,5 +43,5 @@ interface LoginSymbolView : BaseView {
 
     fun openFaqPage()
 
-    fun openEmail(host: String, lastError: String)
+    fun openSupportDialog(supportInfo: LoginSupportInfo)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 091080a5..178d6e94 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -119,7 +119,6 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
     //https://developer.android.com/guide/playcore/in-app-updates#status_callback
     @Deprecated("Deprecated in Java")
-    @Suppress("DEPRECATION")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         updateHelper.onActivityResult(requestCode, resultCode)
diff --git a/app/src/main/res/layout/dialog_login_support.xml b/app/src/main/res/layout/dialog_login_support.xml
new file mode 100644
index 00000000..c04d7812
--- /dev/null
+++ b/app/src/main/res/layout/dialog_login_support.xml
@@ -0,0 +1,92 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:windowBackground"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/dialog_login_support_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:navigationIcon="?attr/homeAsUpIndicator"
+        app:navigationIconTint="?attr/colorOnSurfaceVariant"
+        app:title="@string/login_support_title" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:id="@+id/dialog_login_support_school_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="20dp"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/login_support_school_hint" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/dialog_login_support_school_layout"
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:placeholderText="@string/login_support_school_placeholder"
+                app:placeholderTextColor="?colorTertiary">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/dialog_login_support_school_input"
+                    style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="top" />
+
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/login_support_additional_hint" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="top"
+                app:placeholderText="@string/login_support_additional_placeholder"
+                app:placeholderTextColor="?colorTertiary">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/dialog_login_support_additional_input"
+                    style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="top"
+                    android:minLines="3" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/dialog_login_support_submit"
+                style="@style/Widget.Material3.Button.TextButton.Dialog"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="12dp"
+                android:insetLeft="0dp"
+                android:insetTop="0dp"
+                android:insetRight="0dp"
+                android:insetBottom="0dp"
+                android:text="@string/login_support_submit" />
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 30f85446..348602d7 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -26,7 +26,8 @@
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:paddingTop="6dp"
-            android:paddingBottom="6dp" />
+            android:paddingBottom="6dp"
+            tools:listitem="@layout/item_dashboard_grades" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <LinearLayout
@@ -79,4 +80,4 @@
                 android:text="@string/all_retry" />
         </LinearLayout>
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index df40fe70..08e3ebe6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,7 +76,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Send email</string>
     <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
-    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nIdentyfikator instalacji: %5$s\nOstatni błąd: %6$s\n\nNazwa szkoły i miejscowość: </string>
+    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nIdentyfikator instalacji: %5$s\nOstatni błąd: %6$s\n\nNazwa szkoły i miejscowość: %7$s\nDodatkowe informacje: %8$s</string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
     <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Recover your account</string>
@@ -86,6 +86,12 @@
     <string name="login_other_search_locations">Other search locations</string>
     <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_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>
 
 
     <!--Notifications-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 603e22ab..a0023dda 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -82,7 +82,6 @@
     </style>
 
     <style name="FullScreenDialogStyle" parent="WulkanowyTheme">
-        <item name="android:windowFullscreen">true</item>
         <item name="android:windowIsFloating">false</item>
     </style>
 </resources>

From 4d085f826652b7fd9a04fa1ddbf8cae3d3a97a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 26 Sep 2023 23:04:27 +0200
Subject: [PATCH 410/429] New Crowdin updates (#2311)

---
 app/src/main/res/values-cs/strings.xml     | 12 ++++++++++--
 app/src/main/res/values-da-rDK/strings.xml | 12 ++++++++++--
 app/src/main/res/values-de/strings.xml     | 12 ++++++++++--
 app/src/main/res/values-es-rES/strings.xml | 12 ++++++++++--
 app/src/main/res/values-it-rIT/strings.xml | 12 ++++++++++--
 app/src/main/res/values-pl/strings.xml     | 12 ++++++++++--
 app/src/main/res/values-ru/strings.xml     | 12 ++++++++++--
 app/src/main/res/values-sk/strings.xml     | 12 ++++++++++--
 app/src/main/res/values-uk/strings.xml     | 12 ++++++++++--
 9 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e9e04932..a365942a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -44,6 +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_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>
@@ -54,7 +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">Neplatný symbol</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_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>
@@ -69,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">Zapomněl jsem své heslo</string>
+    <string name="login_recover_button">Reset password</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>
@@ -77,6 +79,12 @@
     <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>
     <!--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>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 2abf1a4a..c8846684 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -44,6 +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_sign_in">Sign in</string>
     <string name="login_invalid_password">Password too short</string>
     <string name="login_incorrect_password_default">Login details are incorrect</string>
@@ -54,7 +55,8 @@
     <string name="login_invalid_email">Invalid email</string>
     <string name="login_invalid_login">Use the assigned login instead of email</string>
     <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol</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_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
     <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
@@ -69,7 +71,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Send email</string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Recover your account</string>
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>
@@ -77,6 +79,12 @@
     <string name="login_other_search_locations">Other search locations</string>
     <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_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>
     <!--Notifications-->
     <string name="notifications_header_title">Enable notifications</string>
     <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f08a504a..a909a6b8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -44,6 +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_sign_in">Anmelden</string>
     <string name="login_invalid_password">Passwort ist zu kurz</string>
     <string name="login_incorrect_password_default">Anmeldedaten sind falsch</string>
@@ -54,7 +55,8 @@
     <string name="login_invalid_email">Ungültige email</string>
     <string name="login_invalid_login">Den zugewiesenen Login anstelle von email verwenden</string>
     <string name="login_invalid_custom_email">Benutze den zugewiesenen Login oder E-Mail in @%1$s</string>
-    <string name="login_invalid_symbol">Ungültige symbol</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_incorrect_symbol">Schüler nicht gefunden. Überprüfen Sie das Symbol und die gewählte Variation des UONET+ Registers</string>
     <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
     <string name="login_symbol_helper">Das Symbol kann auf der Registerseite in&#160;<b>Student </b>→&#160;<b>Tost Möbeln</b> →&#160;<b>Registrieren Sie Ihr Mobilgerät</b>gefunden werden.\n\nStellen Sie sicher, dass Sie die entsprechende Registervariante im Feld <b>UONET+ Registervariante</b> auf dem vorherigen Bildschirm festgelegt haben</string>
@@ -69,7 +71,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">email senden</string>
     <string name="login_recover_warning">Stellen Sie sicher, dass Sie die richtige UONET+ Registervariation wählen!</string>
-    <string name="login_recover_button">Ich habe mein Passwort vergessen.</string>
+    <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Ihr Konto wiederherstellen</string>
     <string name="login_recover">Wiederherstellen</string>
     <string name="login_signed_in">Student ist bereits angemeldet</string>
@@ -77,6 +79,12 @@
     <string name="login_other_search_locations">Andere Suchorte</string>
     <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_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>
     <!--Notifications-->
     <string name="notifications_header_title">Benachrichtigungen aktivieren</string>
     <string name="notifications_header_description">Aktivieren Sie Benachrichtigungen, damit Sie keine Nachricht vom Lehrer oder eine neue Klasse verpassen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2abf1a4a..c8846684 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -44,6 +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_sign_in">Sign in</string>
     <string name="login_invalid_password">Password too short</string>
     <string name="login_incorrect_password_default">Login details are incorrect</string>
@@ -54,7 +55,8 @@
     <string name="login_invalid_email">Invalid email</string>
     <string name="login_invalid_login">Use the assigned login instead of email</string>
     <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol</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_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
     <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
@@ -69,7 +71,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Send email</string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Recover your account</string>
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>
@@ -77,6 +79,12 @@
     <string name="login_other_search_locations">Other search locations</string>
     <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_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>
     <!--Notifications-->
     <string name="notifications_header_title">Enable notifications</string>
     <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 2abf1a4a..c8846684 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -44,6 +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_sign_in">Sign in</string>
     <string name="login_invalid_password">Password too short</string>
     <string name="login_incorrect_password_default">Login details are incorrect</string>
@@ -54,7 +55,8 @@
     <string name="login_invalid_email">Invalid email</string>
     <string name="login_invalid_login">Use the assigned login instead of email</string>
     <string name="login_invalid_custom_email">Use the assigned login or email in @%1$s</string>
-    <string name="login_invalid_symbol">Invalid symbol</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_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
     <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nMake sure that you have set the appropriate register variant in the <b>UONET+ register variant</b> field on the first login screen</string>
@@ -69,7 +71,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Send email</string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
-    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Recover your account</string>
     <string name="login_recover">Recover</string>
     <string name="login_signed_in">Student is already signed in</string>
@@ -77,6 +79,12 @@
     <string name="login_other_search_locations">Other search locations</string>
     <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_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>
     <!--Notifications-->
     <string name="notifications_header_title">Enable notifications</string>
     <string name="notifications_header_description">Enable notifications so you don\'t miss message from teacher or new grade</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a2b5510e..4ed2facc 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -44,6 +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">Np. \"lodz\" czy \"powiatjaroslawski\"</string>
     <string name="login_sign_in">Zaloguj</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
     <string name="login_incorrect_password_default">Dane logowania są niepoprawne</string>
@@ -54,7 +55,8 @@
     <string name="login_invalid_email">Nieprawidłowy adres e-mail</string>
     <string name="login_invalid_login">Użyj loginu zamiast adresu e-mail</string>
     <string name="login_invalid_custom_email">Użyj loginu lub adresu e-mail w @%1$s</string>
-    <string name="login_invalid_symbol">Nieprawidłowy symbol</string>
+    <string name="login_invalid_symbol">Nieprawidłowy symbol. Jeśli nie możesz go znaleźć, skontaktuj się ze szkołą</string>
+    <string name="login_invalid_symbol_definitely">Nie zmyślaj! Jeśli nie możesz znaleźć symbolu, skontaktuj się ze szkołą</string>
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź poprawność symbolu i wybranej odmiany dziennika UONET+</string>
     <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</string>
     <string name="login_symbol_helper">Symbol można znaleźć na stronie dziennika w&#160;<b>Uczeń</b>→&#160;<b>Dostęp Mobilny</b> →&#160;<b>Wygeneruj kod dostępu</b>.\n\nUpewnij się, że ustawiłeś odpowiednią odmianę dziennika w polu  <b>Odmiana dziennika UONET+</b> na pierwszym ekranie logowania</string>
@@ -69,7 +71,7 @@
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Wyślij wiadomość e-mail</string>
     <string name="login_recover_warning">Upewnij się, że została wybrana odpowiednia odmiana dziennika UONET+!</string>
-    <string name="login_recover_button">Nie pamiętam hasła</string>
+    <string name="login_recover_button">Zresetuj hasło</string>
     <string name="login_recover_title">Przywróć swoje konto</string>
     <string name="login_recover">Przywróć</string>
     <string name="login_signed_in">Uczeń jest już zalogowany</string>
@@ -77,6 +79,12 @@
     <string name="login_other_search_locations">Inne lokalizacje wyszukiwania</string>
     <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_placeholder">Np. ZSTiO Jarosław lub SP nr 99 w Łodzi</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łę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
+    <string name="login_support_submit">Wyślij</string>
     <!--Notifications-->
     <string name="notifications_header_title">Włącz powiadomienia</string>
     <string name="notifications_header_description">Włącz powiadomienia, aby nie przegapić wiadomości od nauczyciela lub nowej oceny</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d075dac6..841fa9f9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -44,6 +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_sign_in">Войти</string>
     <string name="login_invalid_password">Пароль слишком короткий</string>
     <string name="login_incorrect_password_default">Данные для входа указаны неверно</string>
@@ -54,7 +55,8 @@
     <string name="login_invalid_email">Неверный e-mail</string>
     <string name="login_invalid_login">Используйте назначенный логин вместо e-mail</string>
     <string name="login_invalid_custom_email">Используйте назначенный логин или email в @%1$s</string>
-    <string name="login_invalid_symbol">Неверный symbol</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_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>
@@ -69,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">Забыли пароль?</string>
+    <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Восстановите свой аккаунт</string>
     <string name="login_recover">Восстановить</string>
     <string name="login_signed_in">Ученик уже авторизован</string>
@@ -77,6 +79,12 @@
     <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>
     <!--Notifications-->
     <string name="notifications_header_title">Включить уведомления</string>
     <string name="notifications_header_description">Включить уведомления, чтобы вы не пропустили сообщение от учителя или новую оценку</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d059927e..018806b6 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -44,6 +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_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>
@@ -54,7 +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">Neplatný symbol</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_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>
@@ -69,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">Zabudol som heslo</string>
+    <string name="login_recover_button">Reset password</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>
@@ -77,6 +79,12 @@
     <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>
     <!--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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b46b9afe..a05634cf 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -44,6 +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_sign_in">Увійти</string>
     <string name="login_invalid_password">Занадто короткий пароль</string>
     <string name="login_incorrect_password_default">Вказані невірні дані</string>
@@ -54,7 +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">Неправильний symbol</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_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>
@@ -69,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">Забули пароль?</string>
+    <string name="login_recover_button">Reset password</string>
     <string name="login_recover_title">Відновіть свій обліковий запис</string>
     <string name="login_recover">Відновити</string>
     <string name="login_signed_in">Учня вже авторизовано</string>
@@ -77,6 +79,12 @@
     <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>
     <!--Notifications-->
     <string name="notifications_header_title">Увімкнути сповіщення</string>
     <string name="notifications_header_description">Увімкнути сповіщення, щоб не пропустити лист від вчителя або нову оцінку</string>

From 4a2bf539f0f4bc0f0a21e3e733b227e787e130ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 26 Sep 2023 23:13:32 +0200
Subject: [PATCH 411/429] Version 2.2.0

---
 app/build.gradle                                  | 11 +++++------
 app/src/main/play/release-notes/pl-PL/default.txt |  7 ++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d85d0a3d..ec3ee4f3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,12 +27,11 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 131
-        versionName "2.1.0"
+        versionCode 132
+        versionName "2.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
-
         manifestPlaceholders = [
             firebase_enabled: project.hasProperty("enableFirebase"),
             admob_project_id: ""
@@ -162,8 +161,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
-    userFraction = 0.25d
-    updatePriority = 3
+    userFraction = 0.01d
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -193,7 +192,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.1.0'
+    implementation 'io.github.wulkanowy:sdk:2.2.0'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index aa934ce9..89825621 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,8 +1,5 @@
-Wersja 2.1.0
+Wersja 2.2.0
 
-— dodaliśmy tryb incognito w wiadomościach
-— dodaliśmy wyświetlanie pustych lekcji (okienek) w planie lekcji
-— poprawiliśmy widżet planu lekcji (będzie teraz trochę bardziej kompaktowy)
-— zmieniliśmy datę rozpoczęcia roku szkolnego na 3 dni przed 1 września (sorry)
+Dokonaliśmy drobnych usprawnień w obszarze logowania, które powinny pomóc Wam i nam
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

From d1d665bbdffb27be240a3e1383095485a0623891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 2 Oct 2023 12:20:34 +0200
Subject: [PATCH 412/429] Fix student auto selection if there is already active
 some students logged (#2314)

---
 .github/workflows/deploy-store.yml                     |  4 ++--
 .github/workflows/deploy-test.yml                      |  4 ++--
 .github/workflows/test.yml                             |  6 +++---
 .../login/studentselect/LoginStudentSelectPresenter.kt | 10 ++++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml
index e8a220dd..e8237a38 100644
--- 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
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
index f2e9f016..c4f55e6a 100644
--- 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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bc4b3647..6d50c45d 100644
--- 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
diff --git 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
index cc9e422e..6cbdfbb8 100644
--- 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 {

From c04b3e40d256ad04bde58d35f212b6173a7fe3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 2 Oct 2023 12:21:04 +0200
Subject: [PATCH 413/429] Add negative e-mail validation in school input on
 support dialog (#2315)

---
 .../login/support/LoginSupportDialog.kt       | 38 +++++++++++++------
 app/src/main/res/values/strings.xml           |  3 +-
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git 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
index d2b1d2ce..fcf7f51c 100644
--- 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),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08e3ebe6..0ba9c997 100644
--- 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>

From 2cdd322ed4b5616b224b8cc9a46e4f53fcdfab1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 2 Oct 2023 12:22:02 +0200
Subject: [PATCH 414/429] Add missing class_id colum in JOIN clause of students
 with semesters (#2317)

---
 .../wulkanowy/data/db/dao/StudentDao.kt       |  9 +++----
 .../data/db/entities/StudentWithSemesters.kt  |  5 ----
 .../data/repositories/StudentRepository.kt    | 24 ++++++++++++-------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git 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
index a2f0abac..d7847c24 100644
--- 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)
diff --git 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
index 9362a954..f9869d4e 100644
--- 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
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
index 42d1eb84..2e04224a 100644
--- 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)

From 693ce8217d1ed871659de3009de1615ab47978af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 3 Oct 2023 00:48:37 +0200
Subject: [PATCH 415/429] New Crowdin updates (#2313)

---
 app/src/main/res/values-cs/strings.xml        | 21 ++++++++++---------
 app/src/main/res/values-da-rDK/strings.xml    |  3 ++-
 app/src/main/res/values-de/strings.xml        |  3 ++-
 app/src/main/res/values-es-rES/strings.xml    |  3 ++-
 app/src/main/res/values-it-rIT/strings.xml    |  3 ++-
 .../main/res/values-pl/preferences_values.xml |  2 +-
 app/src/main/res/values-pl/strings.xml        |  3 ++-
 app/src/main/res/values-ru/strings.xml        |  3 ++-
 app/src/main/res/values-sk/strings.xml        | 21 ++++++++++---------
 app/src/main/res/values-uk/strings.xml        | 21 ++++++++++---------
 10 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a365942a..1749548e 100644
--- 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>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index c8846684..500fba1f 100644
--- 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>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a909a6b8..d8cc9298 100644
--- 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>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index c8846684..500fba1f 100644
--- 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>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index c8846684..500fba1f 100644
--- 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>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 8872b7ab..2f2432e9 100644
--- 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>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4ed2facc..9375aeb3 100644
--- 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łę i…\" albo \"Jestem rodzicem i nie widzę drugiego dziecka…\"</string>
     <string name="login_support_submit">Wyślij</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 841fa9f9..a6e45d44 100644
--- 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>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 018806b6..ed06e023 100644
--- 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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a05634cf..6a79263f 100644
--- 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>

From 3212efe21ed7e9cf3718cef23f606fdce9894a63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:49:05 +0000
Subject: [PATCH 416/429] Bump com.android.tools.build:gradle from 8.1.1 to
 8.1.2 (#2320)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 651e9ca1..9293d123 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ 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'

From c8332a064208f646f341f11dd3a5d139ff11b6f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:49:26 +0000
Subject: [PATCH 417/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2321)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9293d123..33eefd88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         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"
     }

From fc5ad16cb761dce29810c753af4edd3ed01bc799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 3 Oct 2023 01:14:10 +0200
Subject: [PATCH 418/429] Version 2.2.1

---
 app/build.gradle                                  | 8 ++++----
 app/src/main/play/release-notes/pl-PL/default.txt | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ec3ee4f3..08070c5d 100644
--- 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'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 89825621..dc78c1e3 100644
--- 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

From 2f5577cc541c458596c5c90aac451ab0f337a2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 6 Oct 2023 10:07:55 +0200
Subject: [PATCH 419/429] Update SDK to 34 (#2322)

---
 app/build.gradle                              |   8 +++----
 app/jacoco.gradle                             |  22 +++++++++---------
 .../settings/advanced/AdvancedFragment.kt     |   2 +-
 .../settings/advanced/AdvancedPresenter.kt    |   3 ++-
 .../settings/appearance/AppearanceFragment.kt |   2 +-
 .../appearance/AppearancePresenter.kt         |   3 ++-
 .../notifications/NotificationsFragment.kt    |   2 +-
 .../notifications/NotificationsPresenter.kt   |   3 ++-
 .../ui/modules/settings/sync/SyncFragment.kt  |   2 +-
 .../ui/modules/settings/sync/SyncPresenter.kt |   6 ++++-
 build.gradle                                  |   4 ++--
 gradle/wrapper/gradle-wrapper.jar             | Bin 62076 -> 63375 bytes
 gradle/wrapper/gradle-wrapper.properties      |   3 ++-
 gradlew                                       |   5 +++-
 settings.gradle                               |   3 ---
 15 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 08070c5d..b3ebb5cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,13 +20,13 @@ apply from: 'hooks.gradle'
 
 android {
     namespace 'io.github.wulkanowy'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 133
         versionName "2.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -199,9 +199,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.10.1"
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.7.2"
+    implementation "androidx.activity:activity-ktx:1.8.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.6.1"
     implementation "androidx.annotation:annotation:1.7.0"
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index f253673e..434b9218 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -1,16 +1,16 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.7"
+    toolVersion "0.8.10"
     reportsDirectory.set(file("$buildDir/reports"))
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
 
-task jacocoTestReport(type: JacocoReport) {
+tasks.register('jacocoTestReport', JacocoReport) {
 
     group = "Reporting"
     description = "Generate Jacoco coverage reports"
@@ -33,19 +33,19 @@ task jacocoTestReport(type: JacocoReport) {
                     '**/*_Factory.*']
 
     classDirectories.setFrom(fileTree(
-            dir: "$buildDir/intermediates/classes/debug",
-            excludes: excludes
+        dir: "$buildDir/intermediates/classes/debug",
+        excludes: excludes
     ) + fileTree(
-            dir: "$buildDir/tmp/kotlin-classes/fdroidDebug",
-            excludes: excludes
+        dir: "$buildDir/tmp/kotlin-classes/fdroidDebug",
+        excludes: excludes
     ))
 
     sourceDirectories.setFrom(files([
-            "src/main/java",
-            "src/fdroid/java"
+        "src/main/java",
+        "src/fdroid/java"
     ]))
     executionData.setFrom(fileTree(
-            dir: project.projectDir,
-            includes: ["**/*.exec", "**/*.ec"]
+        dir: project.projectDir,
+        includes: ["**/*.exec", "**/*.ec"]
     ))
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
index 41e9e8b1..1b8d1a8f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt
@@ -35,7 +35,7 @@ class AdvancedFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_advanced, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt
index d38f841f..4bc24594 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt
@@ -18,7 +18,8 @@ class AdvancedPresenter @Inject constructor(
         Timber.i("Settings advanced view was initialized")
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
         analytics.logEvent("setting_changed", "name" to key)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
index 493ab5d7..70dd694c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt
@@ -39,7 +39,7 @@ class AppearanceFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_appearance, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt
index 14592a6c..d3410ea8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt
@@ -22,7 +22,8 @@ class AppearancePresenter @Inject constructor(
         Timber.i("Settings appearance view was initialized")
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
 
         preferencesRepository.apply {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
index 35c1faa4..af4c4e6a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt
@@ -114,7 +114,7 @@ class NotificationsFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_notifications, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
index 232b0348..b2938cf6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt
@@ -38,7 +38,8 @@ class NotificationsPresenter @Inject constructor(
         Timber.i("Settings notifications view was initialized")
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
 
         preferencesRepository.apply {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
index df2e1348..f48abe9b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt
@@ -52,7 +52,7 @@ class SyncFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_sync, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
index 1ecb4a6e..594e097a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt
@@ -31,7 +31,8 @@ class SyncPresenter @Inject constructor(
         setSyncDateInView()
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
 
         preferencesRepository.apply {
@@ -52,10 +53,12 @@ class SyncPresenter @Inject constructor(
                         Timber.i("Setting sync now started")
                         analytics.logEvent("sync_now", "status" to "started")
                     }
+
                     WorkInfo.State.SUCCEEDED -> {
                         showMessage(syncSuccessString)
                         analytics.logEvent("sync_now", "status" to "success")
                     }
+
                     WorkInfo.State.FAILED -> {
                         showError(
                             syncFailedString,
@@ -66,6 +69,7 @@ class SyncPresenter @Inject constructor(
                         )
                         analytics.logEvent("sync_now", "status" to "failed")
                     }
+
                     else -> Timber.d("Sync now state: ${workInfo?.state}")
                 }
                 if (workInfo?.state?.isFinished == true) {
diff --git a/build.gradle b/build.gradle
index 33eefd88..baa1f9b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
         kotlin_version = '1.9.10'
-        about_libraries = '10.9.0'
-        hilt_version = "2.48"
+        about_libraries = '10.9.1'
+        hilt_version = '2.48.1'
     }
     repositories {
         mavenCentral()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29d3e0ab67b14947c167a862655af9b..033e24c4cdf41af1ab109bc7f253b2b887023340 100644
GIT binary patch
delta 16170
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
L!VC;|AA@)RSkL|f

delta 14892
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9b0a13f0..8838ba97 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb..fcb6fca1 100755
--- a/gradlew
+++ b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/settings.gradle b/settings.gradle
index 16731297..e7b4def4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1 @@
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
-}
 include ':app'

From 9098e74065ebe4821694370e5c0fc8c404d52089 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Oct 2023 19:17:56 +0000
Subject: [PATCH 420/429] Bump com.google.android.material:material from 1.9.0
 to 1.10.0 (#2325)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b3ebb5cb..a591d2b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -212,7 +212,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-    implementation "com.google.android.material:material:1.9.0"
+    implementation "com.google.android.material:material:1.10.0"
     implementation "com.github.wulkanowy:material-chips-input:2.3.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation 'com.github.lopspower:CircularImageView:4.3.0'

From 516922d5aa53717d5a964161497a55e09524fa9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Oct 2023 19:18:28 +0000
Subject: [PATCH 421/429] Bump
 org.sonarsource.scanner.gradle:sonarqube-gradle-plugin (#2324)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index baa1f9b6..3fafd2d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         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.4.0.3356"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }

From 5dffbdadfa030f74f62c24b3157ca9c6b65f5ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 23 Oct 2023 13:04:42 +0200
Subject: [PATCH 422/429] Points statistics improvements (#2328)

---
 .../grade/statistics/GradeStatisticsAdapter.kt  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
index 3fce8d57..e5f1eba0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
@@ -22,6 +22,8 @@ import io.github.wulkanowy.databinding.ItemGradeStatisticsHeaderBinding
 import io.github.wulkanowy.databinding.ItemGradeStatisticsPieBinding
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
+import kotlin.math.max
+import kotlin.math.roundToInt
 
 class GradeStatisticsAdapter @Inject constructor() :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -269,7 +271,7 @@ class GradeStatisticsAdapter @Inject constructor() :
             valueTextSize = 12f
             valueTextColor = binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
             valueFormatter = object : ValueFormatter() {
-                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
+                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}"
             }
             colors = gradePointsColors
         }
@@ -304,15 +306,20 @@ class GradeStatisticsAdapter @Inject constructor() :
             }
             xAxis.setDrawLabels(false)
             xAxis.setDrawGridLines(false)
+
+            val yMaxFromValues = (max(points.others, points.student)).roundToInt() + 30f
+            val yMaxFromValuesWithMargin = ((yMaxFromValues / 10.0).roundToInt() * 10).toFloat()
+            val yMax = yMaxFromValuesWithMargin.coerceAtLeast(100f)
+            val yLabelCount = (yMax / 10).toInt() + 1
             with(axisLeft) {
                 axisMinimum = 0f
-                axisMaximum = 100f
-                labelCount = 11
+                axisMaximum = yMax
+                labelCount = yLabelCount
             }
             with(axisRight) {
                 axisMinimum = 0f
-                axisMaximum = 100f
-                labelCount = 11
+                axisMaximum = yMax
+                labelCount = yLabelCount
             }
             invalidate()
         }

From 9d62410530b6dbc707634790f49857412d36db8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 23 Oct 2023 13:05:05 +0200
Subject: [PATCH 423/429] Sort teachers by name in school and teachers tab
 (#2327)

---
 .../ui/modules/schoolandteachers/teacher/TeacherPresenter.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
index e2af05c9..fef06328 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
@@ -58,7 +58,10 @@ class TeacherPresenter @Inject constructor(
             .logResourceStatus("load teachers data")
             .onResourceData {
                 view?.run {
-                    updateData(it.filter { item -> item.name.isNotBlank() })
+                    updateData(it
+                        .filter { item -> item.name.isNotBlank() }
+                        .sortedBy { it.name }
+                    )
                     showContent(it.isNotEmpty())
                     showEmpty(it.isEmpty())
                     showErrorView(false)

From 83527d91f3283ad64566189ee86785775f4430a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 23 Oct 2023 13:05:46 +0200
Subject: [PATCH 424/429] Allow direct access to weekend from day navigation
 when there is any lesson during weekend (#2326)

---
 .../modules/attendance/AttendanceFragment.kt  |   8 +-
 .../modules/attendance/AttendancePresenter.kt |  97 +++++++++++-----
 .../ui/modules/attendance/AttendanceView.kt   |   2 +
 .../modules/dashboard/DashboardPresenter.kt   |   2 +-
 .../ui/modules/timetable/TimetableFragment.kt |   9 +-
 .../modules/timetable/TimetablePresenter.kt   | 107 +++++++++++++-----
 .../ui/modules/timetable/TimetableView.kt     |   2 +
 .../main/res/layout/fragment_attendance.xml   |   4 +-
 .../main/res/layout/fragment_timetable.xml    |   4 +-
 9 files changed, 172 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index a73c2606..6e842b4d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -148,6 +148,10 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         binding.attendanceNavDate.text = date
     }
 
+    override fun showNavigation(show: Boolean) {
+        binding.attendanceNavContainer.isVisible = show
+    }
+
     override fun clearData() {
         with(attendanceAdapter) {
             items = emptyList()
@@ -281,7 +285,9 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        presenter.currentDate?.let {
+            outState.putLong(SAVED_DATE_KEY, it.toEpochDay())
+        }
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 26bfaf19..f66479da 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -3,10 +3,14 @@ package io.github.wulkanowy.ui.modules.attendance
 import android.annotation.SuppressLint
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.repositories.AttendanceRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.data.repositories.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.*
@@ -14,6 +18,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import java.time.DayOfWeek
 import java.time.LocalDate
 import java.time.LocalDate.now
 import java.time.LocalDate.ofEpochDay
@@ -28,9 +33,10 @@ class AttendancePresenter @Inject constructor(
     private val analytics: AnalyticsHelper
 ) : BasePresenter<AttendanceView>(errorHandler, studentRepository) {
 
-    private var baseDate: LocalDate = now().previousOrSameSchoolDay
+    private var initialDate: LocalDate? = null
+    private var isWeekendHasLessons: Boolean = false
 
-    lateinit var currentDate: LocalDate
+    var currentDate: LocalDate? = null
         private set
 
     private lateinit var lastError: Throwable
@@ -44,27 +50,34 @@ class AttendancePresenter @Inject constructor(
         view.initView()
         Timber.i("Attendance view was initialized")
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
+        currentDate = date?.let(::ofEpochDay)
         loadData()
-        if (currentDate.isHolidays) setBaseDateOnHolidays()
     }
 
     fun onPreviousDay() {
+        val date = if (isWeekendHasLessons) {
+            currentDate?.minusDays(1)
+        } else currentDate?.previousSchoolDay
+
         view?.finishActionMode()
         attendanceToExcuseList.clear()
-        reloadView(currentDate.previousSchoolDay)
+        reloadView(date ?: return)
         loadData()
     }
 
     fun onNextDay() {
+        val date = if (isWeekendHasLessons) {
+            currentDate?.plusDays(1)
+        } else currentDate?.nextSchoolDay
+
         view?.finishActionMode()
         attendanceToExcuseList.clear()
-        reloadView(currentDate.nextSchoolDay)
+        reloadView(date ?: return)
         loadData()
     }
 
     fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
+        view?.showDatePickerDialog(currentDate ?: return)
     }
 
     fun onDateSet(year: Int, month: Int, day: Int) {
@@ -93,10 +106,8 @@ class AttendancePresenter @Inject constructor(
         Timber.i("Attendance view is reselected")
         view?.let { view ->
             if (view.currentStackSize == 1) {
-                baseDate = now().previousOrSameSchoolDay
-
-                if (currentDate != baseDate) {
-                    reloadView(baseDate)
+                if (currentDate != initialDate) {
+                    reloadView(initialDate ?: return)
                     loadData()
                 } else if (!view.isViewEmpty) {
                     view.resetView()
@@ -188,19 +199,6 @@ class AttendancePresenter @Inject constructor(
         return true
     }
 
-    private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
-    }
-
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
 
@@ -211,11 +209,13 @@ class AttendancePresenter @Inject constructor(
             isParent = student.isParent
 
             val semester = semesterRepository.getCurrentSemester(student)
+
+            checkInitialAndCurrentDate(student, semester)
             attendanceRepository.getAttendance(
                 student = student,
                 semester = semester,
-                start = currentDate,
-                end = currentDate,
+                start = currentDate ?: now(),
+                end = currentDate ?: now(),
                 forceRefresh = forceRefresh
             )
         }
@@ -231,6 +231,8 @@ class AttendancePresenter @Inject constructor(
                 }.sortedBy { item -> item.number }
             }
             .onResourceData {
+                isWeekendHasLessons = isWeekendHasLessons || isWeekendHasLessons(it)
+
                 view?.run {
                     enableSwipe(true)
                     showProgress(false)
@@ -238,6 +240,7 @@ class AttendancePresenter @Inject constructor(
                     showEmpty(it.isEmpty())
                     showContent(it.isNotEmpty())
                     updateData(it)
+                    reloadNavigation()
                 }
             }
             .onResourceIntermediate { view?.showRefresh(true) }
@@ -263,6 +266,43 @@ class AttendancePresenter @Inject constructor(
             .launch()
     }
 
+    private suspend fun checkInitialAndCurrentDate(student: Student, semester: Semester) {
+        if (initialDate == null) {
+            val lessons = attendanceRepository.getAttendance(
+                student = student,
+                semester = semester,
+                start = now().monday,
+                end = now().sunday,
+                forceRefresh = false,
+            ).toFirstResult().dataOrNull.orEmpty()
+            isWeekendHasLessons = isWeekendHasLessons(lessons)
+            initialDate = getInitialDate(semester)
+        }
+
+        if (currentDate == null) {
+            currentDate = initialDate
+        }
+    }
+
+    private fun isWeekendHasLessons(
+        lessons: List<Attendance>,
+    ): Boolean = lessons.any {
+        it.date.dayOfWeek in listOf(
+            DayOfWeek.SATURDAY,
+            DayOfWeek.SUNDAY,
+        )
+    }
+
+    private fun getInitialDate(semester: Semester): LocalDate {
+        val now = now()
+
+        return when {
+            now.isHolidays -> now.getLastSchoolDayIfHoliday(semester.schoolYear)
+            isWeekendHasLessons -> now
+            else -> now.previousOrSameSchoolDay
+        }
+    }
+
     private fun excuseAbsence(reason: String?, toExcuseList: List<Attendance>) {
         resourceFlow {
             val student = studentRepository.getCurrentStudent()
@@ -311,7 +351,7 @@ class AttendancePresenter @Inject constructor(
     private fun reloadView(date: LocalDate) {
         currentDate = date
 
-        Timber.i("Reload attendance view with the date ${currentDate.toFormattedString()}")
+        Timber.i("Reload attendance view with the date ${currentDate?.toFormattedString()}")
         view?.apply {
             showProgress(true)
             enableSwipe(false)
@@ -326,10 +366,13 @@ class AttendancePresenter @Inject constructor(
 
     @SuppressLint("DefaultLocale")
     private fun reloadNavigation() {
+        val currentDate = currentDate ?: return
+
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalise())
+            showNavigation(true)
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index b0123065..2629c217 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -40,6 +40,8 @@ interface AttendanceView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun showNavigation(show: Boolean)
+
     fun showPreButton(show: Boolean)
 
     fun showNextButton(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
index ecf084c6..ae451ae1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -386,7 +386,7 @@ class DashboardPresenter @Inject constructor(
     private fun loadLessons(student: Student, forceRefresh: Boolean) {
         flatResourceFlow {
             val semester = semesterRepository.getCurrentSemester(student)
-            val date = LocalDate.now().nextOrSameSchoolDay
+            val date = LocalDate.now()
 
             timetableRepository.getTimetable(
                 student = student,
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index ebc16239..0e645911 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -9,6 +9,7 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
@@ -160,6 +161,10 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         binding.timetableRecycler.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun showNavigation(show: Boolean) {
+        binding.timetableNavContainer.isVisible = true
+    }
+
     override fun showPreButton(show: Boolean) {
         binding.timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
@@ -193,7 +198,9 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
+        presenter.currentDate?.toEpochDay()?.let {
+            outState.putLong(SAVED_DATE_KEY, it)
+        }
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index 0f8395de..f9997048 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,5 +1,8 @@
 package io.github.wulkanowy.ui.modules.timetable
 
+import io.github.wulkanowy.data.dataOrNull
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.enums.TimetableGapsMode.BETWEEN_AND_BEFORE_LESSONS
 import io.github.wulkanowy.data.enums.TimetableGapsMode.NO_GAPS
@@ -15,6 +18,8 @@ import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.data.toFirstResult
+import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
@@ -24,15 +29,16 @@ import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.isJustFinished
 import io.github.wulkanowy.utils.isShowTimeUntil
 import io.github.wulkanowy.utils.left
+import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.until
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.firstOrNull
 import timber.log.Timber
+import java.time.DayOfWeek
 import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalDate.now
@@ -51,9 +57,10 @@ class TimetablePresenter @Inject constructor(
     private val analytics: AnalyticsHelper,
 ) : BasePresenter<TimetableView>(errorHandler, studentRepository) {
 
-    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+    private var initialDate: LocalDate? = null
+    private var isWeekendHasLessons: Boolean = false
 
-    lateinit var currentDate: LocalDate
+    var currentDate: LocalDate? = null
         private set
 
     private lateinit var lastError: Throwable
@@ -65,23 +72,30 @@ class TimetablePresenter @Inject constructor(
         view.initView()
         Timber.i("Timetable was initialized")
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        reloadView(ofEpochDay(date ?: baseDate.toEpochDay()))
+        currentDate = date?.let(::ofEpochDay)
         loadData()
-        if (currentDate.isHolidays) setBaseDateOnHolidays()
     }
 
     fun onPreviousDay() {
-        reloadView(currentDate.previousSchoolDay)
+        val date = if (isWeekendHasLessons) {
+            currentDate?.minusDays(1)
+        } else currentDate?.previousSchoolDay
+
+        reloadView(date ?: return)
         loadData()
     }
 
     fun onNextDay() {
-        reloadView(currentDate.nextSchoolDay)
+        val date = if (isWeekendHasLessons) {
+            currentDate?.plusDays(1)
+        } else currentDate?.nextSchoolDay
+
+        reloadView(date ?: return)
         loadData()
     }
 
     fun onPickDate() {
-        view?.showDatePickerDialog(currentDate)
+        view?.showDatePickerDialog(currentDate ?: return)
     }
 
     fun onDateSet(year: Int, month: Int, day: Int) {
@@ -110,10 +124,8 @@ class TimetablePresenter @Inject constructor(
         Timber.i("Timetable view is reselected")
         view?.let { view ->
             if (view.currentStackSize == 1) {
-                baseDate = now().nextOrSameSchoolDay
-
-                if (currentDate != baseDate) {
-                    reloadView(baseDate)
+                if (currentDate != initialDate) {
+                    reloadView(initialDate ?: return)
                     loadData()
                 } else if (!view.isViewEmpty) {
                     view.resetView()
@@ -134,34 +146,25 @@ class TimetablePresenter @Inject constructor(
         return true
     }
 
-    private fun setBaseDateOnHolidays() {
-        flow {
-            val student = studentRepository.getCurrentStudent()
-            emit(semesterRepository.getCurrentSemester(student))
-        }.catch {
-            Timber.i("Loading semester result: An exception occurred")
-        }.onEach {
-            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-            currentDate = baseDate
-            reloadNavigation()
-        }.launch("holidays")
-    }
-
     private fun loadData(forceRefresh: Boolean = false) {
         flatResourceFlow {
             val student = studentRepository.getCurrentStudent()
             val semester = semesterRepository.getCurrentSemester(student)
+
+            checkInitialAndCurrentDate(student, semester)
             timetableRepository.getTimetable(
                 student = student,
                 semester = semester,
-                start = currentDate,
-                end = currentDate,
+                start = currentDate ?: now(),
+                end = currentDate ?: now(),
                 forceRefresh = forceRefresh,
                 timetableType = TimetableRepository.TimetableType.NORMAL
             )
         }
             .logResourceStatus("load timetable data")
             .onResourceData {
+                isWeekendHasLessons = isWeekendHasLessons || isWeekendHasLessons(it.lessons)
+
                 view?.run {
                     enableSwipe(true)
                     showProgress(false)
@@ -169,7 +172,8 @@ class TimetablePresenter @Inject constructor(
                     showContent(it.lessons.isNotEmpty())
                     showEmpty(it.lessons.isEmpty())
                     updateData(it.lessons)
-                    setDayHeaderMessage(it.headers.singleOrNull { header -> header.date == currentDate }?.content)
+                    setDayHeaderMessage(it.headers.find { header -> header.date == currentDate }?.content)
+                    reloadNavigation()
                 }
             }
             .onResourceIntermediate { view?.showRefresh(true) }
@@ -191,6 +195,44 @@ class TimetablePresenter @Inject constructor(
             .launch()
     }
 
+    private suspend fun checkInitialAndCurrentDate(student: Student, semester: Semester) {
+        if (initialDate == null) {
+            val lessons = timetableRepository.getTimetable(
+                student = student,
+                semester = semester,
+                start = now().monday,
+                end = now().sunday,
+                forceRefresh = false,
+                timetableType = TimetableRepository.TimetableType.NORMAL
+            ).toFirstResult().dataOrNull?.lessons.orEmpty()
+            isWeekendHasLessons = isWeekendHasLessons(lessons)
+            initialDate = getInitialDate(semester)
+        }
+
+        if (currentDate == null) {
+            currentDate = initialDate
+        }
+    }
+
+    private fun isWeekendHasLessons(
+        lessons: List<Timetable>,
+    ): Boolean = lessons.any {
+        it.date.dayOfWeek in listOf(
+            DayOfWeek.SATURDAY,
+            DayOfWeek.SUNDAY,
+        )
+    }
+
+    private fun getInitialDate(semester: Semester): LocalDate {
+        val now = now()
+
+        return when {
+            now.isHolidays -> now.getLastSchoolDayIfHoliday(semester.schoolYear)
+            isWeekendHasLessons -> now
+            else -> now.nextOrSameSchoolDay
+        }
+    }
+
     private fun updateData(lessons: List<Timetable>) {
         tickTimer?.cancel()
 
@@ -285,7 +327,7 @@ class TimetablePresenter @Inject constructor(
     private fun reloadView(date: LocalDate) {
         currentDate = date
 
-        Timber.i("Reload timetable view with the date ${currentDate.toFormattedString()}")
+        Timber.i("Reload timetable view with the date ${currentDate?.toFormattedString()}")
         view?.apply {
             showProgress(true)
             enableSwipe(false)
@@ -298,10 +340,13 @@ class TimetablePresenter @Inject constructor(
     }
 
     private fun reloadNavigation() {
+        val currentDate = currentDate ?: return
+
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalise())
+            showNavigation(true)
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index 8cfb2620..40190d51 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -36,6 +36,8 @@ interface TimetableView : BaseView {
 
     fun showContent(show: Boolean)
 
+    fun showNavigation(show: Boolean)
+
     fun showPreButton(show: Boolean)
 
     fun showNextButton(show: Boolean)
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index 14331120..078daf61 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -128,7 +128,9 @@
         android:layout_gravity="bottom"
         android:gravity="center"
         android:orientation="horizontal"
-        tools:ignore="UnusedAttribute">
+        android:visibility="gone"
+        tools:ignore="UnusedAttribute"
+        tools:visibility="visible">
 
         <ImageButton
             android:id="@+id/attendancePreviousButton"
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index eaab0b3a..4b1a415b 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -128,7 +128,9 @@
         android:layout_gravity="bottom"
         android:gravity="center"
         android:orientation="horizontal"
-        tools:ignore="UnusedAttribute">
+        android:visibility="gone"
+        tools:ignore="UnusedAttribute"
+        tools:visibility="visible">
 
         <ImageButton
             android:id="@+id/timetablePreviousButton"

From 5d14ee7f4ee9db39315ef719698d89639dad0d25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:47:03 +0000
Subject: [PATCH 425/429] Bump androidx.recyclerview:recyclerview from 1.3.1 to
 1.3.2 (#2332)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a591d2b2..2d86ff37 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,7 +207,7 @@ dependencies {
     implementation "androidx.annotation:annotation:1.7.0"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
-    implementation "androidx.recyclerview:recyclerview:1.3.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"

From 0e1c20a9527bfa7d1c82d7d851c5d1753b1e8400 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:48:23 +0000
Subject: [PATCH 426/429] Bump room from 2.5.2 to 2.6.0 (#2329)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2d86ff37..97b52622 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -185,7 +185,7 @@ huaweiPublish {
 ext {
     work_manager = "2.8.1"
     android_hilt = "1.0.0"
-    room = "2.5.2"
+    room = "2.6.0"
     chucker = "3.5.2"
     mockk = "1.13.8"
     coroutines = "1.7.3"

From 3d76d41b55278ba21e6d7297b75695ad223f09f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:49:58 +0000
Subject: [PATCH 427/429] Bump com.squareup.okhttp3:logging-interceptor from
 4.11.0 to 4.12.0 (#2330)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 97b52622..47ef3cde 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -236,7 +236,7 @@ dependencies {
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.11.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
 
     implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"

From a4a191700e5b449efa177125db3caad07421ad8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:28:38 +0000
Subject: [PATCH 428/429] Bump com.google.firebase:firebase-bom from 32.3.1 to
 32.4.0 (#2331)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 47ef3cde..066b3736 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -248,7 +248,7 @@ dependencies {
     implementation 'com.fredporciuncula:flow-preferences:1.9.1'
     implementation 'org.apache.commons:commons-text:1.10.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:32.3.1')
+    playImplementation platform('com.google.firebase:firebase-bom:32.4.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'

From fcea2218b53e06f19a31c5a2f777edb676fa529c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 23 Oct 2023 19:56:46 +0200
Subject: [PATCH 429/429] Version 2.2.2

---
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 066b3736..42a1f8f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,8 +27,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 133
-        versionName "2.2.1"
+        versionCode 134
+        versionName "2.2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -192,7 +192,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.2.1'
+    implementation 'io.github.wulkanowy:sdk:2.2.2'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index dc78c1e3..2d8d4ce7 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,6 +1,7 @@
-Wersja 2.2.1
+Wersja 2.2.2
 
-– 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
+— dodaliśmy możliwość łatwego wejścia w sobotę i niedziele w planie lekcji przy użyciu strzałek
+— poprawiliśmy wsparcie dla statystyk ocen z systemem punktowym
+— poprawiliśmy sortowanie nauczycieli w widoku Szkoła i nauczyciele
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases