diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 61%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 27d57f599..237721cb0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Utwórz raport błędu, aby pomóc nam ulepszyć Wulkanowego
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 ## Co powinno się dziać
 
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..6194a41e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Zaproponuj nowy pomysł dla Wulkanowego
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+** Czy Twoja prośba o funkcję jest związana z problemem? Proszę opisz.**
+Jasny i zwięzły opis problemu. Np. Zawsze jestem sfrustrowany, gdy [...]
+
+** Opisz żądane rozwiązanie **
+Jasny i zwięzły opis tego, co chcesz, aby się wydarzyło.
+
+** Opisz alternatywy, które rozważałeś **
+Jasny i zwięzły opis wszelkich rozważanych alternatywnych rozwiązań lub funkcji.
+
+** Dodatkowy kontekst **
+Dodaj inny kontekst lub zrzuty ekranu dotyczące żądania funkcji tutaj.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..5cb45fc88
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: gradle
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+  target-branch: develop
+  ignore:
+    - dependency-name: io.github.wulkanowy:sdk
+  reviewers:
+  - Faierbel
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d359360ae..ee16041f6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,8 +27,8 @@ jobs:
             key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}
         - name: Unit tests
           run: |
-            ./gradlew --build-cache -Pcoverage testFdroidDebugUnitTest --stacktrace
-            ./gradlew --build-cache -Pcoverage jacocoTestReport --stacktrace
+            ./gradlew testFdroidDebugUnitTest --stacktrace
+            ./gradlew jacocoTestReport --stacktrace
         - uses: codecov/codecov-action@v1
           with:
               flags: unit
diff --git a/.gitignore b/.gitignore
index 3709487b2..cd5ff7146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,4 @@ Thumbs.db
 
 app/src/release/agconnect-services.json
 app/src/release/agconnect-credentials.json
+.idea/deploymentTargetDropDown.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0ac66f649..ab7844747 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,15 +7,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
diff --git a/README.en.md b/README.en.md
index 0f2885cfd..3b6f5bb1b 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/Test%20and%20deploy/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
diff --git a/README.md b/README.md
index bbc36ab65..6478ae20a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Wulkanowy
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Test%20and%20deploy/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wulkanowy/wulkanowy/Tests/develop?style=flat-square)](https://github.com/wulkanowy/wulkanowy/actions)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
diff --git a/app/build.gradle b/app/build.gradle
index 2fd01518d..61e47534c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,13 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'ru.cian.huawei-publish'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
-apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.huawei.agconnect'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
@@ -14,16 +15,14 @@ apply from: 'hooks.gradle'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 17
+        minSdkVersion 21
         targetSdkVersion 30
-        versionCode 92
-        versionName "1.1.6"
-        multiDexEnabled true
+        versionCode 93
+        versionName "1.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
@@ -68,7 +67,6 @@ android {
             resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = project.hasProperty('coverage')
             ext.enableCrashlytics = project.hasProperty("enableFirebase")
         }
     }
@@ -78,7 +76,6 @@ android {
     productFlavors {
         hms {
             dimension "platform"
-            minSdkVersion 19
             manifestPlaceholders = [
                     install_channel: "AppGallery"
             ]
@@ -100,11 +97,7 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
-    }
-
-    lintOptions {
-        disable 'HardwareIds'
+        viewBinding true
     }
 
     testOptions.unitTests {
@@ -113,13 +106,12 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        useIR = true
-        jvmTarget = "1.8"
+        jvmTarget = "11"
         freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
@@ -133,12 +125,16 @@ android {
     }
 }
 
+kapt {
+    correctErrorTypes true
+}
+
 play {
     serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf"
     serviceAccountCredentials = file('key.p12')
     defaultToAppBundles = false
-    track = 'production'
-    updatePriority = 5
+    track = 'beta'
+    updatePriority = 3
 }
 
 huaweiPublish {
@@ -153,39 +149,37 @@ huaweiPublish {
 
 ext {
     work_manager = "2.5.0"
-    work_hilt = "1.0.0-beta01"
-    room = "2.3.0-rc01"
-    chucker = "3.4.0"
-    mockk = "1.11.0"
-    moshi = "1.11.0"
+    android_hilt = "1.0.0"
+    room = "2.3.0"
+    chucker = "3.5.2"
+    mockk = "1.12.0"
+    moshi = "1.12.0"
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.1.6"
+    implementation "io.github.wulkanowy:sdk:1.2.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1"
 
-    implementation "androidx.core:core-ktx:1.3.2"
-    implementation "androidx.activity:activity-ktx:1.2.2"
-    implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.appcompat:appcompat-resources:1.2.0"
-    implementation "androidx.fragment:fragment-ktx:1.3.2"
+    implementation "androidx.core:core-ktx:1.6.0"
+    implementation "androidx.activity:activity-ktx:1.3.1"
+    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation "androidx.appcompat:appcompat-resources:1.3.1"
+    implementation "androidx.fragment:fragment-ktx:1.3.6"
     implementation "androidx.annotation:annotation:1.2.0"
-    implementation "androidx.multidex:multidex:2.0.1"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation "androidx.viewpager:viewpager:1.0.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.3.0"
+    implementation "com.google.android.material:material:1.4.0"
     implementation "com.github.wulkanowy:material-chips-input:2.2.0"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
-    implementation 'com.mikhaellopez:circularimageview:4.2.0'
+    implementation 'com.github.lopspower:CircularImageView:4.2.0'
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
@@ -198,55 +192,56 @@ dependencies {
 
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
-    implementation "androidx.hilt:hilt-work:$work_hilt"
-    kapt "androidx.hilt:hilt-compiler:$work_hilt"
+    kapt "androidx.hilt:hilt-compiler:$android_hilt"
+    implementation "androidx.hilt:hilt-work:$android_hilt"
 
-    implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation "com.ncapdevi:frag-nav:3.3.0"
+    implementation 'com.github.ncapdevi:FragNav:3.3.0'
     implementation "com.github.YarikSOffice:lingver:1.3.0"
 
     implementation "com.squareup.moshi:moshi:$moshi"
     implementation "com.squareup.moshi:moshi-adapters:$moshi"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi"
-    implementation "com.jakewharton.timber:timber:4.7.1"
+
+    implementation "com.jakewharton.timber:timber:5.0.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "fr.bipi.treessence:treessence:0.3.2"
+    implementation 'com.github.bastienpaulfr:Treessence:1.0.4'
     implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
-    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
-    implementation "io.coil-kt:coil:1.1.1"
+    implementation "io.coil-kt:coil:1.3.2"
     implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
     implementation 'me.xdrop:fuzzywuzzy:1.3.1'
+    implementation 'com.fredporciuncula:flow-preferences:1.5.0'
 
-    playImplementation platform('com.google.firebase:firebase-bom:26.7.0')
+    playImplementation platform('com.google.firebase:firebase-bom:28.4.0')
     playImplementation 'com.google.firebase:firebase-analytics-ktx'
     playImplementation 'com.google.firebase:firebase-messaging:'
     playImplementation 'com.google.firebase:firebase-crashlytics:'
+    playImplementation 'com.google.android.play:core:1.10.0'
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:5.2.0.301'
-    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.5.1.200'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.1.1.300'
+    hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
     debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
-    debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
+    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:v1.0.6'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.5.1'
-    testImplementation "androidx.test:runner:1.3.0"
-    testImplementation "androidx.test.ext:junit:1.1.2"
-    testImplementation "androidx.test:core:1.3.0"
+    testImplementation 'org.robolectric:robolectric:4.6.1'
+    testImplementation "androidx.test:runner:1.4.0"
+    testImplementation "androidx.test.ext:junit:1.1.3"
+    testImplementation "androidx.test:core:1.4.0"
     testImplementation "androidx.room:room-testing:$room"
     testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
     kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version"
 
-    androidTestImplementation "androidx.test:core:1.3.0"
-    androidTestImplementation "androidx.test:runner:1.3.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test:core:1.4.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 94469fbc0..f253673e6 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -1,8 +1,8 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.5"
-    reportsDir = file("$buildDir/reports")
+    toolVersion "0.8.7"
+    reportsDirectory.set(file("$buildDir/reports"))
 }
 
 tasks.withType(Test) {
@@ -16,8 +16,8 @@ task jacocoTestReport(type: JacocoReport) {
     description = "Generate Jacoco coverage reports"
 
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.required.set(true)
+        html.required.set(true)
     }
 
     def excludes = ['**/R.class',
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/36.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/36.json
new file mode 100644
index 000000000..2fae53021
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/36.json
@@ -0,0 +1,2160 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 36,
+    "identityHash": "a217c2fc4e756a014f203e7499f88a90",
+    "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"
+            ],
+            "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, `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": "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_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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": "userLoginId",
+            "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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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": []
+      }
+    ],
+    "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, 'a217c2fc4e756a014f203e7499f88a90')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/37.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/37.json
new file mode 100644
index 000000000..1aaf96f6c
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/37.json
@@ -0,0 +1,2204 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 37,
+    "identityHash": "98169e620b79a6633f80b5bd32162ed2",
+    "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"
+            ],
+            "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, `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": "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_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "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": "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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": []
+      }
+    ],
+    "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, '98169e620b79a6633f80b5bd32162ed2')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/38.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/38.json
new file mode 100644
index 000000000..1625a9f61
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/38.json
@@ -0,0 +1,2248 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 38,
+    "identityHash": "02c6cf89e47f5ee42ee04880eb91cff2",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `nick` TEXT NOT NULL, `avatar_color` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "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"
+            ],
+            "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}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `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)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradePartialStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradeSemesterStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `amounts` TEXT NOT NULL, `student_grade` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`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, `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)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "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}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "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
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `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)",
+        "fields": [
+          {
+            "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": "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Conferences",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimetableAdditional",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "StudentInfo",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `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, `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": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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": "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}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SchoolAnnouncements",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_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
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "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, '02c6cf89e47f5ee42ee04880eb91cff2')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/39.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/39.json
new file mode 100644
index 000000000..d93351ac8
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/39.json
@@ -0,0 +1,2260 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 39,
+    "identityHash": "73b2b5a236cacd91df734ec4141bc590",
+    "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"
+            ],
+            "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, `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": "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_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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)",
+        "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
+          }
+        ],
+        "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}` (`student_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": "studentId",
+            "columnName": "student_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": []
+      }
+    ],
+    "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, '73b2b5a236cacd91df734ec4141bc590')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_grade.png b/app/src/debug/res/drawable-hdpi/ic_stat_grade.png
deleted file mode 100644
index 013b7ac49..000000000
Binary files a/app/src/debug/res/drawable-hdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png
deleted file mode 100644
index 74a4d0c55..000000000
Binary files a/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_message.png b/app/src/debug/res/drawable-hdpi/ic_stat_message.png
deleted file mode 100644
index be41e3434..000000000
Binary files a/app/src/debug/res/drawable-hdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_note.png b/app/src/debug/res/drawable-hdpi/ic_stat_note.png
deleted file mode 100644
index 1992edf25..000000000
Binary files a/app/src/debug/res/drawable-hdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png
deleted file mode 100644
index 10b27cee7..000000000
Binary files a/app/src/debug/res/drawable-hdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_grade.png b/app/src/debug/res/drawable-mdpi/ic_stat_grade.png
deleted file mode 100644
index a5df2a359..000000000
Binary files a/app/src/debug/res/drawable-mdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png
deleted file mode 100644
index 278ed2c66..000000000
Binary files a/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_message.png b/app/src/debug/res/drawable-mdpi/ic_stat_message.png
deleted file mode 100644
index 7327a02f3..000000000
Binary files a/app/src/debug/res/drawable-mdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_note.png b/app/src/debug/res/drawable-mdpi/ic_stat_note.png
deleted file mode 100644
index 2fb020982..000000000
Binary files a/app/src/debug/res/drawable-mdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png
deleted file mode 100644
index db5747b0d..000000000
Binary files a/app/src/debug/res/drawable-mdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png
deleted file mode 100644
index c63f810fb..000000000
Binary files a/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png
deleted file mode 100644
index 4035ceba8..000000000
Binary files a/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xhdpi/ic_stat_message.png
deleted file mode 100644
index c4140be89..000000000
Binary files a/app/src/debug/res/drawable-xhdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_note.png b/app/src/debug/res/drawable-xhdpi/ic_stat_note.png
deleted file mode 100644
index 6b533c8ee..000000000
Binary files a/app/src/debug/res/drawable-xhdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png
deleted file mode 100644
index 8d9858292..000000000
Binary files a/app/src/debug/res/drawable-xhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png
deleted file mode 100644
index 13c26b772..000000000
Binary files a/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png
deleted file mode 100644
index da4357456..000000000
Binary files a/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png
deleted file mode 100644
index 9d0fa781c..000000000
Binary files a/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png
deleted file mode 100644
index 64da443fd..000000000
Binary files a/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png
deleted file mode 100644
index 232108e87..000000000
Binary files a/app/src/debug/res/drawable-xxhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/debug/res/drawable/ic_stat_grade.xml
similarity index 100%
rename from app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml
rename to app/src/debug/res/drawable/ic_stat_grade.xml
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/debug/res/drawable/ic_stat_luckynumber.xml
similarity index 100%
rename from app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
rename to app/src/debug/res/drawable/ic_stat_luckynumber.xml
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/debug/res/drawable/ic_stat_message.xml
similarity index 100%
rename from app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml
rename to app/src/debug/res/drawable/ic_stat_message.xml
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/debug/res/drawable/ic_stat_note.xml
similarity index 100%
rename from app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml
rename to app/src/debug/res/drawable/ic_stat_note.xml
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml b/app/src/debug/res/drawable/ic_stat_timetable.xml
similarity index 100%
rename from app/src/debug/res/drawable-anydpi-v24/ic_stat_timetable.xml
rename to app/src/debug/res/drawable/ic_stat_timetable.xml
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
new file mode 100644
index 000000000..d052b54b8
--- /dev/null
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import javax.inject.Singleton
+import javax.inject.Inject
+
+@Singleton
+class InAppReviewHelper @Inject constructor(
+    @ApplicationContext private val context: Context
+)  {
+
+    fun showInAppReview(activity: MainActivity) {
+        // do nothing
+    }
+}
\ No newline at end of file
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 b5fb6ad71..b0c34f413 100644
--- a/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
+++ b/app/src/hms/java/io/github/wulkanowy/utils/CrashLogUtils.kt
@@ -3,11 +3,6 @@ package io.github.wulkanowy.utils
 import android.util.Log
 import com.huawei.agconnect.crash.AGConnectCrash
 import fr.bipi.tressence.base.FormatterPriorityTree
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
-import java.io.InterruptedIOException
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 
 class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
 
@@ -20,21 +15,10 @@ class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
     }
 }
 
-class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) {
+class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR, ExceptionFilter) {
 
     private val connectCrash by lazy { AGConnectCrash.getInstance() }
 
-    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
-        return when (t) {
-            is FeatureDisabledException,
-            is FeatureNotAvailableException,
-            is UnknownHostException,
-            is SocketTimeoutException,
-            is InterruptedIOException -> true
-            else -> super.skipLog(priority, tag, message, t)
-        }
-    }
-
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         if (skipLog(priority, tag, message, t)) return
 
diff --git a/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
new file mode 100644
index 000000000..fb9bcae6c
--- /dev/null
+++ b/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class InAppReviewHelper @Inject constructor(
+    @ApplicationContext private val context: Context
+)  {
+
+    fun showInAppReview(activity: MainActivity) {
+        // do nothing
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7b714fb26..a331c41f6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
@@ -167,7 +168,7 @@
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
-            android:resource="@drawable/ic_stat_push" />
+            android:resource="@drawable/ic_stat_all" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
index 3b11c971c..b2849931a 100644
--- a/app/src/main/assets/contributors.json
+++ b/app/src/main/assets/contributors.json
@@ -36,7 +36,7 @@
     "githubUsername": "Luncenok"
   },
   {
-    "displayName": "MRmlik12",
+    "displayName": "Daniel Olczyk",
     "githubUsername": "MRmlik12"
   },
   {
@@ -46,5 +46,9 @@
   {
     "displayName": "Kamil Studziński",
     "githubUsername": "studzinskik"
+  },
+  {
+    "displayName": "Tomasz F.",
+    "githubUsername": "Pengwius"
   }
 ]
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index d01a953d8..4621c5928 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -2,14 +2,12 @@ package io.github.wulkanowy
 
 import android.annotation.SuppressLint
 import android.app.Application
-import android.content.Context
 import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
 import android.webkit.WebView
 import androidx.fragment.app.FragmentManager
 import androidx.hilt.work.HiltWorkerFactory
-import androidx.multidex.MultiDex
 import androidx.work.Configuration
 import com.yariksoffice.lingver.Lingver
 import dagger.hilt.android.HiltAndroidApp
@@ -43,11 +41,6 @@ class WulkanowyApp : Application(), Configuration.Provider {
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        MultiDex.install(this)
-    }
-
     @SuppressLint("UnsafeOptInUsageWarning")
     override fun onCreate() {
         super.onCreate()
@@ -91,7 +84,7 @@ class WulkanowyApp : Application(), Configuration.Provider {
         //https://stackoverflow.com/questions/40398528/android-webview-language-changes-abruptly-on-android-7-0-and-above
         try {
             WebView(this).destroy()
-        } catch (e: Exception) {
+        } catch (e: Throwable) {
             //Ignore exceptions
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
index f61af4afd..a1c3cbbb7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -8,6 +8,8 @@ import androidx.preference.PreferenceManager
 import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
 import com.chuckerteam.chucker.api.RetentionManager
+import com.squareup.moshi.Moshi
+import com.fredporciuncula.flow.preferences.FlowSharedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -18,6 +20,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 kotlinx.coroutines.ExperimentalCoroutinesApi
 import timber.log.Timber
 import javax.inject.Singleton
 
@@ -77,6 +80,16 @@ internal class RepositoryModule {
     fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences =
         PreferenceManager.getDefaultSharedPreferences(context)
 
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Singleton
+    @Provides
+    fun provideFlowSharedPref(sharedPreferences: SharedPreferences) =
+        FlowSharedPreferences(sharedPreferences)
+
+    @Singleton
+    @Provides
+    fun provideMoshi() = Moshi.Builder().build()
+
     @Singleton
     @Provides
     fun provideStudentDao(database: AppDatabase) = database.studentDao
@@ -181,4 +194,12 @@ internal class RepositoryModule {
     @Singleton
     @Provides
     fun provideStudentInfoDao(database: AppDatabase) = database.studentInfoDao
+
+    @Singleton
+    @Provides
+    fun provideTimetableHeaderDao(database: AppDatabase) = database.timetableHeaderDao
+
+    @Singleton
+    @Provides
+    fun provideSchoolAnnouncementDao(database: AppDatabase) = database.schoolAnnouncementDao
 }
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 ac05695b8..0dca9aa18 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
@@ -10,6 +10,7 @@ import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.dao.ConferenceDao
+import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.dao.GradeDao
 import io.github.wulkanowy.data.db.dao.GradePartialStatisticsDao
@@ -32,10 +33,12 @@ import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
+import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Conference
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradePartialStatistics
@@ -58,6 +61,7 @@ import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.db.entities.TimetableHeader
 import io.github.wulkanowy.data.db.migrations.Migration10
 import io.github.wulkanowy.data.db.migrations.Migration11
 import io.github.wulkanowy.data.db.migrations.Migration12
@@ -86,6 +90,10 @@ import io.github.wulkanowy.data.db.migrations.Migration32
 import io.github.wulkanowy.data.db.migrations.Migration33
 import io.github.wulkanowy.data.db.migrations.Migration34
 import io.github.wulkanowy.data.db.migrations.Migration35
+import io.github.wulkanowy.data.db.migrations.Migration36
+import io.github.wulkanowy.data.db.migrations.Migration37
+import io.github.wulkanowy.data.db.migrations.Migration38
+import io.github.wulkanowy.data.db.migrations.Migration39
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
 import io.github.wulkanowy.data.db.migrations.Migration6
@@ -124,6 +132,8 @@ import javax.inject.Singleton
         Conference::class,
         TimetableAdditional::class,
         StudentInfo::class,
+        TimetableHeader::class,
+        SchoolAnnouncement::class,
     ],
     version = AppDatabase.VERSION_SCHEMA,
     exportSchema = true
@@ -132,7 +142,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 35
+        const val VERSION_SCHEMA = 39
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -168,7 +178,11 @@ abstract class AppDatabase : RoomDatabase() {
             Migration32(),
             Migration33(),
             Migration34(),
-            Migration35(appInfo)
+            Migration35(appInfo),
+            Migration36(),
+            Migration37(),
+            Migration38(),
+            Migration39(),
         )
 
         fun newInstance(
@@ -234,4 +248,8 @@ abstract class AppDatabase : RoomDatabase() {
     abstract val timetableAdditionalDao: TimetableAdditionalDao
 
     abstract val studentInfoDao: StudentInfoDao
+
+    abstract val timetableHeaderDao: TimetableHeaderDao
+
+    abstract val schoolAnnouncementDao: SchoolAnnouncementDao
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
index 9301d5fa9..0623d403f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefProvider.kt
@@ -20,9 +20,15 @@ class SharedPrefProvider @Inject constructor(
 
     fun getLong(key: String, defaultValue: Long) = sharedPref.getLong(key, defaultValue)
 
+    fun getString(key: String) = sharedPref.getString(key, null)
+
     fun getString(key: String, defaultValue: String): String = sharedPref.getString(key, defaultValue) ?: defaultValue
 
-    fun putString(key: String, value: String, sync: Boolean = false) {
+    fun getBoolean(key: String, defaultValue: Boolean): Boolean = sharedPref.getBoolean(key, defaultValue)
+
+    fun putBoolean(key: String, value: Boolean, sync: Boolean = false) = sharedPref.edit(sync) { putBoolean(key, value) }
+
+    fun putString(key: String, value: String?, sync: Boolean = false) {
         sharedPref.edit(sync) { putString(key, value) }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt
index 4ed9aecf5..e84bad592 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ConferenceDao.kt
@@ -4,12 +4,13 @@ import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Conference
 import kotlinx.coroutines.flow.Flow
+import java.time.LocalDateTime
 import javax.inject.Singleton
 
 @Dao
 @Singleton
 interface ConferenceDao : BaseDao<Conference> {
 
-    @Query("SELECT * FROM Conferences WHERE diary_id = :diaryId AND student_id = :studentId")
-    fun loadAll(diaryId: Int, studentId: Int): Flow<List<Conference>>
+    @Query("SELECT * FROM Conferences WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :startDate")
+    fun loadAll(diaryId: Int, studentId: Int, startDate: LocalDateTime): Flow<List<Conference>>
 }
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
new file mode 100644
index 000000000..56806604f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Singleton
+
+@Dao
+@Singleton
+interface SchoolAnnouncementDao : BaseDao<SchoolAnnouncement> {
+
+    @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId")
+    fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableHeaderDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableHeaderDao.kt
new file mode 100644
index 000000000..916d19010
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableHeaderDao.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import io.github.wulkanowy.data.db.entities.TimetableHeader
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
+import javax.inject.Singleton
+
+@Dao
+@Singleton
+interface TimetableHeaderDao : BaseDao<TimetableHeader> {
+
+    @Query("SELECT * FROM TimetableHeaders WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<TimetableHeader>>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt
index 8ddcbbb0b..4ad946508 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Conference.kt
@@ -32,4 +32,7 @@ data class Conference(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
 }
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 50ed343a9..50299e607 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
@@ -36,4 +36,7 @@ data class Exam(
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
index 5b21445b4..04ee1e8c6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
@@ -37,4 +37,7 @@ data class Homework(
 
     @ColumnInfo(name = "is_done")
     var isDone: Boolean = false
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
 }
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 3021da72d..60e67d32f 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
@@ -3,8 +3,10 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
 import java.io.Serializable
 
+@JsonClass(generateAdapter = true)
 @Entity(tableName = "Recipients")
 data class Recipient(
 
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
new file mode 100644
index 000000000..c8731bded
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+import java.time.LocalDate
+
+@Entity(tableName = "SchoolAnnouncements")
+data class SchoolAnnouncement(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    val date: LocalDate,
+
+    val subject: String,
+
+    val content: String
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+
+    @ColumnInfo(name = "is_notified")
+    var isNotified: Boolean = true
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableHeader.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableHeader.kt
new file mode 100644
index 000000000..7f21bf547
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/TimetableHeader.kt
@@ -0,0 +1,25 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+import java.time.LocalDate
+
+@Entity(tableName = "TimetableHeaders")
+data class TimetableHeader(
+
+    @ColumnInfo(name = "student_id")
+    val studentId: Int,
+
+    @ColumnInfo(name = "diary_id")
+    val diaryId: Int,
+
+    val date: LocalDate,
+
+    val content: String,
+) : Serializable {
+
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration36.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration36.kt
new file mode 100644
index 000000000..7ea106585
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration36.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration36 : Migration(35, 36) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Exams ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE Homework ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration37.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration37.kt
new file mode 100644
index 000000000..a3fcd51a6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration37.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration37 : Migration(36, 37) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS TimetableHeaders (
+                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                student_id INTEGER NOT NULL,
+                diary_id INTEGER NOT NULL,
+                date INTEGER NOT NULL,
+                content TEXT NOT NULL
+            )
+        """
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration38.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration38.kt
new file mode 100644
index 000000000..1f90f5a44
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration38.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration38 : Migration(37, 38) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS `SchoolAnnouncements` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `student_id` INTEGER NOT NULL,
+                `date` INTEGER NOT NULL,
+                `subject` TEXT NOT NULL,
+                `content` TEXT NOT NULL
+            )
+        """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration39.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration39.kt
new file mode 100644
index 000000000..6c0d36dd2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration39.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration39 : Migration(38, 39) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Conferences ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE SchoolAnnouncements ADD COLUMN is_notified INTEGER NOT NULL DEFAULT 1")
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..e6bf000b1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.pojo.DirectorInformation as SdkDirectorInformation
+
+fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
+    SchoolAnnouncement(
+        studentId = student.studentId,
+        date = it.date,
+        subject = it.subject,
+        content = it.content,
+    )
+}
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 ffd2ae34e..045101c42 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
@@ -3,9 +3,19 @@ package io.github.wulkanowy.data.mappers
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.db.entities.TimetableHeader
+import io.github.wulkanowy.data.pojos.TimetableFull
+import io.github.wulkanowy.sdk.pojo.TimetableFull as SdkTimetableFull
+import io.github.wulkanowy.sdk.pojo.TimetableDayHeader as SdkTimetableHeader
 import io.github.wulkanowy.sdk.pojo.Timetable as SdkTimetable
 import io.github.wulkanowy.sdk.pojo.TimetableAdditional as SdkTimetableAdditional
 
+fun SdkTimetableFull.mapToEntities(semester: Semester) = TimetableFull(
+    lessons = lessons.mapToEntities(semester),
+    additional = additional.mapToEntities(semester),
+    headers = headers.mapToEntities(semester)
+)
+
 fun List<SdkTimetable>.mapToEntities(semester: Semester) = map {
     Timetable(
         studentId = semester.studentId,
@@ -39,3 +49,13 @@ fun List<SdkTimetableAdditional>.mapToEntities(semester: Semester) = map {
         end = it.end
     )
 }
+
+@JvmName("mapToEntitiesTimetableHeaders")
+fun List<SdkTimetableHeader>.mapToEntities(semester: Semester) = map {
+    TimetableHeader(
+        studentId = semester.studentId,
+        diaryId = semester.diaryId,
+        date = it.date,
+        content = it.content
+    )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/MessageDraft.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/MessageDraft.kt
new file mode 100644
index 000000000..a79b70cd4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/MessageDraft.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.pojos
+
+import com.squareup.moshi.JsonClass
+import io.github.wulkanowy.ui.modules.message.send.RecipientChipItem
+
+@JsonClass(generateAdapter = true)
+data class MessageDraft(
+    val recipients: List<RecipientChipItem>,
+    val subject: String,
+    val content: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/Notification.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/Notification.kt
new file mode 100644
index 000000000..ca2749374
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/Notification.kt
@@ -0,0 +1,36 @@
+package io.github.wulkanowy.data.pojos
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.PluralsRes
+import androidx.annotation.StringRes
+import io.github.wulkanowy.services.sync.notifications.NotificationType
+import io.github.wulkanowy.ui.modules.main.MainView
+
+sealed interface Notification {
+    val type: NotificationType
+    val startMenu: MainView.Section
+    val icon: Int
+    val titleStringRes: Int
+    val contentStringRes: Int
+}
+
+data class MultipleNotifications(
+    override val type: NotificationType,
+    override val startMenu: MainView.Section,
+    @DrawableRes override val icon: Int,
+    @PluralsRes override val titleStringRes: Int,
+    @PluralsRes override val contentStringRes: Int,
+
+    @PluralsRes val summaryStringRes: Int,
+    val lines: List<String>,
+) : Notification
+
+data class OneNotification(
+    override val type: NotificationType,
+    override val startMenu: MainView.Section,
+    @DrawableRes override val icon: Int,
+    @StringRes override val titleStringRes: Int,
+    @StringRes override val contentStringRes: Int,
+
+    val contentValues: List<String>,
+) : Notification
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/TimetableFull.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/TimetableFull.kt
new file mode 100644
index 000000000..ce0f6ef53
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/TimetableFull.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.pojos
+
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.entities.TimetableAdditional
+import io.github.wulkanowy.data.db.entities.TimetableHeader
+
+data class TimetableFull(
+    val lessons: List<Timetable>,
+    val additional: List<TimetableAdditional>,
+    val headers: List<TimetableHeader>,
+)
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 aea8632ac..71b7ea94e 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
@@ -15,6 +15,7 @@ class AppCreatorRepository @Inject constructor(
     private val dispatchers: DispatchersProvider
 ) {
 
+    @Suppress("BlockingMethodInNonBlockingContext")
     suspend fun getAppCreators() = withContext(dispatchers.backgroundThread) {
         val moshi = Moshi.Builder().build()
         val type = Types.newParameterizedType(List::class.java, Contributor::class.java)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
index cd4403c7d..58659914f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/AttendanceSummaryRepository.kt
@@ -25,9 +25,17 @@ class AttendanceSummaryRepository @Inject constructor(
 
     private val cacheKey = "attendance_summary"
 
-    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
+    fun getAttendanceSummary(
+        student: Student,
+        semester: Semester,
+        subjectId: Int,
+        forceRefresh: Boolean
+    ) = networkBoundResource(
         mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
+        shouldFetch = {
+            it.isEmpty() || forceRefresh
+                || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester))
+        },
         query = { attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId) },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
index 0a839d27b..16d7c3c6c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ConferenceRepository.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.ConferenceDao
+import io.github.wulkanowy.data.db.entities.Conference
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
@@ -10,7 +11,11 @@ import io.github.wulkanowy.utils.getRefreshKey
 import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -25,19 +30,44 @@ class ConferenceRepository @Inject constructor(
 
     private val cacheKey = "conference"
 
-    fun getConferences(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+    fun getConferences(
+        student: Student,
+        semester: Semester,
+        forceRefresh: Boolean,
+        notify: Boolean = false,
+        startDate: LocalDateTime = LocalDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC)
+    ) = networkBoundResource(
         mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester)) },
-        query = { conferenceDb.loadAll(semester.diaryId, student.studentId) },
+        shouldFetch = {
+            it.isEmpty() || forceRefresh
+                || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester))
+        },
+        query = {
+            conferenceDb.loadAll(semester.diaryId, student.studentId, startDate)
+        },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
                 .getConferences()
                 .mapToEntities(semester)
+                .filter { it.date >= startDate }
         },
         saveFetchResult = { old, new ->
+            val conferencesToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
             conferenceDb.deleteAll(old uniqueSubtract new)
-            conferenceDb.insertAll(new uniqueSubtract old)
+            conferenceDb.insertAll(conferencesToSave)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester))
         }
     )
+
+    fun getConferenceFromDatabase(semester: Semester): Flow<List<Conference>> =
+        conferenceDb.loadAll(
+            diaryId = semester.diaryId,
+            studentId = semester.studentId,
+            startDate = LocalDateTime.ofInstant(Instant.EPOCH, ZoneOffset.UTC)
+        )
+
+    suspend fun updateConference(conference: List<Conference>) = conferenceDb.updateAll(conference)
 }
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 a8912f100..93d5a47cb 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
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.ExamDao
+import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.mappers.mapToEntities
@@ -12,6 +13,7 @@ import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.startExamsDay
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -28,20 +30,54 @@ class ExamRepository @Inject constructor(
 
     private val cacheKey = "exam"
 
-    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+    fun getExams(
+        student: Student,
+        semester: Semester,
+        start: LocalDate,
+        end: LocalDate,
+        forceRefresh: Boolean,
+        notify: Boolean = false
+    ) = networkBoundResource(
         mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { examDb.loadAll(semester.diaryId, semester.studentId, start.startExamsDay, start.endExamsDay) },
+        shouldFetch = {
+            val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed(
+                key = getRefreshKey(cacheKey, semester, start, end)
+            )
+            it.isEmpty() || forceRefresh || isShouldBeRefreshed
+        },
+        query = {
+            examDb.loadAll(
+                diaryId = semester.diaryId,
+                studentId = semester.studentId,
+                from = start.startExamsDay,
+                end = start.endExamsDay
+            )
+        },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
                 .getExams(start.startExamsDay, start.endExamsDay, semester.semesterId)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
+            val examsToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
             examDb.deleteAll(old uniqueSubtract new)
-            examDb.insertAll(new uniqueSubtract old)
+            examDb.insertAll(examsToSave)
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
         filterResult = { it.filter { item -> item.date in start..end } }
     )
+
+    fun getExamsFromDatabase(semester: Semester, start: LocalDate): Flow<List<Exam>> {
+        return examDb.loadAll(
+            diaryId = semester.diaryId,
+            studentId = semester.studentId,
+            from = start.startExamsDay,
+            end = start.endExamsDay
+        )
+    }
+
+    suspend fun updateExam(exam: List<Exam>) = examDb.updateAll(exam)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
index 9880e4641..0b8a0e710 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/GradeRepository.kt
@@ -104,22 +104,16 @@ class GradeRepository @Inject constructor(
         }
     }
 
-    fun getNotNotifiedGrades(semester: Semester): Flow<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { grade -> !grade.isNotified }
-        }
+    fun getGradesFromDatabase(semester: Semester): Flow<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId)
     }
 
-    fun getNotNotifiedPredictedGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified }
-        }
+    fun getGradesPredictedFromDatabase(semester: Semester): Flow<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
     }
 
-    fun getNotNotifiedFinalGrades(semester: Semester): Flow<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).map {
-            it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified }
-        }
+    fun getGradesFinalFromDatabase(semester: Semester): Flow<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
     }
 
     suspend fun updateGrade(grade: Grade) {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
index 068fd9a5c..23dd74c2c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt
@@ -29,18 +29,38 @@ class HomeworkRepository @Inject constructor(
 
     private val cacheKey = "homework"
 
-    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+    fun getHomework(
+        student: Student, semester: Semester,
+        start: LocalDate, end: LocalDate,
+        forceRefresh: Boolean, notify: Boolean = false
+    ) = networkBoundResource(
         mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = { homeworkDb.loadAll(semester.semesterId, semester.studentId, start.monday, end.sunday) },
+        shouldFetch = {
+            val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed(
+                key = getRefreshKey(cacheKey, semester, start, end)
+            )
+            it.isEmpty() || forceRefresh || isShouldBeRefreshed
+        },
+        query = {
+            homeworkDb.loadAll(
+                semesterId = semester.semesterId,
+                studentId = semester.studentId,
+                from = start.monday,
+                end = end.sunday
+            )
+        },
         fetch = {
             sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
                 .getHomework(start.monday, end.sunday)
                 .mapToEntities(semester)
         },
         saveFetchResult = { old, new ->
+            val homeWorkToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
             homeworkDb.deleteAll(old uniqueSubtract new)
-            homeworkDb.insertAll(new uniqueSubtract old)
+            homeworkDb.insertAll(homeWorkToSave)
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         }
@@ -51,4 +71,9 @@ class HomeworkRepository @Inject constructor(
             isDone = !isDone
         }))
     }
+
+    fun getHomeworkFromDatabase(semester: Semester, start: LocalDate, end: LocalDate) =
+        homeworkDb.loadAll(semester.semesterId, semester.studentId, start.monday, end.sunday)
+
+    suspend fun updateHomework(homework: List<Homework>) = homeworkDb.updateAll(homework)
 }
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 5f5554187..9977e1d57 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
@@ -1,8 +1,15 @@
 package io.github.wulkanowy.data.repositories
 
+import android.content.Context
+import com.squareup.moshi.Moshi
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
@@ -10,6 +17,8 @@ import io.github.wulkanowy.data.enums.MessageFolder
 import io.github.wulkanowy.data.enums.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.mappers.mapFromEntities
 import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.pojos.MessageDraft
+import io.github.wulkanowy.data.pojos.MessageDraftJsonAdapter
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.sdk.pojo.SentMessage
@@ -19,7 +28,6 @@ import io.github.wulkanowy.utils.init
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
 import timber.log.Timber
 import java.time.LocalDateTime.now
@@ -31,7 +39,10 @@ class MessageRepository @Inject constructor(
     private val messagesDb: MessagesDao,
     private val messageAttachmentDao: MessageAttachmentDao,
     private val sdk: Sdk,
+    @ApplicationContext private val context: Context,
     private val refreshHelper: AutoRefreshHelper,
+    private val sharedPrefProvider: SharedPrefProvider,
+    private val moshi: Moshi,
 ) {
 
     private val saveFetchResultMutex = Mutex()
@@ -39,22 +50,54 @@ class MessageRepository @Inject constructor(
     private val cacheKey = "message"
 
     @Suppress("UNUSED_PARAMETER")
-    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+    fun getMessages(
+        student: Student, semester: Semester,
+        folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false
+    ): Flow<Resource<List<Message>>> = networkBoundResource(
         mutex = saveFetchResultMutex,
-        shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student, folder)) },
+        shouldFetch = {
+            it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(
+                getRefreshKey(cacheKey, student, folder)
+            )
+        },
         query = { messagesDb.loadAll(student.id.toInt(), folder.id) },
-        fetch = { sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).mapToEntities(student) },
+        fetch = {
+            sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now())
+                .mapToEntities(student)
+        },
         saveFetchResult = { old, new ->
             messagesDb.deleteAll(old uniqueSubtract new)
             messagesDb.insertAll((new uniqueSubtract old).onEach {
                 it.isNotified = !notify
             })
+            messagesDb.updateAll(getMessagesWithReadByChange(old, new, !notify))
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder))
         }
     )
 
-    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource(
+    private fun getMessagesWithReadByChange(
+        old: List<Message>, new: List<Message>,
+        setNotified: Boolean
+    ): List<Message> {
+        val oldMeta = old.map { Triple(it, it.readBy, it.unreadBy) }
+        val newMeta = new.map { Triple(it, it.readBy, it.unreadBy) }
+
+        val updatedItems = newMeta uniqueSubtract oldMeta
+
+        return updatedItems.map {
+            val oldItem = old.find { item -> item.messageId == it.first.messageId }
+            it.first.apply {
+                id = oldItem?.id ?: 0
+                isNotified = oldItem?.isNotified ?: setNotified
+                content = oldItem?.content.orEmpty()
+            }
+        }
+    }
+
+    fun getMessage(
+        student: Student, message: Message, markAsRead: Boolean = false
+    ): Flow<Resource<MessageWithAttachment?>> = networkBoundResource(
         shouldFetch = {
             checkNotNull(it, { "This message no longer exist!" })
             Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
@@ -62,14 +105,20 @@ class MessageRepository @Inject constructor(
         },
         query = { messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId) },
         fetch = {
-            sdk.init(student).getMessageDetails(it!!.message.messageId, message.folderId, markAsRead, message.realId).let { details ->
+            sdk.init(student).getMessageDetails(
+                messageId = it!!.message.messageId,
+                folderId = message.folderId,
+                read = markAsRead,
+                id = message.realId
+            ).let { details ->
                 details.content to details.attachments.mapToEntities()
             }
         },
         saveFetchResult = { old, (downloadedMessage, attachments) ->
             checkNotNull(old, { "Fetched message no longer exist!" })
-            messagesDb.updateAll(listOf(old.message.copy(unread = !markAsRead).apply {
+            messagesDb.updateAll(listOf(old.message.apply {
                 id = old.message.id
+                unread = !markAsRead
                 content = content.ifBlank { downloadedMessage }
             }))
             messageAttachmentDao.insertAttachments(attachments)
@@ -77,30 +126,42 @@ class MessageRepository @Inject constructor(
         }
     )
 
-    fun getNotNotifiedMessages(student: Student): Flow<List<Message>> {
-        return messagesDb.loadAll(student.id.toInt(), RECEIVED.id).map { it.filter { message -> !message.isNotified && message.unread } }
+    fun getMessagesFromDatabase(student: Student): Flow<List<Message>> {
+        return messagesDb.loadAll(student.id.toInt(), RECEIVED.id)
     }
 
     suspend fun updateMessages(messages: List<Message>) {
         return messagesDb.updateAll(messages)
     }
 
-    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
-        return sdk.init(student).sendMessage(
-            subject = subject,
-            content = content,
-            recipients = recipients.mapFromEntities()
-        )
-    }
+    suspend fun sendMessage(
+        student: Student, subject: String, content: String,
+        recipients: List<Recipient>
+    ): SentMessage = sdk.init(student).sendMessage(
+        subject = subject,
+        content = content,
+        recipients = recipients.mapFromEntities()
+    )
 
     suspend fun deleteMessage(student: Student, message: Message) {
-        val isDeleted = sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
+        val isDeleted = sdk.init(student).deleteMessages(
+            messages = listOf(message.messageId), message.folderId
+        )
 
-        if (message.folderId != MessageFolder.TRASHED.id) {
-            if (isDeleted) messagesDb.updateAll(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
+        if (message.folderId != MessageFolder.TRASHED.id && isDeleted) {
+            val deletedMessage = message.copy(folderId = MessageFolder.TRASHED.id).apply {
                 id = message.id
                 content = message.content
-            }))
+            }
+            messagesDb.updateAll(listOf(deletedMessage))
         } else messagesDb.deleteAll(listOf(message))
     }
+
+    var draftMessage: MessageDraft?
+        get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft))
+            ?.let { MessageDraftJsonAdapter(moshi).fromJson(it) }
+        set(value) = sharedPrefProvider.putString(
+            context.getString(R.string.pref_key_message_send_draft),
+            value?.let { MessageDraftJsonAdapter(moshi).toJson(it) }
+        )
 }
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 85339dfa9..d43cdbc0c 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
@@ -50,8 +50,8 @@ class NoteRepository @Inject constructor(
         }
     )
 
-    fun getNotNotifiedNotes(student: Student): Flow<List<Note>> {
-        return noteDb.loadAll(student.studentId).map { it.filter { note -> !note.isNotified } }
+    fun getNotesFromDatabase(student: Student): Flow<List<Note>> {
+        return noteDb.loadAll(student.studentId)
     }
 
     suspend fun updateNote(note: Note) {
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 5bd1f3c12..bc8100f22 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
@@ -3,18 +3,41 @@ package io.github.wulkanowy.data.repositories
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
+import com.fredporciuncula.flow.preferences.FlowSharedPreferences
+import com.fredporciuncula.flow.preferences.Preference
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapter
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.toLocalDate
+import io.github.wulkanowy.ui.modules.dashboard.DashboardItem
 import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
 import io.github.wulkanowy.ui.modules.grade.GradeSortingMode
+import io.github.wulkanowy.utils.toTimestamp
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.utils.toTimestamp
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import java.time.LocalDate
+import java.time.LocalDateTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @Singleton
 class PreferencesRepository @Inject constructor(
     private val sharedPref: SharedPreferences,
-    @ApplicationContext val context: Context
+    private val flowSharedPref: FlowSharedPreferences,
+    @ApplicationContext val context: Context,
+    moshi: Moshi
 ) {
+
+    @OptIn(ExperimentalStdlibApi::class)
+    private val dashboardItemsPositionAdapter: JsonAdapter<Map<DashboardItem.Type, Int>> =
+        moshi.adapter()
+
     val startMenuIndex: Int
         get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
 
@@ -146,9 +169,78 @@ class PreferencesRepository @Inject constructor(
             R.bool.pref_default_subjects_without_grades
         )
 
-    var isKitkatDialogDisabled: Boolean
-        get() = sharedPref.getBoolean("kitkat_dialog_disabled", false)
-        set(value) = sharedPref.edit { putBoolean("kitkat_dialog_disabled", value) }
+    val isOptionalArithmeticAverage: Boolean
+        get() = getBoolean(
+            R.string.pref_key_optional_arithmetic_average,
+            R.bool.pref_default_optional_arithmetic_average
+        )
+
+    var lasSyncDate: LocalDateTime
+        get() = getLong(
+            R.string.pref_key_last_sync_date,
+            R.string.pref_default_last_sync_date
+        ).toLocalDateTime()
+        set(value) = sharedPref.edit().putLong("last_sync_date", value.toTimestamp()).apply()
+
+    var dashboardItemsPosition: Map<DashboardItem.Type, Int>?
+        get() {
+            val json = sharedPref.getString(PREF_KEY_DASHBOARD_ITEMS_POSITION, null) ?: return null
+
+            return dashboardItemsPositionAdapter.fromJson(json)
+        }
+        set(value) = sharedPref.edit {
+            putString(
+                PREF_KEY_DASHBOARD_ITEMS_POSITION,
+                dashboardItemsPositionAdapter.toJson(value)
+            )
+        }
+
+    val selectedDashboardTilesFlow: Flow<Set<DashboardItem.Tile>>
+        get() = selectedDashboardTilesPreference.asFlow()
+            .map { set ->
+                set.map { DashboardItem.Tile.valueOf(it) }
+                    .plus(DashboardItem.Tile.ACCOUNT)
+                    .toSet()
+            }
+
+    var selectedDashboardTiles: Set<DashboardItem.Tile>
+        get() = selectedDashboardTilesPreference.get()
+            .map { DashboardItem.Tile.valueOf(it) }
+            .plus(DashboardItem.Tile.ACCOUNT)
+            .toSet()
+        set(value) {
+            val filteredValue = value.filterNot { it == DashboardItem.Tile.ACCOUNT }
+                .map { it.name }
+                .toSet()
+
+            selectedDashboardTilesPreference.set(filteredValue)
+        }
+
+    private val selectedDashboardTilesPreference: Preference<Set<String>>
+        get() {
+            val defaultSet =
+                context.resources.getStringArray(R.array.pref_default_dashboard_tiles).toSet()
+            val prefKey = context.getString(R.string.pref_key_dashboard_tiles)
+
+            return flowSharedPref.getStringSet(prefKey, defaultSet)
+        }
+
+    var inAppReviewCount: Int
+        get() = sharedPref.getInt(PREF_KEY_IN_APP_REVIEW_COUNT, 0)
+        set(value) = sharedPref.edit().putInt(PREF_KEY_IN_APP_REVIEW_COUNT, value).apply()
+
+    var inAppReviewDate: LocalDate?
+        get() = sharedPref.getLong(PREF_KEY_IN_APP_REVIEW_DATE, 0).takeIf { it != 0L }?.toLocalDate()
+        set(value) = sharedPref.edit().putLong(PREF_KEY_IN_APP_REVIEW_DATE, value!!.toTimestamp()).apply()
+
+    var isAppReviewDone: Boolean
+        get() = sharedPref.getBoolean(PREF_KEY_IN_APP_REVIEW_DONE, false)
+        set(value) = sharedPref.edit().putBoolean(PREF_KEY_IN_APP_REVIEW_DONE, value).apply()
+
+    private fun getLong(id: Int, default: Int) = getLong(context.getString(id), default)
+
+    private fun getLong(id: String, default: Int) =
+        sharedPref.getLong(id, context.resources.getString(default).toLong())
 
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
@@ -159,4 +251,15 @@ class PreferencesRepository @Inject constructor(
 
     private fun getBoolean(id: String, default: Int) =
         sharedPref.getBoolean(id, context.resources.getBoolean(default))
+
+    private companion object {
+
+        private const val PREF_KEY_DASHBOARD_ITEMS_POSITION = "dashboard_items_position"
+
+        private const val PREF_KEY_IN_APP_REVIEW_COUNT = "in_app_review_count"
+
+        private const val PREF_KEY_IN_APP_REVIEW_DATE = "in_app_review_date"
+
+        private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done"
+    }
 }
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
new file mode 100644
index 000000000..62d806ac2
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt
@@ -0,0 +1,65 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.dao.SchoolAnnouncementDao
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.data.db.entities.Semester
+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.networkBoundResource
+import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.sync.Mutex
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SchoolAnnouncementRepository @Inject constructor(
+    private val schoolAnnouncementDb: SchoolAnnouncementDao,
+    private val sdk: Sdk,
+    private val refreshHelper: AutoRefreshHelper,
+) {
+
+    private val saveFetchResultMutex = Mutex()
+
+    private val cacheKey = "school_announcement"
+
+    fun getSchoolAnnouncements(
+        student: Student,
+        forceRefresh: Boolean,
+        notify: Boolean = false
+    ) = networkBoundResource(
+        mutex = saveFetchResultMutex,
+        shouldFetch = {
+            it.isEmpty() || forceRefresh
+                || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student))
+        },
+        query = {
+            schoolAnnouncementDb.loadAll(
+                student.studentId)
+        },
+        fetch = {
+            sdk.init(student)
+                .getDirectorInformation()
+                .mapToEntities(student)
+        },
+        saveFetchResult = { old, new ->
+            val schoolAnnouncementsToSave = (new uniqueSubtract old).onEach {
+                if (notify) it.isNotified = false
+            }
+
+            schoolAnnouncementDb.deleteAll(old uniqueSubtract new)
+            schoolAnnouncementDb.insertAll(schoolAnnouncementsToSave)
+            refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student))
+        }
+    )
+    fun getSchoolAnnouncementFromDatabase(student: Student): Flow<List<SchoolAnnouncement>> {
+        return schoolAnnouncementDb.loadAll(student.studentId)
+    }
+
+    suspend fun updateSchoolAnnouncement(schoolAnnouncement: List<SchoolAnnouncement>) = schoolAnnouncementDb.updateAll(schoolAnnouncement)
+}
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 927565b53..5495d0778 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
@@ -2,11 +2,14 @@ package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
+import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 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.mappers.mapToEntities
+import io.github.wulkanowy.data.pojos.TimetableFull
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.utils.AutoRefreshHelper
@@ -16,8 +19,8 @@ import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
 import java.time.LocalDate
 import javax.inject.Inject
@@ -27,6 +30,7 @@ import javax.inject.Singleton
 class TimetableRepository @Inject constructor(
     private val timetableDb: TimetableDao,
     private val timetableAdditionalDb: TimetableAdditionalDao,
+    private val timetableHeaderDb: TimetableHeaderDao,
     private val sdk: Sdk,
     private val schedulerHelper: TimetableNotificationSchedulerHelper,
     private val refreshHelper: AutoRefreshHelper,
@@ -36,53 +40,111 @@ class TimetableRepository @Inject constructor(
 
     private val cacheKey = "timetable"
 
-    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean, refreshAdditional: Boolean = false) = networkBoundResource(
+    fun getTimetable(
+        student: Student, semester: Semester, start: LocalDate, end: LocalDate,
+        forceRefresh: Boolean, refreshAdditional: Boolean = false
+    ) = networkBoundResource(
         mutex = saveFetchResultMutex,
-        shouldFetch = { (timetable, additional) -> timetable.isEmpty() || (additional.isEmpty() && refreshAdditional) || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) },
-        query = {
-            timetableDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)
-                .map { schedulerHelper.scheduleNotifications(it, student); it }
-                .combine(timetableAdditionalDb.loadAll(semester.diaryId, semester.studentId, start.monday, end.sunday)) { timetable, additional ->
-                    timetable to additional
-                }
-        },
-        fetch = {
-            sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
-                .getTimetable(start.monday, end.sunday)
-                .let { (normal, additional) -> normal.mapToEntities(semester) to additional.mapToEntities(semester) }
+        shouldFetch = { (timetable, additional, headers) ->
+            val refreshKey = getRefreshKey(cacheKey, semester, start, end)
+            val isShouldRefresh = refreshHelper.isShouldBeRefreshed(refreshKey)
+            val isRefreshAdditional = additional.isEmpty() && refreshAdditional
 
+            val isNoData = timetable.isEmpty() || isRefreshAdditional || headers.isEmpty()
+
+            isNoData || forceRefresh || isShouldRefresh
         },
-        saveFetchResult = { (oldTimetable, oldAdditional), (newTimetable, newAdditional) ->
-            refreshTimetable(student, oldTimetable, newTimetable)
-            refreshAdditional(oldAdditional, newAdditional)
+        query = { getFullTimetableFromDatabase(student, semester, start, end) },
+        fetch = {
+            val timetableFull = sdk.init(student)
+                .switchDiary(semester.diaryId, semester.schoolYear)
+                .getTimetableFull(start.monday, end.sunday)
+
+            timetableFull.mapToEntities(semester)
+        },
+        saveFetchResult = { timetableOld, timetableNew ->
+            refreshTimetable(student, timetableOld.lessons, timetableNew.lessons)
+            refreshAdditional(timetableOld.additional, timetableNew.additional)
+            refreshDayHeaders(timetableOld.headers, timetableNew.headers)
 
             refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, semester, start, end))
         },
-        filterResult = { (timetable, additional) ->
-            timetable.filter { item ->
-                item.date in start..end
-            } to additional.filter { item ->
-                item.date in start..end
-            }
+        filterResult = { (timetable, additional, headers) ->
+            TimetableFull(
+                lessons = timetable.filter { it.date in start..end },
+                additional = additional.filter { it.date in start..end },
+                headers = headers.filter { it.date in start..end }
+            )
         }
     )
 
-    private suspend fun refreshTimetable(student: Student, old: List<Timetable>, new: List<Timetable>) {
-        timetableDb.deleteAll(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
-        timetableDb.insertAll(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
-            item.also { new ->
-                old.singleOrNull { new.start == it.start }?.let { old ->
-                    return@map new.copy(
-                        room = if (new.room.isEmpty()) old.room else new.room,
-                        teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
-                    )
-                }
-            }
-        })
+    private fun getFullTimetableFromDatabase(
+        student: Student, semester: Semester,
+        start: LocalDate, end: LocalDate
+    ): Flow<TimetableFull> {
+        val timetableFlow = timetableDb.loadAll(
+            diaryId = semester.diaryId,
+            studentId = semester.studentId,
+            from = start.monday,
+            end = end.sunday
+        )
+        val headersFlow = timetableHeaderDb.loadAll(
+            diaryId = semester.diaryId,
+            studentId = semester.studentId,
+            from = start.monday,
+            end = end.sunday
+        )
+        val additionalFlow = timetableAdditionalDb.loadAll(
+            diaryId = semester.diaryId,
+            studentId = semester.studentId,
+            from = start.monday,
+            end = end.sunday
+        )
+        return combine(timetableFlow, headersFlow, additionalFlow) { lessons, headers, additional ->
+            schedulerHelper.scheduleNotifications(lessons, student)
+
+            TimetableFull(
+                lessons = lessons,
+                headers = headers,
+                additional = additional
+            )
+        }
     }
 
-    private suspend fun refreshAdditional(old: List<TimetableAdditional>, new: List<TimetableAdditional>) {
-        timetableAdditionalDb.deleteAll(old.uniqueSubtract(new))
-        timetableAdditionalDb.insertAll(new.uniqueSubtract(old))
+    private suspend fun refreshTimetable(
+        student: Student,
+        lessonsOld: List<Timetable>, lessonsNew: List<Timetable>
+    ) {
+        val lessonsToRemove = lessonsOld uniqueSubtract lessonsNew
+        val lessonsToAdd = (lessonsNew uniqueSubtract lessonsOld).map { new ->
+            val matchingOld = lessonsOld.singleOrNull { new.start == it.start }
+            if (matchingOld != null) {
+                val useOldTeacher = new.teacher.isEmpty() && !new.changes && !matchingOld.changes
+                new.copy(
+                    room = if (new.room.isEmpty()) matchingOld.room else new.room,
+                    teacher = if (useOldTeacher) matchingOld.teacher
+                    else new.teacher
+                )
+            } else new
+        }
+
+        timetableDb.deleteAll(lessonsToRemove)
+        timetableDb.insertAll(lessonsToAdd)
+
+        schedulerHelper.cancelScheduled(lessonsToRemove, student)
+        schedulerHelper.scheduleNotifications(lessonsToAdd, student)
+    }
+
+    private suspend fun refreshAdditional(
+        old: List<TimetableAdditional>,
+        new: List<TimetableAdditional>
+    ) {
+        timetableAdditionalDb.deleteAll(old uniqueSubtract new)
+        timetableAdditionalDb.insertAll(new uniqueSubtract old)
+    }
+
+    private suspend fun refreshDayHeaders(old: List<TimetableHeader>, new: List<TimetableHeader>) {
+        timetableHeaderDb.deleteAll(old uniqueSubtract new)
+        timetableHeaderDb.insertAll(new uniqueSubtract old)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
index 891f07da0..cdf0c26a9 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -15,14 +15,19 @@ import dagger.multibindings.IntoSet
 import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
+import io.github.wulkanowy.services.sync.channels.NewConferencesChannel
+import io.github.wulkanowy.services.sync.channels.NewExamChannel
 import io.github.wulkanowy.services.sync.channels.NewGradesChannel
+import io.github.wulkanowy.services.sync.channels.NewHomeworkChannel
 import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
 import io.github.wulkanowy.services.sync.channels.NewNotesChannel
+import io.github.wulkanowy.services.sync.channels.NewSchoolAnnouncementsChannel
 import io.github.wulkanowy.services.sync.channels.PushChannel
 import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
 import io.github.wulkanowy.services.sync.works.CompletedLessonWork
+import io.github.wulkanowy.services.sync.works.ConferenceWork
 import io.github.wulkanowy.services.sync.works.ExamWork
 import io.github.wulkanowy.services.sync.works.GradeStatisticsWork
 import io.github.wulkanowy.services.sync.works.GradeWork
@@ -31,6 +36,7 @@ import io.github.wulkanowy.services.sync.works.LuckyNumberWork
 import io.github.wulkanowy.services.sync.works.MessageWork
 import io.github.wulkanowy.services.sync.works.NoteWork
 import io.github.wulkanowy.services.sync.works.RecipientWork
+import io.github.wulkanowy.services.sync.works.SchoolAnnouncementWork
 import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
@@ -44,15 +50,18 @@ abstract class ServicesModule {
     companion object {
 
         @Provides
-        fun provideWorkManager(@ApplicationContext context: Context) = WorkManager.getInstance(context)
+        fun provideWorkManager(@ApplicationContext context: Context) =
+            WorkManager.getInstance(context)
 
         @Singleton
         @Provides
-        fun provideNotificationManager(@ApplicationContext context: Context) = NotificationManagerCompat.from(context)
+        fun provideNotificationManager(@ApplicationContext context: Context) =
+            NotificationManagerCompat.from(context)
 
         @Singleton
         @Provides
-        fun provideAlarmManager(@ApplicationContext context: Context): AlarmManager = context.getSystemService()!!
+        fun provideAlarmManager(@ApplicationContext context: Context): AlarmManager =
+            context.getSystemService()!!
     }
 
     @Binds
@@ -67,6 +76,10 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideAttendanceWork(work: AttendanceWork): Work
 
+    @Binds
+    @IntoSet
+    abstract fun provideConferenceWork(work: ConferenceWork): Work
+
     @Binds
     @IntoSet
     abstract fun provideExamWork(work: ExamWork): Work
@@ -107,6 +120,10 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideGradeStatistics(work: GradeStatisticsWork): Work
 
+    @Binds
+    @IntoSet
+    abstract fun provideSchoolAnnouncementWork(work: SchoolAnnouncementWork): Work
+
     @Binds
     @IntoSet
     abstract fun provideDebugChannel(channel: DebugChannel): Channel
@@ -115,6 +132,18 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideLuckyNumberChannel(channel: LuckyNumberChannel): Channel
 
+    @Binds
+    @IntoSet
+    abstract fun provideNewConferenceChannel(channel: NewConferencesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewExamChannel(channel: NewExamChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewHomeworkChannel(channel: NewHomeworkChannel): Channel
+
     @Binds
     @IntoSet
     abstract fun provideNewGradesChannel(channel: NewGradesChannel): Channel
@@ -127,6 +156,10 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideNewNotesChannel(channel: NewNotesChannel): Channel
 
+    @Binds
+    @IntoSet
+    abstract fun provideNewSchoolAnnouncementChannel(channel: NewSchoolAnnouncementsChannel): Channel
+
     @Binds
     @IntoSet
     abstract fun providePushChannel(channel: PushChannel): Channel
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
index 8eefc032f..406d91f5f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.services.alarm
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
@@ -20,6 +19,7 @@ import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.toLocalDateTime
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -50,7 +50,7 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() {
         const val LESSON_END = "end_timestamp"
     }
 
-    @SuppressLint("CheckResult")
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
         Timber.d("Receiving intent... ${intent.toUri(0)}")
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
index c5a5590b9..98bd93eb8 100644
--- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
@@ -51,7 +51,8 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
         lesson: Timetable
     ) = day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
 
-    suspend fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
+    suspend fun cancelScheduled(lessons: List<Timetable>, student: Student) {
+        val studentId = student.studentId
         withContext(dispatchersProvider.backgroundThread) {
             lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
                 val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
@@ -78,7 +79,7 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
 
     suspend fun scheduleNotifications(lessons: List<Timetable>, student: Student) {
         if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) {
-            return cancelScheduled(lessons, student.studentId)
+            return cancelScheduled(lessons, student)
         }
 
         withContext(dispatchersProvider.backgroundThread) {
@@ -89,7 +90,7 @@ class TimetableNotificationSchedulerHelper @Inject constructor(
                     val canceled = day.filter { it.canceled }
                     val active = day.filter { !it.canceled }
 
-                    cancelScheduled(canceled)
+                    cancelScheduled(canceled, student)
                     active.forEachIndexed { index, lesson ->
                         val intent = createIntent(student, lesson, active.getOrNull(index + 1))
 
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 8b6bc65d1..ea1f79cbf 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -22,6 +22,8 @@ import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.getCompatColor
 import kotlinx.coroutines.coroutineScope
 import timber.log.Timber
+import java.time.LocalDateTime
+import java.time.ZoneId
 import kotlin.random.Random
 
 @HiltWorker
@@ -48,6 +50,7 @@ class SyncWorker @AssistedInject constructor(
                 Timber.i("${work::class.java.simpleName} is starting")
                 work.doWork(student, semester)
                 Timber.i("${work::class.java.simpleName} result: Success")
+                preferencesRepository.lasSyncDate = LocalDateTime.now(ZoneId.systemDefault())
                 null
             } catch (e: Throwable) {
                 Timber.w("${work::class.java.simpleName} result: An exception ${e.message} occurred")
@@ -81,7 +84,7 @@ class SyncWorker @AssistedInject constructor(
             Random.nextInt(Int.MAX_VALUE),
             NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
                 .setContentTitle("Debug notification")
-                .setSmallIcon(R.drawable.ic_stat_push)
+                .setSmallIcon(R.drawable.ic_stat_all)
                 .setAutoCancel(true)
                 .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
                 .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewConferencesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewConferencesChannel.kt
new file mode 100644
index 000000000..397e67c6b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewConferencesChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewConferencesChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_conferences_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_conference), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewExamChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewExamChannel.kt
new file mode 100644
index 000000000..1bf5f8555
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewExamChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewExamChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_exam_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_exam), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewHomeworkChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewHomeworkChannel.kt
new file mode 100644
index 000000000..4b7dd0e9a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewHomeworkChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewHomeworkChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_homework_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_homework), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewSchoolAnnouncementsChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewSchoolAnnouncementsChannel.kt
new file mode 100644
index 000000000..2b21ba408
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewSchoolAnnouncementsChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewSchoolAnnouncementsChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_school_announcements_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_school_announcement), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/BaseNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/BaseNotification.kt
new file mode 100644
index 000000000..8c9cb471d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/BaseNotification.kt
@@ -0,0 +1,102 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.app.PendingIntent
+import android.content.Context
+import android.os.Build
+import androidx.annotation.PluralsRes
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.data.pojos.Notification
+import io.github.wulkanowy.data.pojos.OneNotification
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.utils.getCompatBitmap
+import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.utils.nickOrName
+import kotlin.random.Random
+
+abstract class BaseNotification(
+    private val context: Context,
+    private val notificationManager: NotificationManagerCompat,
+) {
+
+    protected fun sendNotification(notification: Notification, student: Student) =
+        when (notification) {
+            is OneNotification -> sendOneNotification(notification, student)
+            is MultipleNotifications -> sendMultipleNotifications(notification, student)
+        }
+
+    private fun sendOneNotification(notification: OneNotification, student: Student?) {
+        notificationManager.notify(
+            Random.nextInt(Int.MAX_VALUE),
+            getNotificationBuilder(notification).apply {
+                val content = context.getString(
+                    notification.contentStringRes,
+                    *notification.contentValues.toTypedArray()
+                )
+                setContentTitle(context.getString(notification.titleStringRes))
+                setContentText(content)
+                setStyle(
+                    NotificationCompat.BigTextStyle()
+                        .setSummaryText(student?.nickOrName)
+                        .bigText(content)
+                )
+            }.build()
+        )
+    }
+
+    private fun sendMultipleNotifications(notification: MultipleNotifications, student: Student) {
+        val group = notification.type.group + student.id
+        val groupId = student.id * 100 + notification.type.ordinal
+
+        notification.lines.forEach { item ->
+            notificationManager.notify(
+                Random.nextInt(Int.MAX_VALUE),
+                getNotificationBuilder(notification).apply {
+                    setContentTitle(getQuantityString(notification.titleStringRes, 1))
+                    setContentText(item)
+                    setStyle(
+                        NotificationCompat.BigTextStyle()
+                            .setSummaryText(student.nickOrName)
+                            .bigText(item)
+                    )
+                    setGroup(group)
+                }.build()
+            )
+        }
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return
+
+        notificationManager.notify(
+            groupId.toInt(),
+            getNotificationBuilder(notification).apply {
+                setSmallIcon(notification.icon)
+                setGroup(group)
+                setStyle(NotificationCompat.InboxStyle().setSummaryText(student.nickOrName))
+                setGroupSummary(true)
+            }.build()
+        )
+    }
+
+    private fun getNotificationBuilder(notification: Notification) = NotificationCompat
+        .Builder(context, notification.type.channel)
+        .setLargeIcon(context.getCompatBitmap(notification.icon, R.color.colorPrimary))
+        .setSmallIcon(R.drawable.ic_stat_all)
+        .setAutoCancel(true)
+        .setDefaults(NotificationCompat.DEFAULT_ALL)
+        .setPriority(NotificationCompat.PRIORITY_HIGH)
+        .setColor(context.getCompatColor(R.color.colorPrimary))
+        .setContentIntent(
+            PendingIntent.getActivity(
+                context, notification.startMenu.id,
+                MainActivity.getStartIntent(context, notification.startMenu, true),
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        )
+
+    private fun getQuantityString(@PluralsRes id: Int, value: Int): String {
+        return context.resources.getQuantityString(id, value, value)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt
new file mode 100644
index 000000000..fda2922f9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Conference
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.toFormattedString
+import java.time.LocalDateTime
+import javax.inject.Inject
+
+class NewConferenceNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notify(items: List<Conference>, student: Student) {
+        val today = LocalDateTime.now()
+        val lines = items.filter { !it.date.isBefore(today) }.map {
+            "${it.date.toFormattedString("dd.MM")} - ${it.title}: ${it.subject}"
+        }.ifEmpty { return }
+
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_CONFERENCE,
+            icon = R.drawable.ic_more_conferences,
+            titleStringRes = R.plurals.conference_notify_new_item_title,
+            contentStringRes = R.plurals.conference_notify_new_items,
+            summaryStringRes = R.plurals.conference_number_item,
+            startMenu = MainView.Section.CONFERENCE,
+            lines = lines
+        )
+
+        sendNotification(notification, student)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt
new file mode 100644
index 000000000..d493c4d2e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.toFormattedString
+import java.time.LocalDate
+import javax.inject.Inject
+
+class NewExamNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notify(items: List<Exam>, student: Student) {
+        val today = LocalDate.now()
+        val lines = items.filter { !it.date.isBefore(today) }.map {
+            "${it.date.toFormattedString("dd.MM")} - ${it.subject}: ${it.description}"
+        }.ifEmpty { return }
+
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_EXAM,
+            icon = R.drawable.ic_main_exam,
+            titleStringRes = R.plurals.exam_notify_new_item_title,
+            contentStringRes = R.plurals.exam_notify_new_item_content,
+            summaryStringRes = R.plurals.exam_number_item,
+            startMenu = MainView.Section.EXAM,
+            lines = lines
+        )
+
+        sendNotification(notification, student)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
new file mode 100644
index 000000000..415ba3434
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewGradeNotification.kt
@@ -0,0 +1,66 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+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.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+class NewGradeNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notifyDetails(items: List<Grade>, student: Student) {
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_GRADE_DETAILS,
+            icon = R.drawable.ic_stat_grade,
+            titleStringRes = R.plurals.grade_new_items,
+            contentStringRes = R.plurals.grade_notify_new_items,
+            summaryStringRes = R.plurals.grade_number_item,
+            startMenu = MainView.Section.GRADE,
+            lines = items.map {
+                "${it.subject}: ${it.entry}"
+            }
+        )
+
+        sendNotification(notification, student)
+    }
+
+    fun notifyPredicted(items: List<GradeSummary>, student: Student) {
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_GRADE_PREDICTED,
+            icon = R.drawable.ic_stat_grade,
+            titleStringRes = R.plurals.grade_new_items_predicted,
+            contentStringRes = R.plurals.grade_notify_new_items_predicted,
+            summaryStringRes = R.plurals.grade_number_item,
+            startMenu = MainView.Section.GRADE,
+            lines = items.map {
+                "${it.subject}: ${it.predictedGrade}"
+            }
+        )
+
+        sendNotification(notification, student)
+    }
+
+    fun notifyFinal(items: List<GradeSummary>, student: Student) {
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_GRADE_FINAL,
+            icon = R.drawable.ic_stat_grade,
+            titleStringRes = R.plurals.grade_new_items_final,
+            contentStringRes = R.plurals.grade_notify_new_items_final,
+            summaryStringRes = R.plurals.grade_number_item,
+            startMenu = MainView.Section.GRADE,
+            lines = items.map {
+                "${it.subject}: ${it.finalGrade}"
+            }
+        )
+
+        sendNotification(notification, student)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt
new file mode 100644
index 000000000..fe973cade
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.toFormattedString
+import java.time.LocalDate
+import javax.inject.Inject
+
+class NewHomeworkNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notify(items: List<Homework>, student: Student) {
+        val today = LocalDate.now()
+        val lines = items.filter { !it.date.isBefore(today) }.map {
+            "${it.date.toFormattedString("dd.MM")} - ${it.subject}: ${it.content}"
+        }.ifEmpty { return }
+
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_HOMEWORK,
+            icon = R.drawable.ic_more_homework,
+            titleStringRes = R.plurals.homework_notify_new_item_title,
+            contentStringRes = R.plurals.homework_notify_new_item_content,
+            summaryStringRes = R.plurals.homework_number_item,
+            startMenu = MainView.Section.HOMEWORK,
+            lines = lines
+        )
+
+        sendNotification(notification, student)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt
new file mode 100644
index 000000000..95156c451
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewLuckyNumberNotification.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.OneNotification
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+class NewLuckyNumberNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notify(item: LuckyNumber, student: Student) {
+        val notification = OneNotification(
+            type = NotificationType.NEW_LUCKY_NUMBER,
+            icon = R.drawable.ic_stat_luckynumber,
+            titleStringRes = R.string.lucky_number_notify_new_item_title,
+            contentStringRes = R.string.lucky_number_notify_new_item,
+            startMenu = MainView.Section.LUCKY_NUMBER,
+            contentValues = listOf(item.luckyNumber.toString())
+        )
+
+        sendNotification(notification, student)
+    }
+}
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
new file mode 100644
index 000000000..fc3641983
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewMessageNotification.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+class NewMessageNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notify(items: List<Message>, student: Student) {
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_MESSAGE,
+            icon = R.drawable.ic_stat_message,
+            titleStringRes = R.plurals.message_new_items,
+            contentStringRes = R.plurals.message_notify_new_items,
+            summaryStringRes = R.plurals.message_number_item,
+            startMenu = MainView.Section.MESSAGE,
+            lines = items.map {
+                "${it.sender}: ${it.subject}"
+            }
+        )
+
+        sendNotification(notification, student)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt
new file mode 100644
index 000000000..f355341b7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewNoteNotification.kt
@@ -0,0 +1,46 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+class NewNoteNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notify(items: List<Note>, student: Student) {
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_NOTE,
+            icon = R.drawable.ic_stat_note,
+            titleStringRes = when (NoteCategory.getByValue(items.first().categoryType)) {
+                NoteCategory.POSITIVE -> R.plurals.praise_new_items
+                NoteCategory.NEUTRAL -> R.plurals.neutral_note_new_items
+                else -> R.plurals.note_new_items
+            },
+            contentStringRes = when (NoteCategory.getByValue(items.first().categoryType)) {
+                NoteCategory.POSITIVE -> R.plurals.praise_notify_new_items
+                NoteCategory.NEUTRAL -> R.plurals.neutral_note_notify_new_items
+                else -> R.plurals.note_notify_new_items
+            },
+            summaryStringRes = when (NoteCategory.getByValue(items.first().categoryType)) {
+                NoteCategory.POSITIVE -> R.plurals.praise_number_item
+                NoteCategory.NEUTRAL -> R.plurals.neutral_note_number_item
+                else -> R.plurals.note_number_item
+            },
+            startMenu = MainView.Section.NOTE,
+            lines = items.map {
+                "${it.teacher}: ${it.category}"
+            }
+        )
+
+        sendNotification(notification, student)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt
new file mode 100644
index 000000000..b38e4f609
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewSchoolAnnouncementNotification.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.MultipleNotifications
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+class NewSchoolAnnouncementNotification @Inject constructor(
+    @ApplicationContext private val context: Context,
+    notificationManager: NotificationManagerCompat,
+) : BaseNotification(context, notificationManager) {
+
+    fun notify(items: List<SchoolAnnouncement>, student: Student) {
+        val notification = MultipleNotifications(
+            type = NotificationType.NEW_ANNOUNCEMENT,
+            icon = R.drawable.ic_all_about,
+            titleStringRes = R.plurals.school_announcement_notify_new_item_title,
+            contentStringRes = R.plurals.school_announcement_notify_new_items,
+            summaryStringRes = R.plurals.school_announcement_number_item,
+            startMenu = MainView.Section.SCHOOL_ANNOUNCEMENT,
+            lines = items.map {
+                "${it.subject}: ${it.content}"
+            }
+        )
+
+        sendNotification(notification, student)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NotificationType.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NotificationType.kt
new file mode 100644
index 000000000..c3df1960f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NotificationType.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.services.sync.notifications
+
+import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
+import io.github.wulkanowy.services.sync.channels.NewConferencesChannel
+import io.github.wulkanowy.services.sync.channels.NewExamChannel
+import io.github.wulkanowy.services.sync.channels.NewGradesChannel
+import io.github.wulkanowy.services.sync.channels.NewHomeworkChannel
+import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
+import io.github.wulkanowy.services.sync.channels.NewNotesChannel
+import io.github.wulkanowy.services.sync.channels.NewSchoolAnnouncementsChannel
+
+enum class NotificationType(val group: String, val channel: String) {
+    NEW_CONFERENCE("new_conferences_group", NewConferencesChannel.CHANNEL_ID),
+    NEW_EXAM("new_exam_group", NewExamChannel.CHANNEL_ID),
+    NEW_GRADE_DETAILS("new_grade_details_group", NewGradesChannel.CHANNEL_ID),
+    NEW_GRADE_PREDICTED("new_grade_predicted_group", NewGradesChannel.CHANNEL_ID),
+    NEW_GRADE_FINAL("new_grade_final_group", NewGradesChannel.CHANNEL_ID),
+    NEW_HOMEWORK("new_homework_group", NewHomeworkChannel.CHANNEL_ID),
+    NEW_LUCKY_NUMBER("lucky_number_group", LuckyNumberChannel.CHANNEL_ID),
+    NEW_MESSAGE("new_message_group", NewMessagesChannel.CHANNEL_ID),
+    NEW_NOTE("new_notes_group", NewNotesChannel.CHANNEL_ID),
+    NEW_ANNOUNCEMENT("new_school_announcements_group", NewSchoolAnnouncementsChannel.CHANNEL_ID),
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ConferenceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ConferenceWork.kt
new file mode 100644
index 000000000..002b4f764
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ConferenceWork.kt
@@ -0,0 +1,35 @@
+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.repositories.ConferenceRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.services.sync.notifications.NewConferenceNotification
+import io.github.wulkanowy.utils.waitForResult
+import kotlinx.coroutines.flow.first
+import javax.inject.Inject
+
+class ConferenceWork @Inject constructor(
+    private val conferenceRepository: ConferenceRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val newConferenceNotification: NewConferenceNotification,
+) : Work {
+
+    override suspend fun doWork(student: Student, semester: Semester) {
+        conferenceRepository.getConferences(
+            student = student,
+            semester = semester,
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
+
+        conferenceRepository.getConferenceFromDatabase(semester).first()
+            .filter { !it.isNotified }.let {
+                if (it.isNotEmpty()) newConferenceNotification.notify(it, student)
+
+                conferenceRepository.updateConference(it.onEach { conference ->
+                    conference.isNotified = true
+                })
+            }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
index b75499301..a1ce553a7 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -3,13 +3,34 @@ 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.repositories.ExamRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.services.sync.notifications.NewExamNotification
 import io.github.wulkanowy.utils.waitForResult
+import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
 
-class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
+class ExamWork @Inject constructor(
+    private val examRepository: ExamRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val newExamNotification: NewExamNotification,
+) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester) {
-        examRepository.getExams(student, semester, now(), now(), true).waitForResult()
+        examRepository.getExams(
+            student = student,
+            semester = semester,
+            start = now(),
+            end = now(),
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
+
+        examRepository.getExamsFromDatabase(semester, now()).first()
+            .filter { !it.isNotified }.let {
+                if (it.isNotEmpty()) newExamNotification.notify(it, student)
+
+                examRepository.updateExam(it.onEach { exam -> exam.isNotified = true })
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index 19c26edd0..0932405eb 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -1,103 +1,51 @@
 package io.github.wulkanowy.services.sync.works
 
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationCompat.DEFAULT_ALL
-import androidx.core.app.NotificationCompat.PRIORITY_HIGH
-import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
-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.db.entities.Semester
 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.services.sync.channels.NewGradesChannel
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.services.sync.notifications.NewGradeNotification
 import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
-import kotlin.random.Random
 
 class GradeWork @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val notificationManager: NotificationManagerCompat,
     private val gradeRepository: GradeRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
+    private val newGradeNotification: NewGradeNotification,
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester) {
-        gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
+        gradeRepository.getGrades(
+            student = student,
+            semester = semester,
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
 
-        gradeRepository.getNotNotifiedGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyDetails(it)
-            gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
-        }
+        gradeRepository.getGradesFromDatabase(semester).first()
+            .filter { !it.isNotified }.let {
+                if (it.isNotEmpty()) newGradeNotification.notifyDetails(it, student)
 
-        gradeRepository.getNotNotifiedPredictedGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyPredicted(it)
-            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isPredictedGradeNotified = true })
-        }
+                gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
+            }
 
-        gradeRepository.getNotNotifiedFinalGrades(semester).first().let {
-            if (it.isNotEmpty()) notifyFinal(it)
-            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isFinalGradeNotified = true })
-        }
-    }
+        gradeRepository.getGradesPredictedFromDatabase(semester).first()
+            .filter { !it.isPredictedGradeNotified }.let {
+                if (it.isNotEmpty()) newGradeNotification.notifyPredicted(it, student)
 
-    private fun getNotificationBuilder(): NotificationCompat.Builder {
-        return NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
-            .setSmallIcon(R.drawable.ic_stat_grade)
-            .setAutoCancel(true)
-            .setPriority(PRIORITY_HIGH)
-            .setDefaults(DEFAULT_ALL)
-            .setColor(context.getCompatColor(R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, MainView.Section.GRADE.id,
-                    MainActivity.getStartIntent(context, MainView.Section.GRADE, true), FLAG_UPDATE_CURRENT))
-    }
+                gradeRepository.updateGradesSummary(it.onEach { grade ->
+                    grade.isPredictedGradeNotified = true
+                })
+            }
 
-    private fun notifyDetails(grades: List<Grade>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
-                grades.forEach { addLine("${it.subject}: ${it.entry}") }
-                this
-            })
-            .build()
-        )
-    }
+        gradeRepository.getGradesFinalFromDatabase(semester).first()
+            .filter { !it.isFinalGradeNotified }.let {
+                if (it.isNotEmpty()) newGradeNotification.notifyFinal(it, student)
 
-    private fun notifyPredicted(gradesSummary: List<GradeSummary>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items_predicted, gradesSummary.size, gradesSummary.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items_predicted, gradesSummary.size, gradesSummary.size))
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, gradesSummary.size, gradesSummary.size))
-                gradesSummary.forEach { addLine("${it.subject}: ${it.predictedGrade}") }
-                this
-            })
-            .build()
-        )
-    }
-
-    private fun notifyFinal(gradesSummary: List<GradeSummary>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items_final, gradesSummary.size, gradesSummary.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items_final, gradesSummary.size, gradesSummary.size))
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, gradesSummary.size, gradesSummary.size))
-                gradesSummary.forEach { addLine("${it.subject}: ${it.finalGrade}") }
-                this
-            })
-            .build()
-        )
+                gradeRepository.updateGradesSummary(it.onEach { grade ->
+                    grade.isFinalGradeNotified = true
+                })
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
index a16841e9a..da2dcc7fe 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -3,15 +3,38 @@ 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.repositories.HomeworkRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.services.sync.notifications.NewHomeworkNotification
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.waitForResult
+import kotlinx.coroutines.flow.first
 import java.time.LocalDate.now
 import javax.inject.Inject
 
-class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
+class HomeworkWork @Inject constructor(
+    private val homeworkRepository: HomeworkRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val newHomeworkNotification: NewHomeworkNotification,
+) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester) {
-        homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).waitForResult()
+        homeworkRepository.getHomework(
+            student = student,
+            semester = semester,
+            start = now().monday,
+            end = now().sunday,
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
+
+        homeworkRepository.getHomeworkFromDatabase(semester, now().monday, now().sunday).first()
+            .filter { !it.isNotified }.let {
+                if (it.isNotEmpty()) newHomeworkNotification.notify(it, student)
+
+                homeworkRepository.updateHomework(it.onEach { homework ->
+                    homework.isNotified = true
+                })
+            }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index 9f5365535..348f92142 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -1,55 +1,29 @@
 package io.github.wulkanowy.services.sync.works
 
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationCompat.DEFAULT_ALL
-import androidx.core.app.NotificationCompat.PRIORITY_HIGH
-import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.services.sync.notifications.NewLuckyNumberNotification
 import io.github.wulkanowy.utils.waitForResult
 import javax.inject.Inject
-import kotlin.random.Random
 
 class LuckyNumberWork @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val notificationManager: NotificationManagerCompat,
     private val luckyNumberRepository: LuckyNumberRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
+    private val newLuckyNumberNotification: NewLuckyNumberNotification,
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester) {
-        luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable).waitForResult()
+        luckyNumberRepository.getLuckyNumber(
+            student = student,
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
 
         luckyNumberRepository.getNotNotifiedLuckyNumber(student)?.let {
-            notify(it)
+            newLuckyNumberNotification.notify(it, student)
             luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
         }
     }
-
-    private fun notify(luckyNumber: LuckyNumber) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, LuckyNumberChannel.CHANNEL_ID)
-            .setContentTitle(context.getString(R.string.lucky_number_notify_new_item_title))
-            .setContentText(context.getString(R.string.lucky_number_notify_new_item, luckyNumber.luckyNumber))
-            .setSmallIcon(R.drawable.ic_stat_luckynumber)
-            .setAutoCancel(true)
-            .setDefaults(DEFAULT_ALL)
-            .setPriority(PRIORITY_HIGH)
-            .setColor(context.getCompatColor(R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT))
-            .build())
-    }
 }
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 93c30b57c..b5624a76d 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
@@ -1,63 +1,34 @@
 package io.github.wulkanowy.services.sync.works
 
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationCompat.DEFAULT_ALL
-import androidx.core.app.NotificationCompat.PRIORITY_HIGH
-import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
 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.MessageRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.services.sync.notifications.NewMessageNotification
 import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
-import kotlin.random.Random
 
 class MessageWork @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val notificationManager: NotificationManagerCompat,
     private val messageRepository: MessageRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
+    private val newMessageNotification: NewMessageNotification,
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester) {
-        messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable).waitForResult()
+        messageRepository.getMessages(
+            student = student,
+            semester = semester,
+            folder = RECEIVED,
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
 
-        messageRepository.getNotNotifiedMessages(student).first().let {
-            if (it.isNotEmpty()) notify(it)
-            messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
-        }
-    }
-
-    private fun notify(messages: List<Message>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewMessagesChannel.CHANNEL_ID)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, messages.size, messages.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.message_notify_new_items, messages.size, messages.size))
-            .setSmallIcon(R.drawable.ic_stat_message)
-            .setAutoCancel(true)
-            .setDefaults(DEFAULT_ALL)
-            .setPriority(PRIORITY_HIGH)
-            .setColor(context.getCompatColor(R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, MainView.Section.MESSAGE.id,
-                    MainActivity.getStartIntent(context, MainView.Section.MESSAGE, true), FLAG_UPDATE_CURRENT)
-            )
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.message_number_item, messages.size, messages.size))
-                messages.forEach { addLine("${it.sender}: ${it.subject}") }
-                this
-            })
-            .build())
+        messageRepository.getMessagesFromDatabase(student).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/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index 50f418ed3..6f18eddf1 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -1,83 +1,34 @@
 package io.github.wulkanowy.services.sync.works
 
-import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationCompat.DEFAULT_ALL
-import androidx.core.app.NotificationCompat.PRIORITY_HIGH
-import androidx.core.app.NotificationManagerCompat
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.NoteRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
-import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
-import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory.NEUTRAL
-import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory.POSITIVE
-import io.github.wulkanowy.services.sync.channels.NewNotesChannel
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.services.sync.notifications.NewNoteNotification
 import io.github.wulkanowy.utils.waitForResult
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
-import kotlin.random.Random
 
 class NoteWork @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val notificationManager: NotificationManagerCompat,
     private val noteRepository: NoteRepository,
-    private val preferencesRepository: PreferencesRepository
+    private val preferencesRepository: PreferencesRepository,
+    private val newNoteNotification: NewNoteNotification,
 ) : Work {
 
     override suspend fun doWork(student: Student, semester: Semester) {
-        noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
+        noteRepository.getNotes(
+            student = student,
+            semester = semester,
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
 
-        noteRepository.getNotNotifiedNotes(student).first().let {
-            if (it.isNotEmpty()) notify(it)
-            noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
-        }
-    }
+        noteRepository.getNotesFromDatabase(student).first()
+            .filter { !it.isNotified }.let {
+                if (it.isNotEmpty()) newNoteNotification.notify(it, student)
 
-    private fun notify(notes: List<Note>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewNotesChannel.CHANNEL_ID)
-            .setContentTitle(
-                when (NoteCategory.getByValue(notes.first().categoryType)) {
-                    POSITIVE -> context.resources.getQuantityString(R.plurals.praise_new_items, notes.size, notes.size)
-                    NEUTRAL -> context.resources.getQuantityString(R.plurals.neutral_note_new_items, notes.size, notes.size)
-                    else -> context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size)
-                }
-            )
-            .setContentText(
-                when (NoteCategory.getByValue(notes.first().categoryType)) {
-                    POSITIVE -> context.resources.getQuantityString(R.plurals.praise_notify_new_items, notes.size, notes.size)
-                    NEUTRAL -> context.resources.getQuantityString(R.plurals.neutral_note_notify_new_items, notes.size, notes.size)
-                    else -> context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size)
-                }
-            )
-            .setSmallIcon(R.drawable.ic_stat_note)
-            .setAutoCancel(true)
-            .setDefaults(DEFAULT_ALL)
-            .setPriority(PRIORITY_HIGH)
-            .setColor(context.getCompatColor(R.color.colorPrimary))
-            .setContentIntent(
-                PendingIntent.getActivity(context, MainView.Section.NOTE.id,
-                    MainActivity.getStartIntent(context, MainView.Section.NOTE, true), FLAG_UPDATE_CURRENT))
-            .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(
-                    when (NoteCategory.getByValue(notes.first().categoryType)) {
-                        POSITIVE -> context.resources.getQuantityString(R.plurals.praise_number_item, notes.size, notes.size)
-                        NEUTRAL -> context.resources.getQuantityString(R.plurals.neutral_note_number_item, notes.size, notes.size)
-                        else -> context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size)
-                    }
-                )
-                notes.forEach { addLine("${it.teacher}: ${it.category}") }
-                this
-            })
-            .build())
+                noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
+            }
     }
 }
 
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
new file mode 100644
index 000000000..268992f46
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/SchoolAnnouncementWork.kt
@@ -0,0 +1,35 @@
+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.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
+import io.github.wulkanowy.services.sync.notifications.NewSchoolAnnouncementNotification
+import io.github.wulkanowy.utils.waitForResult
+import kotlinx.coroutines.flow.first
+import javax.inject.Inject
+
+class SchoolAnnouncementWork @Inject constructor(
+    private val schoolAnnouncementRepository: SchoolAnnouncementRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val newSchoolAnnouncementNotification: NewSchoolAnnouncementNotification,
+) : Work {
+
+    override suspend fun doWork(student: Student, semester: Semester) {
+        schoolAnnouncementRepository.getSchoolAnnouncements(
+            student = student,
+            forceRefresh = true,
+            notify = preferencesRepository.isNotificationsEnable
+        ).waitForResult()
+
+
+        schoolAnnouncementRepository.getSchoolAnnouncementFromDatabase(student).first()
+            .filter { !it.isNotified }.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/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index 9b93953d4..0521b4a08 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
@@ -3,8 +3,6 @@ package io.github.wulkanowy.ui.base
 import android.app.ActivityManager
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -19,6 +17,7 @@ import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.lifecycleAwareVariable
+import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
 abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
@@ -43,12 +42,10 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 
-        if (SDK_INT >= LOLLIPOP) {
-            @Suppress("DEPRECATION")
-            setTaskDescription(
-                ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface))
-            )
-        }
+        @Suppress("DEPRECATION")
+        setTaskDescription(
+            ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface))
+        )
     }
 
     override fun showError(text: String, error: Throwable) {
@@ -77,6 +74,14 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
             .show()
     }
 
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        messageContainer?.let {
+            Snackbar.make(it, R.string.error_password_change_required, LENGTH_LONG)
+                .setAction(R.string.all_change) { openInternetBrowser(redirectUrl) }
+                .show()
+        }
+    }
+
     override fun openClearLoginView() {
         startActivity(LoginActivity.getStartIntent(this)
             .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) })
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 1c31976ee..25a53395d 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
@@ -30,6 +30,10 @@ abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
 
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
+    }
+
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
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 c6a2e1d1c..dbc5af3a9 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
@@ -45,4 +45,8 @@ abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragme
     override fun openClearLoginView() {
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
+
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
+    }
 }
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 b222b0abb..be5300499 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
@@ -34,6 +34,7 @@ open class BasePresenter<T : BaseView>(
             showErrorMessage = view::showError
             onSessionExpired = view::showExpiredDialog
             onNoCurrentStudent = view::openClearLoginView
+            onPasswordChangeRequired = view::showChangePasswordSnackbar
         }
     }
 
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 0f4df92cd..d3165ea44 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
@@ -11,4 +11,6 @@ interface BaseView {
     fun openClearLoginView()
 
     fun showErrorDetailsDialog(error: Throwable)
+
+    fun showChangePasswordSnackbar(redirectUrl: String)
 }
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 34dd3ec16..7c32ef184 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.res.Resources
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
+import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
 import io.github.wulkanowy.utils.getString
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
@@ -16,6 +17,8 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources)
 
     var onNoCurrentStudent: () -> Unit = {}
 
+    var onPasswordChangeRequired: (String) -> Unit = {}
+
     fun dispatch(error: Throwable) {
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
@@ -24,6 +27,7 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources)
     protected open fun proceed(error: Throwable) {
         showErrorMessage(resources.getString(error), error)
         when (error) {
+            is PasswordChangeRequiredException -> onPasswordChangeRequired(error.redirectUrl)
             is ScramblerException, is BadCredentialsException -> onSessionExpired()
             is NoCurrentStudentException -> onNoCurrentStudent()
         }
@@ -33,5 +37,6 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources)
         showErrorMessage = { _, _ -> }
         onSessionExpired = {}
         onNoCurrentStudent = {}
+        onPasswordChangeRequired = {}
     }
 }
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 1c613800d..1bf5c7ad9 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
@@ -10,7 +10,7 @@ import io.github.wulkanowy.databinding.FragmentAboutBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
 import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
-import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
+import io.github.wulkanowy.ui.modules.debug.DebugFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
@@ -37,34 +37,69 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
 
     override val versionRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            val buildTimestamp = appInfo.buildTimestamp.toLocalDateTime().toFormattedString("yyyy-MM-dd")
-            val versionSignature = "${appInfo.versionName}-${appInfo.buildFlavor} (${appInfo.versionCode}), $buildTimestamp"
-            Triple(getString(R.string.about_version), versionSignature, getCompatDrawable(R.drawable.ic_all_about))
+            val buildTimestamp =
+                appInfo.buildTimestamp.toLocalDateTime().toFormattedString("yyyy-MM-dd")
+            val versionSignature =
+                "${appInfo.versionName}-${appInfo.buildFlavor} (${appInfo.versionCode}), $buildTimestamp"
+            Triple(
+                getString(R.string.about_version),
+                versionSignature,
+                getCompatDrawable(R.drawable.ic_all_about)
+            )
         }
 
     override val creatorsRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_contributor), getString(R.string.about_contributor_summary), getCompatDrawable(R.drawable.ic_about_creator))
+            Triple(
+                getString(R.string.about_contributor),
+                getString(R.string.about_contributor_summary),
+                getCompatDrawable(R.drawable.ic_about_creator)
+            )
         }
 
     override val feedbackRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_feedback), getString(R.string.about_feedback_summary), getCompatDrawable(R.drawable.ic_about_feedback))
+            Triple(
+                getString(R.string.about_feedback),
+                getString(R.string.about_feedback_summary),
+                getCompatDrawable(R.drawable.ic_about_feedback)
+            )
         }
 
     override val faqRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_faq), getString(R.string.about_faq_summary), getCompatDrawable(R.drawable.ic_about_faq))
+            Triple(
+                getString(R.string.about_faq),
+                getString(R.string.about_faq_summary),
+                getCompatDrawable(R.drawable.ic_about_faq)
+            )
         }
 
     override val discordRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_discord), getString(R.string.about_discord_summary), getCompatDrawable(R.drawable.ic_about_discord))
+            Triple(
+                getString(R.string.about_discord),
+                getString(R.string.about_discord_summary),
+                getCompatDrawable(R.drawable.ic_about_discord)
+            )
         }
 
     override val facebookRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_facebook), getString(R.string.about_facebook_summary), getCompatDrawable(R.drawable.ic_about_facebook))
+            Triple(
+                getString(R.string.about_facebook),
+                getString(R.string.about_facebook_summary),
+                getCompatDrawable(R.drawable.ic_about_facebook)
+            )
+        }
+
+    override val twitterRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(
+                getString(R.string.about_twitter),
+                getString(R.string.about_twitter_summary),
+                getCompatDrawable(R.drawable.ic_about_twitter)
+            )
         }
 
     override val homepageRes: Triple<String, String, Drawable?>?
@@ -78,12 +113,20 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
 
     override val licensesRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_licenses), getString(R.string.about_licenses_summary), getCompatDrawable(R.drawable.ic_about_licenses))
+            Triple(
+                getString(R.string.about_licenses),
+                getString(R.string.about_licenses_summary),
+                getCompatDrawable(R.drawable.ic_about_licenses)
+            )
         }
 
     override val privacyRes: Triple<String, String, Drawable?>?
         get() = context?.run {
-            Triple(getString(R.string.about_privacy), getString(R.string.about_privacy_summary), getCompatDrawable(R.drawable.ic_about_privacy))
+            Triple(
+                getString(R.string.about_privacy),
+                getString(R.string.about_privacy_summary),
+                getCompatDrawable(R.drawable.ic_about_privacy)
+            )
         }
 
     override val titleStringId get() = R.string.about_title
@@ -118,8 +161,8 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
         context?.openAppInMarket(::showMessage)
     }
 
-    override fun openLogViewer() {
-        (activity as? MainActivity)?.pushView(LogViewerFragment.newInstance())
+    override fun openDebugScreen() {
+        (activity as? MainActivity)?.pushView(DebugFragment.newInstance())
     }
 
     override fun openDiscordInvite() {
@@ -130,6 +173,10 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
         context?.openInternetBrowser("https://www.facebook.com/wulkanowy", ::showMessage)
     }
 
+    override fun openTwitterPage() {
+        context?.openInternetBrowser("https://twitter.com/wulkanowy", ::showMessage)
+    }
+
     override fun openHomepage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/", ::showMessage)
     }
@@ -155,7 +202,10 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
     }
 
     override fun openFaqPage() {
-        context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania", ::showMessage)
+        context?.openInternetBrowser(
+            "https://wulkanowy.github.io/czesto-zadawane-pytania",
+            ::showMessage
+        )
     }
 
     override fun openLicenses() {
@@ -167,7 +217,10 @@ class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about
     }
 
     override fun openPrivacyPolicy() {
-        context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
+        context?.openInternetBrowser(
+            "https://wulkanowy.github.io/polityka-prywatnosci.html",
+            ::showMessage
+        )
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index fde20267d..6bcf5f77b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -26,10 +26,10 @@ class AboutPresenter @Inject constructor(
         view?.run {
             when (name) {
                 versionRes?.first -> {
-                    Timber.i("Opening log viewer")
-                    if (appInfo.isDebug) openLogViewer()
+                    Timber.i("Opening debug screen")
+                    if (appInfo.isDebug) openDebugScreen()
                     else openAppInMarket()
-                    analytics.logEvent("about_open", "name" to "log_viewer")
+                    analytics.logEvent("about_open", "name" to "debug_screen")
                 }
                 feedbackRes?.first -> {
                     Timber.i("Opening email client")
@@ -51,6 +51,11 @@ class AboutPresenter @Inject constructor(
                     openFacebookPage()
                     analytics.logEvent("about_open", "name" to "facebook")
                 }
+                twitterRes?.first -> {
+                    Timber.i("Opening twitter")
+                    openTwitterPage()
+                    analytics.logEvent("about_open", "name" to "twitter")
+                }
                 homepageRes?.first -> {
                     Timber.i("Opening homepage")
                     openHomepage()
@@ -84,6 +89,7 @@ class AboutPresenter @Inject constructor(
                 faqRes,
                 discordRes,
                 facebookRes,
+                twitterRes,
                 homepageRes,
                 licensesRes,
                 privacyRes
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index 54882b302..5c286828b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -15,6 +15,8 @@ interface AboutView : BaseView {
 
     val discordRes: Triple<String, String, Drawable?>?
 
+    val twitterRes: Triple<String, String, Drawable?>?
+
     val facebookRes: Triple<String, String, Drawable?>?
 
     val homepageRes: Triple<String, String, Drawable?>?
@@ -29,12 +31,14 @@ interface AboutView : BaseView {
 
     fun openAppInMarket()
 
-    fun openLogViewer()
+    fun openDebugScreen()
 
     fun openDiscordInvite()
 
     fun openFacebookPage()
 
+    fun openTwitterPage()
+
     fun openEmailClient()
 
     fun openFaqPage()
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt
index 62dd70ab4..67ecdb5fc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/accountedit/AccountEditPresenter.kt
@@ -14,7 +14,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class AccountEditPresenter @Inject constructor(
-    private val appInfo: AppInfo,
+    appInfo: AppInfo,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
 ) : BasePresenter<AccountEditView>(errorHandler, studentRepository) {
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 03ec1c842..6cee23963 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
@@ -10,6 +10,7 @@ import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.enums.SentExcuseStatus
 import io.github.wulkanowy.databinding.ItemAttendanceBinding
 import io.github.wulkanowy.utils.description
+import io.github.wulkanowy.utils.isExcusableOrNotExcused
 import javax.inject.Inject
 
 class AttendanceAdapter @Inject constructor() :
@@ -56,7 +57,7 @@ class AttendanceAdapter @Inject constructor() :
                     attendanceItemExcuseInfo.visibility = View.VISIBLE
                 }
                 else -> {
-                    if (item.excusable && excuseActionMode) {
+                    if (item.isExcusableOrNotExcused && excuseActionMode) {
                         attendanceItemNumber.visibility = View.GONE
                         attendanceItemExcuseCheckbox.visibility = View.VISIBLE
                     } else {
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 8b6526cdc..d816d8f00 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
@@ -44,10 +44,10 @@ class AttendanceDialog : DialogFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         with(binding) {
-            attendanceDialogSubject.text = attendance.subject
-            attendanceDialogDescription.setText(attendance.description)
-            attendanceDialogDate.text = attendance.date.toFormattedString()
-            attendanceDialogNumber.text = attendance.number.toString()
+            attendanceDialogSubjectValue.text = attendance.subject
+            attendanceDialogDescriptionValue.setText(attendance.description)
+            attendanceDialogDateValue.text = attendance.date.toFormattedString()
+            attendanceDialogNumberValue.text = attendance.number.toString()
             attendanceDialogClose.setOnClickListener { dismiss() }
         }
     }
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 cb718c724..058946796 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
@@ -13,7 +13,8 @@ import android.view.View.VISIBLE
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.view.ActionMode
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.MaterialDatePicker
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
@@ -23,15 +24,20 @@ import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 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.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.SchoolDaysValidator
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.schoolYearStart
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.utils.toTimestamp
 import java.time.LocalDate
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView,
+class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance),
+    AttendanceView, MainView.MainChildView,
     MainView.TitledView {
 
     @Inject
@@ -114,7 +120,11 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         with(binding) {
             attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
             attendanceSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            attendanceSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            attendanceSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(
+                    R.attr.colorSwipeRefresh
+                )
+            )
             attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
             attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -204,7 +214,7 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showNextButton(show: Boolean) {
-        binding. attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showExcuseButton(show: Boolean) {
@@ -216,19 +226,26 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
     }
 
     override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
+        val baseDate = currentDate.schoolYearStart
+        val rangeStart = baseDate.toTimestamp()
+        val rangeEnd = LocalDate.now().plusWeeks(1).toTimestamp()
 
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@AttendanceFragment.parentFragmentManager, null)
+        val constraintsBuilder = CalendarConstraints.Builder().apply {
+            setValidator(SchoolDaysValidator(rangeStart, rangeEnd))
+            setStart(rangeStart)
+            setEnd(rangeEnd)
         }
+        val datePicker = MaterialDatePicker.Builder.datePicker()
+            .setCalendarConstraints(constraintsBuilder.build())
+            .setSelection(currentDate.toTimestamp())
+            .build()
+
+        datePicker.addOnPositiveButtonClickListener {
+            val date = it.toLocalDateTime()
+            presenter.onDateSet(date.year, date.monthValue, date.dayOfMonth)
+        }
+
+        datePicker.show(this@AttendanceFragment.parentFragmentManager, null)
     }
 
     override fun showExcuseDialog() {
@@ -239,8 +256,13 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
             .create()
             .apply {
-                setButton(BUTTON_POSITIVE, getString(R.string.attendance_excuse_dialog_submit)) { _, _ ->
-                    presenter.onExcuseDialogSubmit(dialogBinding.excuseReason.text?.toString().orEmpty())
+                setButton(
+                    BUTTON_POSITIVE,
+                    getString(R.string.attendance_excuse_dialog_submit)
+                ) { _, _ ->
+                    presenter.onExcuseDialogSubmit(
+                        dialogBinding.excuseReason.text?.toString().orEmpty()
+                    )
                 }
             }.show()
     }
@@ -253,6 +275,17 @@ class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.frag
         actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback)
     }
 
+    override fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String) {
+        val reasonFullText = getString(
+            R.string.attendance_excuse_formula,
+            date,
+            numbers,
+            if (reason.isNotBlank()) " ${getString(R.string.attendance_excuse_reason)} " else "",
+            reason.ifBlank { "" }
+        )
+        startActivity(SendMessageActivity.getStartIntent(requireContext(), reasonFullText))
+    }
+
     override fun showExcuseCheckboxes(show: Boolean) {
         attendanceAdapter.apply {
             excuseActionMode = show
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 b03db91af..9a1598128 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
@@ -11,9 +11,11 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
+import io.github.wulkanowy.utils.isExcusableOrNotExcused
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousOrSameSchoolDay
@@ -46,6 +48,8 @@ class AttendancePresenter @Inject constructor(
 
     private val attendanceToExcuseList = mutableListOf<Attendance>()
 
+    private var isVulcanExcusedFunctionEnabled = false
+
     fun onAttachView(view: AttendanceView, date: Long?) {
         super.onAttachView(view)
         view.initView()
@@ -147,7 +151,21 @@ class AttendancePresenter @Inject constructor(
 
     fun onExcuseDialogSubmit(reason: String) {
         view?.finishActionMode()
-        excuseAbsence(if (reason != "") reason else null, attendanceToExcuseList.toList())
+
+        if (isVulcanExcusedFunctionEnabled) {
+            excuseAbsence(
+                reason = reason.takeIf { it.isNotBlank() },
+                toExcuseList = attendanceToExcuseList.toList()
+            )
+        } else {
+            val attendanceToExcuseNumbers = attendanceToExcuseList.map { it.number }
+
+            view?.startSendMessageIntent(
+                date = attendanceToExcuseList[0].date,
+                numbers = attendanceToExcuseNumbers.joinToString(", "),
+                reason = reason
+            )
+        }
     }
 
     fun onPrepareActionMode(): Boolean {
@@ -187,8 +205,12 @@ class AttendancePresenter @Inject constructor(
     private fun loadData(forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
 
+        var isParent = false
+
         flowWithResourceIn {
             val student = studentRepository.getCurrentStudent()
+            isParent = student.isParent
+
             val semester = semesterRepository.getCurrentSemester(student)
             attendanceRepository.getAttendance(
                 student,
@@ -226,12 +248,17 @@ class AttendancePresenter @Inject constructor(
                         it.data?.filter { item -> !item.presence }.orEmpty()
                     }
 
+                    isVulcanExcusedFunctionEnabled =
+                        filteredAttendance.any { item -> item.excusable }
+
                     view?.apply {
                         updateData(filteredAttendance.sortedBy { item -> item.number })
                         showEmpty(filteredAttendance.isEmpty())
                         showErrorView(false)
                         showContent(filteredAttendance.isNotEmpty())
-                        showExcuseButton(filteredAttendance.any { item -> item.excusable })
+                        showExcuseButton(filteredAttendance.any { item ->
+                            (!isParent && isVulcanExcusedFunctionEnabled) || (isParent && item.isExcusableOrNotExcused)
+                        })
                     }
                     analytics.logEvent(
                         "load_data",
@@ -319,7 +346,7 @@ class AttendancePresenter @Inject constructor(
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalise())
         }
     }
 }
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 0459dfcf6..738f2ff86 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
@@ -54,6 +54,8 @@ interface AttendanceView : BaseView {
 
     fun openSummaryView()
 
+    fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String)
+
     fun startActionMode()
 
     fun showExcuseCheckboxes(show: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
index 4250a9109..a2b6abfb8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
@@ -76,13 +76,13 @@ class AttendanceSummaryAdapter @Inject constructor() :
 
     private fun getTotalItem() = AttendanceSummary(
         month = Month.APRIL,
-        presence = items.sumBy { it.presence },
-        absence = items.sumBy { it.absence },
-        absenceExcused = items.sumBy { it.absenceExcused },
-        absenceForSchoolReasons = items.sumBy { it.absenceForSchoolReasons },
-        exemption = items.sumBy { it.exemption },
-        lateness = items.sumBy { it.lateness },
-        latenessExcused = items.sumBy { it.latenessExcused },
+        presence = items.sumOf { it.presence },
+        absence = items.sumOf { it.absence },
+        absenceExcused = items.sumOf { it.absenceExcused },
+        absenceForSchoolReasons = items.sumOf { it.absenceForSchoolReasons },
+        exemption = items.sumOf { it.exemption },
+        lateness = items.sumOf { it.lateness },
+        latenessExcused = items.sumOf { it.latenessExcused },
         diaryId = -1,
         studentId = -1,
         subjectId = -1
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
new file mode 100644
index 000000000..fa081ce7f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt
@@ -0,0 +1,746 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updateMarginsRelative
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.db.entities.TimetableHeader
+import io.github.wulkanowy.databinding.ItemDashboardAccountBinding
+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 java.time.Duration
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.util.Timer
+import javax.inject.Inject
+import kotlin.concurrent.timer
+
+class DashboardAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private var lessonsTimer: Timer? = null
+
+    var onAccountTileClickListener: () -> Unit = {}
+
+    var onLuckyNumberTileClickListener: () -> Unit = {}
+
+    var onMessageTileClickListener: () -> Unit = {}
+
+    var onGradeTileClickListener: () -> Unit = {}
+
+    var onAttendanceTileClickListener: () -> Unit = {}
+
+    var onLessonsTileClickListener: () -> Unit = {}
+
+    var onHomeworkTileClickListener: () -> Unit = {}
+
+    var onAnnouncementsTileClickListener: () -> Unit = {}
+
+    var onExamsTileClickListener: () -> Unit = {}
+
+    var onConferencesTileClickListener: () -> Unit = {}
+
+    val items = mutableListOf<DashboardItem>()
+
+    fun submitList(newItems: List<DashboardItem>) {
+        val diffResult =
+            DiffUtil.calculateDiff(DiffCallback(newItems, items.toMutableList()))
+
+        with(items) {
+            clear()
+            addAll(newItems)
+        }
+
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].type.ordinal
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            DashboardItem.Type.ACCOUNT.ordinal -> AccountViewHolder(
+                ItemDashboardAccountBinding.inflate(inflater, parent, false)
+            )
+            DashboardItem.Type.HORIZONTAL_GROUP.ordinal -> HorizontalGroupViewHolder(
+                ItemDashboardHorizontalGroupBinding.inflate(inflater, parent, false)
+            )
+            DashboardItem.Type.GRADES.ordinal -> GradesViewHolder(
+                ItemDashboardGradesBinding.inflate(inflater, parent, false)
+            )
+            DashboardItem.Type.LESSONS.ordinal -> LessonsViewHolder(
+                ItemDashboardLessonsBinding.inflate(inflater, parent, false)
+            )
+            DashboardItem.Type.HOMEWORK.ordinal -> HomeworkViewHolder(
+                ItemDashboardHomeworkBinding.inflate(inflater, parent, false)
+            )
+            DashboardItem.Type.ANNOUNCEMENTS.ordinal -> AnnouncementsViewHolder(
+                ItemDashboardAnnouncementsBinding.inflate(inflater, parent, false)
+            )
+            DashboardItem.Type.EXAMS.ordinal -> ExamsViewHolder(
+                ItemDashboardExamsBinding.inflate(inflater, parent, false)
+            )
+            DashboardItem.Type.CONFERENCES.ordinal -> ConferencesViewHolder(
+                ItemDashboardConferencesBinding.inflate(inflater, parent, false)
+            )
+            else -> throw IllegalArgumentException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is AccountViewHolder -> bindAccountViewHolder(holder, position)
+            is HorizontalGroupViewHolder -> bindHorizontalGroupViewHolder(holder, position)
+            is GradesViewHolder -> bindGradesViewHolder(holder, position)
+            is LessonsViewHolder -> bindLessonsViewHolder(holder, position)
+            is HomeworkViewHolder -> bindHomeworkViewHolder(holder, position)
+            is AnnouncementsViewHolder -> bindAnnouncementsViewHolder(holder, position)
+            is ExamsViewHolder -> bindExamsViewHolder(holder, position)
+            is ConferencesViewHolder -> bindConferencesViewHolder(holder, position)
+        }
+    }
+
+    fun clearTimers() {
+        lessonsTimer?.let {
+            it.cancel()
+            it.purge()
+        }
+        lessonsTimer = null
+    }
+
+    private fun bindAccountViewHolder(accountViewHolder: AccountViewHolder, position: Int) {
+        val item = items[position] as DashboardItem.Account
+        val student = item.student
+        val isLoading = item.isLoading
+
+        val avatar = student?.let {
+            accountViewHolder.binding.root.context.createNameInitialsDrawable(
+                text = it.nickOrName,
+                backgroundColor = it.avatarColor
+            )
+        }
+
+        with(accountViewHolder.binding) {
+            dashboardAccountItemContent.isVisible = !isLoading
+            dashboardAccountItemProgress.isVisible = isLoading
+
+            dashboardAccountItemAvatar.setImageDrawable(avatar)
+            dashboardAccountItemName.text = student?.nickOrName.orEmpty()
+            dashboardAccountItemSchoolName.text = student?.schoolName.orEmpty()
+
+            root.setOnClickListener { onAccountTileClickListener() }
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindHorizontalGroupViewHolder(
+        horizontalGroupViewHolder: HorizontalGroupViewHolder,
+        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 attendanceColor = when {
+            attendancePercentage ?: 0.0 <= ATTENDANCE_SECOND_WARNING_THRESHOLD -> {
+                context.getThemeAttrColor(R.attr.colorPrimary)
+            }
+            attendancePercentage ?: 0.0 <= ATTENDANCE_FIRST_WARNING_THRESHOLD -> {
+                context.getThemeAttrColor(R.attr.colorTimetableChange)
+            }
+            else -> context.getThemeAttrColor(R.attr.colorOnSurface)
+        }
+
+        with(binding.dashboardHorizontalGroupItemAttendanceValue) {
+            text = "%.2f%%".format(attendancePercentage)
+            setTextColor(attendanceColor)
+        }
+
+        with(binding) {
+            dashboardHorizontalGroupItemMessageValue.text = unreadMessagesCount.toString()
+            dashboardHorizontalGroupItemLuckyValue.text = if (luckyNumber == -1) {
+                context.getString(R.string.dashboard_horizontal_group_no_lukcy_number)
+            } else luckyNumber?.toString()
+
+            if (dashboardHorizontalGroupItemInfoContainer.isVisible != (error != null || isLoading)) {
+                dashboardHorizontalGroupItemInfoContainer.isVisible = error != null || isLoading
+            }
+
+            if (dashboardHorizontalGroupItemInfoProgress.isVisible != isLoading) {
+                dashboardHorizontalGroupItemInfoProgress.isVisible = isLoading
+            }
+
+            dashboardHorizontalGroupItemInfoErrorText.isVisible = error != null
+
+            with(dashboardHorizontalGroupItemLuckyContainer) {
+                isVisible = error == null && !isLoading && luckyNumber != null
+                setOnClickListener { onLuckyNumberTileClickListener() }
+
+                updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                    updateMarginsRelative(
+                        end = if (attendancePercentage == null && unreadMessagesCount == null && luckyNumber != null) {
+                            0
+                        } else {
+                            context.dpToPx(8f).toInt()
+                        }
+                    )
+                }
+            }
+
+            with(dashboardHorizontalGroupItemAttendanceContainer) {
+                isVisible = error == null && !isLoading && attendancePercentage != null
+                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 = error == null && !isLoading && unreadMessagesCount != null
+                setOnClickListener { onMessageTileClickListener() }
+            }
+        }
+    }
+
+    private fun bindGradesViewHolder(gradesViewHolder: GradesViewHolder, position: Int) {
+        val item = items[position] as DashboardItem.Grades
+        val subjectWithGrades = item.subjectWithGrades.orEmpty()
+        val gradeTheme = item.gradeTheme
+        val error = item.error
+        val isLoading = item.isLoading
+        val dashboardGradesAdapter = gradesViewHolder.adapter.apply {
+            this.items = subjectWithGrades.toList()
+            this.gradeTheme = gradeTheme.orEmpty()
+        }
+
+        with(gradesViewHolder.binding) {
+            dashboardGradesItemEmpty.isVisible =
+                subjectWithGrades.isEmpty() && error == null && !isLoading
+            dashboardGradesItemError.isVisible = error != null && !isLoading
+            dashboardGradesItemProgress.isVisible =
+                isLoading && error == null && subjectWithGrades.isEmpty()
+
+            with(dashboardGradesItemRecycler) {
+                adapter = dashboardGradesAdapter
+                layoutManager = LinearLayoutManager(context)
+                isVisible = subjectWithGrades.isNotEmpty() && error == null
+                suppressLayout(true)
+            }
+
+            root.setOnClickListener { onGradeTileClickListener() }
+        }
+    }
+
+    private fun bindLessonsViewHolder(lessonsViewHolder: LessonsViewHolder, position: Int) {
+        val item = items[position] as DashboardItem.Lessons
+        val timetableFull = item.lessons
+        val binding = lessonsViewHolder.binding
+
+        fun updateLessonState() {
+            val currentDateTime = LocalDateTime.now()
+            val currentDate = LocalDate.now()
+
+            val currentTimetable = timetableFull?.lessons
+                .orEmpty()
+                .filter { it.date == currentDate }
+                .filter { it.end.isAfter(currentDateTime) }
+                .filterNot { it.canceled }
+            val currentDayHeader =
+                timetableFull?.headers.orEmpty().singleOrNull { it.date == currentDate }
+
+            val tomorrowTimetable = timetableFull?.lessons.orEmpty()
+                .filter { it.date == currentDate.plusDays(1) }
+                .filterNot { it.canceled }
+            val tomorrowDayHeader =
+                timetableFull?.headers.orEmpty().singleOrNull { it.date == currentDate.plusDays(1) }
+
+            when {
+                currentTimetable.isNotEmpty() -> {
+                    updateLessonView(item, currentTimetable, binding)
+                    binding.dashboardLessonsItemTitleTomorrow.isVisible = false
+                }
+                currentDayHeader != null && currentDayHeader.content.isNotBlank() -> {
+                    updateLessonView(item, emptyList(), binding, currentDayHeader)
+                    binding.dashboardLessonsItemTitleTomorrow.isVisible = false
+                }
+                tomorrowTimetable.isNotEmpty() -> {
+                    updateLessonView(item, tomorrowTimetable, binding)
+                    binding.dashboardLessonsItemTitleTomorrow.isVisible = true
+                }
+                tomorrowDayHeader != null && tomorrowDayHeader.content.isNotBlank() -> {
+                    updateLessonView(item, emptyList(), binding, tomorrowDayHeader)
+                    binding.dashboardLessonsItemTitleTomorrow.isVisible = true
+                }
+                else -> {
+                    updateLessonView(item, emptyList(), binding)
+                    binding.dashboardLessonsItemTitleTomorrow.isVisible =
+                        !(item.isLoading && item.error == null)
+                }
+            }
+        }
+
+        updateLessonState()
+
+        lessonsTimer?.cancel()
+        lessonsTimer = timer(period = 1000) {
+            Handler(Looper.getMainLooper()).post { updateLessonState() }
+        }
+
+        binding.root.setOnClickListener { onLessonsTileClickListener() }
+    }
+
+    private fun updateLessonView(
+        item: DashboardItem.Lessons,
+        timetableToShow: List<Timetable>,
+        binding: ItemDashboardLessonsBinding,
+        header: TimetableHeader? = null,
+    ) {
+        val currentDateTime = LocalDateTime.now()
+        val nextLessons = timetableToShow.filter { it.end.isAfter(currentDateTime) }
+            .sortedBy { it.start }
+
+        with(binding) {
+            dashboardLessonsItemEmpty.isVisible =
+                (timetableToShow.isEmpty() || nextLessons.isEmpty()) && item.error == null && header == null && !item.isLoading
+            dashboardLessonsItemError.isVisible = item.error != null && !item.isLoading
+            dashboardLessonsItemProgress.isVisible =
+                item.isLoading && (timetableToShow.isEmpty() || nextLessons.isEmpty()) && item.error == null && header == null
+
+            val secondLesson = nextLessons.getOrNull(1)
+            val firstLesson = nextLessons.getOrNull(0)
+
+            updateFirstLessonView(binding, firstLesson, currentDateTime)
+            updateSecondLesson(binding, firstLesson, secondLesson)
+            updateLessonSummary(binding, nextLessons)
+            updateLessonHeader(binding, header)
+        }
+    }
+
+    private fun updateFirstLessonView(
+        binding: ItemDashboardLessonsBinding,
+        firstLesson: Timetable?,
+        currentDateTime: LocalDateTime
+    ) {
+        val context = binding.root.context
+        val sansSerifFont = Typeface.create("sans-serif", Typeface.NORMAL)
+        val sansSerifMediumFont = Typeface.create("sans-serif-medium", Typeface.NORMAL)
+
+        with(binding) {
+            dashboardLessonsItemFirstTitle.isVisible = firstLesson != null
+            dashboardLessonsItemFirstTime.isVisible = firstLesson != null
+            dashboardLessonsItemFirstTimeRange.isVisible = firstLesson != null
+            dashboardLessonsItemFirstValue.isVisible = firstLesson != null
+        }
+
+        firstLesson ?: return
+
+        val minutesToStartLesson =
+            Duration.between(currentDateTime, firstLesson.start).toMinutes()
+        val isFirstTimeVisible: Boolean
+        val isFirstTimeRangeVisible: Boolean
+        val firstTimeText: String
+        val firstTimeRangeText: String
+        val firstTitleText: String
+        val firstTitleAndValueTextColor: Int
+        val firstTitleAndValueTextFont: Typeface
+
+        if (currentDateTime.isBefore(firstLesson.start)) {
+            if (minutesToStartLesson > 60) {
+                val formattedStartTime = firstLesson.start.toFormattedString("HH:mm")
+                val formattedEndTime = firstLesson.end.toFormattedString("HH:mm")
+
+                firstTimeRangeText = "${formattedStartTime}-${formattedEndTime}"
+                firstTimeText = ""
+
+                isFirstTimeRangeVisible = true
+                isFirstTimeVisible = false
+            } else {
+                firstTimeText = context.resources.getQuantityString(
+                    R.plurals.dashboard_timetable_first_lesson_time_in_minutes,
+                    minutesToStartLesson.toInt(),
+                    minutesToStartLesson
+                )
+                firstTimeRangeText = ""
+
+                isFirstTimeRangeVisible = false
+                isFirstTimeVisible = true
+            }
+
+            when {
+                minutesToStartLesson < 60 -> {
+                    firstTitleAndValueTextColor = context.getThemeAttrColor(R.attr.colorPrimary)
+                    firstTitleAndValueTextFont = sansSerifMediumFont
+                    firstTitleText =
+                        context.getString(R.string.dashboard_timetable_first_lesson_title_moment)
+                }
+                minutesToStartLesson < 240 -> {
+                    firstTitleAndValueTextColor =
+                        context.getThemeAttrColor(R.attr.colorOnSurface)
+                    firstTitleAndValueTextFont = sansSerifFont
+                    firstTitleText =
+                        context.getString(R.string.dashboard_timetable_first_lesson_title_soon)
+                }
+                else -> {
+                    firstTitleAndValueTextColor =
+                        context.getThemeAttrColor(R.attr.colorOnSurface)
+                    firstTitleAndValueTextFont = sansSerifFont
+                    firstTitleText =
+                        context.getString(R.string.dashboard_timetable_first_lesson_title_first)
+                }
+            }
+        } else {
+            val minutesToEndLesson = firstLesson.left!!.toMinutes()
+
+            firstTimeText = context.resources.getQuantityString(
+                R.plurals.dashboard_timetable_first_lesson_time_more_minutes,
+                minutesToEndLesson.toInt(),
+                minutesToEndLesson
+            )
+            firstTimeRangeText = ""
+
+            isFirstTimeRangeVisible = false
+            isFirstTimeVisible = true
+
+            firstTitleAndValueTextColor = context.getThemeAttrColor(R.attr.colorPrimary)
+            firstTitleAndValueTextFont = sansSerifMediumFont
+            firstTitleText = context.getString(R.string.dashboard_timetable_first_lesson_title_now)
+        }
+
+        with(binding.dashboardLessonsItemFirstTime) {
+            isVisible = isFirstTimeVisible
+            text = firstTimeText
+        }
+        with(binding.dashboardLessonsItemFirstTimeRange) {
+            isVisible = isFirstTimeRangeVisible
+            text = firstTimeRangeText
+        }
+        with(binding.dashboardLessonsItemFirstTitle) {
+            setTextColor(firstTitleAndValueTextColor)
+            typeface = firstTitleAndValueTextFont
+            text = firstTitleText
+        }
+        with(binding.dashboardLessonsItemFirstValue) {
+            setTextColor(firstTitleAndValueTextColor)
+            typeface = firstTitleAndValueTextFont
+            text = context.getString(
+                R.string.dashboard_timetable_lesson_value,
+                firstLesson.subject,
+                firstLesson.room
+            )
+        }
+    }
+
+    private fun updateSecondLesson(
+        binding: ItemDashboardLessonsBinding,
+        firstLesson: Timetable?,
+        secondLesson: Timetable?
+    ) {
+        val context = binding.root.context
+
+        val formattedStartTime = secondLesson?.start?.toFormattedString("HH:mm")
+        val formattedEndTime = secondLesson?.end?.toFormattedString("HH:mm")
+
+        val secondTimeText = "${formattedStartTime}-${formattedEndTime}"
+        val secondValueText = if (secondLesson != null) {
+            context.getString(
+                R.string.dashboard_timetable_lesson_value,
+                secondLesson.subject,
+                secondLesson.room
+            )
+        } else {
+            context.getString(R.string.dashboard_timetable_second_lesson_value_end)
+        }
+
+        with(binding.dashboardLessonsItemSecondTime) {
+            isVisible = secondLesson != null
+            text = secondTimeText
+        }
+        with(binding.dashboardLessonsItemSecondValue) {
+            isVisible = !(secondLesson == null && firstLesson == null)
+            text = secondValueText
+        }
+        binding.dashboardLessonsItemSecondTitle.isVisible =
+            !(secondLesson == null && firstLesson == null)
+    }
+
+    private fun updateLessonSummary(
+        binding: ItemDashboardLessonsBinding,
+        nextLessons: List<Timetable>
+    ) {
+        val context = binding.root.context
+        val formattedEndTime = nextLessons.lastOrNull()?.end?.toFormattedString("HH:mm")
+
+        with(binding) {
+            dashboardLessonsItemThirdTime.isVisible =
+                nextLessons.size > LESSON_SUMMARY_VISIBILITY_THRESHOLD
+            dashboardLessonsItemThirdTitle.isVisible =
+                nextLessons.size > LESSON_SUMMARY_VISIBILITY_THRESHOLD
+            dashboardLessonsItemThirdValue.isVisible =
+                nextLessons.size > LESSON_SUMMARY_VISIBILITY_THRESHOLD
+            dashboardLessonsItemDivider.isVisible =
+                nextLessons.size > LESSON_SUMMARY_VISIBILITY_THRESHOLD
+
+            dashboardLessonsItemThirdValue.text = context.resources.getQuantityString(
+                R.plurals.dashboard_timetable_third_value,
+                nextLessons.size - LESSON_SUMMARY_VISIBILITY_THRESHOLD,
+                nextLessons.size - LESSON_SUMMARY_VISIBILITY_THRESHOLD
+            )
+            dashboardLessonsItemThirdTime.text =
+                context.getString(R.string.dashboard_timetable_third_time, formattedEndTime)
+        }
+    }
+
+    private fun updateLessonHeader(
+        binding: ItemDashboardLessonsBinding,
+        header: TimetableHeader?
+    ) {
+        with(binding.dashboardLessonsItemDayHeader) {
+            isVisible = header != null
+            text = header?.content
+        }
+    }
+
+    private fun bindHomeworkViewHolder(homeworkViewHolder: HomeworkViewHolder, position: Int) {
+        val item = items[position] as DashboardItem.Homework
+        val homeworkList = item.homework.orEmpty()
+        val error = item.error
+        val isLoading = item.isLoading
+        val context = homeworkViewHolder.binding.root.context
+        val homeworkAdapter = homeworkViewHolder.adapter.apply {
+            this.items = homeworkList.take(MAX_VISIBLE_LIST_ITEMS)
+        }
+
+        with(homeworkViewHolder.binding) {
+            dashboardHomeworkItemEmpty.isVisible =
+                homeworkList.isEmpty() && error == null && !isLoading
+            dashboardHomeworkItemError.isVisible = error != null && !isLoading
+            dashboardHomeworkItemProgress.isVisible =
+                isLoading && error == null && homeworkList.isEmpty()
+            dashboardHomeworkItemDivider.isVisible = homeworkList.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardHomeworkItemMore.isVisible = homeworkList.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardHomeworkItemMore.text = context.resources.getQuantityString(
+                R.plurals.dashboard_homework_more,
+                homeworkList.size - MAX_VISIBLE_LIST_ITEMS,
+                homeworkList.size - MAX_VISIBLE_LIST_ITEMS
+            )
+
+            with(dashboardHomeworkItemRecycler) {
+                adapter = homeworkAdapter
+                layoutManager = LinearLayoutManager(context)
+                isVisible = homeworkList.isNotEmpty() && error == null
+                suppressLayout(true)
+            }
+
+            root.setOnClickListener { onHomeworkTileClickListener() }
+        }
+    }
+
+    private fun bindAnnouncementsViewHolder(
+        announcementsViewHolder: AnnouncementsViewHolder,
+        position: Int
+    ) {
+        val item = items[position] as DashboardItem.Announcements
+        val schoolAnnouncementList = item.announcement.orEmpty()
+        val error = item.error
+        val isLoading = item.isLoading
+        val context = announcementsViewHolder.binding.root.context
+        val schoolAnnouncementsAdapter = announcementsViewHolder.adapter.apply {
+            this.items = schoolAnnouncementList.take(MAX_VISIBLE_LIST_ITEMS)
+        }
+
+        with(announcementsViewHolder.binding) {
+            dashboardAnnouncementsItemEmpty.isVisible =
+                schoolAnnouncementList.isEmpty() && error == null && !isLoading
+            dashboardAnnouncementsItemError.isVisible = error != null && !isLoading
+            dashboardAnnouncementsItemProgress.isVisible =
+                isLoading && error == null && schoolAnnouncementList.isEmpty()
+            dashboardAnnouncementsItemDivider.isVisible =
+                schoolAnnouncementList.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardAnnouncementsItemMore.isVisible =
+                schoolAnnouncementList.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardAnnouncementsItemMore.text = context.resources.getQuantityString(
+                R.plurals.dashboard_announcements_more,
+                schoolAnnouncementList.size - MAX_VISIBLE_LIST_ITEMS,
+                schoolAnnouncementList.size - MAX_VISIBLE_LIST_ITEMS
+            )
+
+            with(dashboardAnnouncementsItemRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = schoolAnnouncementsAdapter
+                isVisible = schoolAnnouncementList.isNotEmpty() && error == null
+                suppressLayout(true)
+            }
+
+            root.setOnClickListener { onAnnouncementsTileClickListener() }
+        }
+    }
+
+    private fun bindExamsViewHolder(examsViewHolder: ExamsViewHolder, position: Int) {
+        val item = items[position] as DashboardItem.Exams
+        val exams = item.exams.orEmpty()
+        val error = item.error
+        val isLoading = item.isLoading
+        val context = examsViewHolder.binding.root.context
+        val examAdapter = examsViewHolder.adapter.apply {
+            this.items = exams.take(MAX_VISIBLE_LIST_ITEMS)
+        }
+
+        with(examsViewHolder.binding) {
+            dashboardExamsItemEmpty.isVisible = exams.isEmpty() && error == null && !isLoading
+            dashboardExamsItemError.isVisible = error != null && !isLoading
+            dashboardExamsItemProgress.isVisible = isLoading && error == null && exams.isEmpty()
+            dashboardExamsItemDivider.isVisible = exams.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardExamsItemMore.isVisible = exams.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardExamsItemMore.text = context.resources.getQuantityString(
+                R.plurals.dashboard_exams_more,
+                exams.size - MAX_VISIBLE_LIST_ITEMS,
+                exams.size - MAX_VISIBLE_LIST_ITEMS
+            )
+
+            with(dashboardExamsItemRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = examAdapter
+                isVisible = exams.isNotEmpty() && error == null
+                suppressLayout(true)
+            }
+
+            root.setOnClickListener { onExamsTileClickListener() }
+        }
+    }
+
+    private fun bindConferencesViewHolder(
+        conferencesViewHolder: ConferencesViewHolder,
+        position: Int
+    ) {
+        val item = items[position] as DashboardItem.Conferences
+        val conferences = item.conferences.orEmpty()
+        val error = item.error
+        val isLoading = item.isLoading
+        val context = conferencesViewHolder.binding.root.context
+        val conferenceAdapter = conferencesViewHolder.adapter.apply {
+            this.items = conferences.take(MAX_VISIBLE_LIST_ITEMS)
+        }
+
+        with(conferencesViewHolder.binding) {
+            dashboardConferencesItemEmpty.isVisible =
+                conferences.isEmpty() && error == null && !isLoading
+            dashboardConferencesItemError.isVisible = error != null && !isLoading
+            dashboardConferencesItemProgress.isVisible =
+                isLoading && error == null && conferences.isEmpty()
+            dashboardConferencesItemDivider.isVisible = conferences.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardConferencesItemMore.isVisible = conferences.size > MAX_VISIBLE_LIST_ITEMS
+            dashboardConferencesItemMore.text = context.resources.getQuantityString(
+                R.plurals.dashboard_conference_more,
+                conferences.size - MAX_VISIBLE_LIST_ITEMS,
+                conferences.size - MAX_VISIBLE_LIST_ITEMS
+            )
+
+            with(dashboardConferencesItemRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = conferenceAdapter
+                isVisible = conferences.isNotEmpty() && error == null
+                suppressLayout(true)
+            }
+
+            root.setOnClickListener { onConferencesTileClickListener() }
+        }
+    }
+
+    class AccountViewHolder(val binding: ItemDashboardAccountBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class HorizontalGroupViewHolder(val binding: ItemDashboardHorizontalGroupBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class GradesViewHolder(val binding: ItemDashboardGradesBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        val adapter by lazy { DashboardGradesAdapter() }
+    }
+
+    class LessonsViewHolder(val binding: ItemDashboardLessonsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class HomeworkViewHolder(val binding: ItemDashboardHomeworkBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        val adapter by lazy { DashboardHomeworkAdapter() }
+    }
+
+    class AnnouncementsViewHolder(val binding: ItemDashboardAnnouncementsBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        val adapter by lazy { DashboardAnnouncementsAdapter() }
+    }
+
+    class ExamsViewHolder(val binding: ItemDashboardExamsBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        val adapter by lazy { DashboardExamsAdapter() }
+    }
+
+    class ConferencesViewHolder(val binding: ItemDashboardConferencesBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        val adapter by lazy { DashboardConferencesAdapter() }
+    }
+
+    private class DiffCallback(
+        private val newList: List<DashboardItem>,
+        private val oldList: List<DashboardItem>
+    ) : DiffUtil.Callback() {
+
+        override fun getNewListSize() = newList.size
+
+        override fun getOldListSize() = oldList.size
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            newList[newItemPosition] == oldList[oldItemPosition]
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            newList[newItemPosition].type == oldList[oldItemPosition].type
+    }
+
+    private companion object {
+
+        private const val LESSON_SUMMARY_VISIBILITY_THRESHOLD = 2
+
+        private const val MAX_VISIBLE_LIST_ITEMS = 5
+
+        private const val ATTENDANCE_FIRST_WARNING_THRESHOLD = 75.0
+
+        private const val ATTENDANCE_SECOND_WARNING_THRESHOLD = 50.0
+    }
+}
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/DashboardAnnouncementsAdapter.kt
new file mode 100644
index 000000000..7a4c2b257
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAnnouncementsAdapter.kt
@@ -0,0 +1,36 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.databinding.SubitemDashboardAnnouncementsBinding
+import io.github.wulkanowy.utils.toFormattedString
+
+class DashboardAnnouncementsAdapter :
+    RecyclerView.Adapter<DashboardAnnouncementsAdapter.ViewHolder>() {
+
+    var items = emptyList<SchoolAnnouncement>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        SubitemDashboardAnnouncementsBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+    )
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            dashboardHomeworkSubitemTime.text = item.date.toFormattedString()
+            dashboardHomeworkSubitemTitle.text = item.subject
+        }
+    }
+
+    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/DashboardConferencesAdapter.kt
new file mode 100644
index 000000000..64cf599c8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardConferencesAdapter.kt
@@ -0,0 +1,36 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Conference
+import io.github.wulkanowy.databinding.SubitemDashboardConferencesBinding
+import io.github.wulkanowy.utils.toFormattedString
+
+class DashboardConferencesAdapter :
+    RecyclerView.Adapter<DashboardConferencesAdapter.ViewHolder>() {
+
+    var items = emptyList<Conference>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        SubitemDashboardConferencesBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+    )
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            dashboardHomeworkSubitemTime.text = item.date.toFormattedString("HH:mm dd.MM.yyyy")
+            dashboardHomeworkSubitemTitle.text = item.title
+        }
+    }
+
+    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/DashboardExamsAdapter.kt
new file mode 100644
index 000000000..060f224b3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardExamsAdapter.kt
@@ -0,0 +1,59 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.databinding.SubitemDashboardExamsBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import java.time.LocalDate
+
+class DashboardExamsAdapter :
+    RecyclerView.Adapter<DashboardExamsAdapter.ViewHolder>() {
+
+    var items = emptyList<Exam>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        SubitemDashboardExamsBinding.inflate(
+            LayoutInflater.from(parent.context),
+            parent,
+            false
+        )
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position]
+        val context = holder.binding.root.context
+        val primaryWarningTextColor = context.getThemeAttrColor(
+            if (item.date == LocalDate.now()) {
+                R.attr.colorPrimary
+            } else {
+                android.R.attr.textColorPrimary
+            }
+        )
+        val secondaryWarningTextColor = context.getThemeAttrColor(
+            if (item.date == LocalDate.now()) {
+                R.attr.colorPrimary
+            } else {
+                android.R.attr.textColorSecondary
+            }
+        )
+
+        with(holder.binding) {
+            dashboardHomeworkSubitemTime.text = item.date.toFormattedString("dd.MM")
+            dashboardHomeworkSubitemTime.setTextColor(secondaryWarningTextColor)
+
+            dashboardHomeworkSubitemTitle.text = "${item.type} - ${item.subject}"
+            dashboardHomeworkSubitemTitle.setTextColor(primaryWarningTextColor)
+        }
+    }
+
+    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/DashboardFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
new file mode 100644
index 000000000..3392280bc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt
@@ -0,0 +1,189 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentDashboardBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.account.AccountFragment
+import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
+import io.github.wulkanowy.ui.modules.conference.ConferenceFragment
+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.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.modules.message.MessageFragment
+import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
+import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.utils.capitalise
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import java.time.LocalDate
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class DashboardFragment : BaseFragment<FragmentDashboardBinding>(R.layout.fragment_dashboard),
+    DashboardView, MainView.TitledView, MainView.MainChildView {
+
+    @Inject
+    lateinit var presenter: DashboardPresenter
+
+    @Inject
+    lateinit var dashboardAdapter: DashboardAdapter
+
+    override val titleStringId get() = R.string.dashboard_title
+
+    override var subtitleString =
+        LocalDate.now().toFormattedString("EEEE, d MMMM yyyy").capitalise()
+
+    companion object {
+
+        fun newInstance() = DashboardFragment()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentDashboardBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_dashboard, menu)
+    }
+
+    override fun initView() {
+        val mainActivity = requireActivity() as MainActivity
+        val itemTouchHelper = ItemTouchHelper(
+            DashboardItemMoveCallback(
+                dashboardAdapter,
+                presenter::onDragAndDropEnd
+            )
+        )
+
+        dashboardAdapter.apply {
+            onAccountTileClickListener = { mainActivity.pushView(AccountFragment.newInstance()) }
+            onLuckyNumberTileClickListener = {
+                mainActivity.pushView(LuckyNumberFragment.newInstance())
+            }
+            onMessageTileClickListener = { mainActivity.pushView(MessageFragment.newInstance()) }
+            onAttendanceTileClickListener = {
+                mainActivity.pushView(AttendanceSummaryFragment.newInstance())
+            }
+            onLessonsTileClickListener = { mainActivity.pushView(TimetableFragment.newInstance()) }
+            onGradeTileClickListener = { mainActivity.pushView(GradeFragment.newInstance()) }
+            onHomeworkTileClickListener = { mainActivity.pushView(HomeworkFragment.newInstance()) }
+            onAnnouncementsTileClickListener = {
+                mainActivity.pushView(SchoolAnnouncementFragment.newInstance())
+            }
+            onExamsTileClickListener = { mainActivity.pushView(ExamFragment.newInstance()) }
+            onConferencesTileClickListener = {
+                mainActivity.pushView(ConferenceFragment.newInstance())
+            }
+        }
+
+        with(binding) {
+            dashboardErrorRetry.setOnClickListener { presenter.onRetry() }
+            dashboardErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            dashboardSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            dashboardSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+            dashboardSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh)
+            )
+
+            with(dashboardRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = dashboardAdapter
+                (itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false
+            }
+
+            itemTouchHelper.attachToRecyclerView(dashboardRecycler)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.dashboard_menu_tiles -> presenter.onDashboardTileSettingsSelected()
+            else -> false
+        }
+    }
+
+    override fun showDashboardTileSettings(selectedItems: List<DashboardItem.Tile>) {
+        val entries = requireContext().resources.getStringArray(R.array.dashboard_tile_entries)
+        val values = requireContext().resources.getStringArray(R.array.dashboard_tile_values)
+        val selectedItemsState = values.map { value -> selectedItems.any { it.name == value } }
+
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.pref_dashboard_appearance_tiles_title)
+            .setMultiChoiceItems(entries, selectedItemsState.toBooleanArray()) { _, _, _ -> }
+            .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                val selectedState = (dialog as AlertDialog).listView.checkedItemPositions
+                val selectedValues = values.filterIndexed { index, _ -> selectedState[index] }
+
+                presenter.onDashboardTileSettingSelected(selectedValues)
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
+    override fun updateData(data: List<DashboardItem>) {
+        dashboardAdapter.submitList(data.toMutableList())
+    }
+
+    override fun showMessage(text: String) {
+        //Empty function to avoid message flood
+    }
+
+    override fun showRefresh(show: Boolean) {
+        binding.dashboardSwipe.isRefreshing = show
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.dashboardProgress.isVisible = show
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.dashboardRecycler.isVisible = show
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.dashboardErrorContainer.isVisible = show
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.dashboardErrorMessage.text = message
+    }
+
+    override fun resetView() {
+        binding.dashboardRecycler.smoothScrollToPosition(0)
+    }
+
+    override fun popViewToRoot() {
+        (requireActivity() as MainActivity).popView(20)
+    }
+
+    override fun onFragmentReselected() {
+        if (::presenter.isInitialized) presenter.onViewReselected()
+    }
+
+    override fun onDestroyView() {
+        dashboardAdapter.clearTimers()
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
\ 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/DashboardGradesAdapter.kt
new file mode 100644
index 000000000..aeecf5bfe
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardGradesAdapter.kt
@@ -0,0 +1,49 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.databinding.SubitemDashboardGradesBinding
+import io.github.wulkanowy.databinding.SubitemDashboardSmallGradeBinding
+import io.github.wulkanowy.utils.getBackgroundColor
+
+class DashboardGradesAdapter : RecyclerView.Adapter<DashboardGradesAdapter.ViewHolder>() {
+
+    var items = listOf<Pair<String, List<Grade>>>()
+
+    var gradeTheme = ""
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        SubitemDashboardGradesBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val (subject, grades) = items[position]
+        val context = holder.binding.root.context
+
+        with(holder.binding) {
+            dashboardGradesSubitemTitle.text = subject
+
+            grades.forEach {
+                val subitemBinding = SubitemDashboardSmallGradeBinding.inflate(
+                    LayoutInflater.from(context),
+                    dashboardGradesSubitemGradeContainer,
+                    false
+                )
+
+                with(subitemBinding.dashboardSmallGradeSubitemValue) {
+                    text = it.entry
+                    setBackgroundResource(it.getBackgroundColor(gradeTheme))
+                }
+
+                dashboardGradesSubitemGradeContainer.addView(subitemBinding.root)
+            }
+        }
+    }
+
+    class ViewHolder(val binding: SubitemDashboardGradesBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
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/DashboardHomeworkAdapter.kt
new file mode 100644
index 000000000..55ec90294
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardHomeworkAdapter.kt
@@ -0,0 +1,56 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.SubitemDashboardHomeworkBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import java.time.LocalDate
+
+class DashboardHomeworkAdapter : RecyclerView.Adapter<DashboardHomeworkAdapter.ViewHolder>() {
+
+    var items = emptyList<Homework>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        SubitemDashboardHomeworkBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position]
+        val context = holder.binding.root.context
+        val formattedDate = item.date.toFormattedString("dd.MM")
+        val primaryWarningTextColor = context.getThemeAttrColor(
+            if (item.date == LocalDate.now()) {
+                R.attr.colorPrimary
+            } else {
+                android.R.attr.textColorPrimary
+            }
+        )
+        val secondaryWarningTextColor = context.getThemeAttrColor(
+            if (item.date == LocalDate.now()) {
+                R.attr.colorPrimary
+            } else {
+                android.R.attr.textColorSecondary
+            }
+        )
+
+        with(holder.binding) {
+            dashboardHomeworkSubitemTitle.text = "${item.subject} - ${item.content}"
+            dashboardHomeworkSubitemTitle.setTextColor(primaryWarningTextColor)
+
+            dashboardHomeworkSubitemTime.text =
+                context.getString(R.string.dashboard_homework_time, formattedDate)
+            dashboardHomeworkSubitemTime.setTextColor(secondaryWarningTextColor)
+        }
+    }
+
+    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/dashboard/DashboardItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
new file mode 100644
index 000000000..2948b42fa
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItem.kt
@@ -0,0 +1,134 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+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.pojos.TimetableFull
+import io.github.wulkanowy.data.db.entities.Homework as EntitiesHomework
+
+sealed class DashboardItem(val type: Type) {
+
+    abstract val error: Throwable?
+
+    abstract val isLoading: Boolean
+
+    abstract val isDataLoaded: Boolean
+
+    data class Account(
+        val student: Student? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.ACCOUNT) {
+
+        override val isDataLoaded get() = student != null
+    }
+
+    data class HorizontalGroup(
+        val unreadMessagesCount: Int? = null,
+        val attendancePercentage: Double? = null,
+        val luckyNumber: Int? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.HORIZONTAL_GROUP) {
+
+        override val isDataLoaded
+            get() = unreadMessagesCount != null || attendancePercentage != null || luckyNumber != null
+    }
+
+    data class Grades(
+        val subjectWithGrades: Map<String, List<Grade>>? = null,
+        val gradeTheme: String? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.GRADES) {
+
+        override val isDataLoaded get() = subjectWithGrades != null
+    }
+
+    data class Lessons(
+        val lessons: TimetableFull? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.LESSONS) {
+
+        override val isDataLoaded get() = lessons != null
+    }
+
+    data class Homework(
+        val homework: List<EntitiesHomework>? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.HOMEWORK) {
+
+        override val isDataLoaded get() = homework != null
+    }
+
+    data class Announcements(
+        val announcement: List<SchoolAnnouncement>? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.ANNOUNCEMENTS) {
+
+        override val isDataLoaded get() = announcement != null
+    }
+
+    data class Exams(
+        val exams: List<Exam>? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.EXAMS) {
+
+        override val isDataLoaded get() = exams != null
+    }
+
+    data class Conferences(
+        val conferences: List<Conference>? = null,
+        override val error: Throwable? = null,
+        override val isLoading: Boolean = false
+    ) : DashboardItem(Type.CONFERENCES) {
+
+        override val isDataLoaded get() = conferences != null
+    }
+
+    enum class Type {
+        ACCOUNT,
+        HORIZONTAL_GROUP,
+        LESSONS,
+        GRADES,
+        HOMEWORK,
+        ANNOUNCEMENTS,
+        EXAMS,
+        CONFERENCES,
+        ADS
+    }
+
+    enum class Tile {
+        ACCOUNT,
+        LUCKY_NUMBER,
+        MESSAGES,
+        ATTENDANCE,
+        LESSONS,
+        GRADES,
+        HOMEWORK,
+        ANNOUNCEMENTS,
+        EXAMS,
+        CONFERENCES,
+        ADS
+    }
+}
+
+fun DashboardItem.Tile.toDashboardItemType() = when (this) {
+    DashboardItem.Tile.ACCOUNT -> DashboardItem.Type.ACCOUNT
+    DashboardItem.Tile.LUCKY_NUMBER -> DashboardItem.Type.HORIZONTAL_GROUP
+    DashboardItem.Tile.MESSAGES -> DashboardItem.Type.HORIZONTAL_GROUP
+    DashboardItem.Tile.ATTENDANCE -> DashboardItem.Type.HORIZONTAL_GROUP
+    DashboardItem.Tile.LESSONS -> DashboardItem.Type.LESSONS
+    DashboardItem.Tile.GRADES -> DashboardItem.Type.GRADES
+    DashboardItem.Tile.HOMEWORK -> DashboardItem.Type.HOMEWORK
+    DashboardItem.Tile.ANNOUNCEMENTS -> DashboardItem.Type.ANNOUNCEMENTS
+    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
new file mode 100644
index 000000000..cf4097a4a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import java.util.Collections
+
+class DashboardItemMoveCallback(
+    private val dashboardAdapter: DashboardAdapter,
+    private var onUserInteractionEndListener: (List<DashboardItem>) -> 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
+    ): Int {
+        val dragFlags = if (viewHolder.bindingAdapterPosition != 0) {
+            ItemTouchHelper.UP or ItemTouchHelper.DOWN
+        } else 0
+
+        return makeMovementFlags(dragFlags, 0)
+    }
+
+    override fun canDropOver(
+        recyclerView: RecyclerView,
+        current: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ) = target.bindingAdapterPosition != 0
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        val list = dashboardAdapter.items.toMutableList()
+
+        Collections.swap(list, viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
+
+        dashboardAdapter.submitList(list)
+        return true
+    }
+
+    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        super.clearView(recyclerView, viewHolder)
+
+        onUserInteractionEndListener(dashboardAdapter.items.toList())
+    }
+}
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
new file mode 100644
index 000000000..0e24f0a14
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt
@@ -0,0 +1,700 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.enums.MessageFolder
+import io.github.wulkanowy.data.repositories.AttendanceSummaryRepository
+import io.github.wulkanowy.data.repositories.ConferenceRepository
+import io.github.wulkanowy.data.repositories.ExamRepository
+import io.github.wulkanowy.data.repositories.GradeRepository
+import io.github.wulkanowy.data.repositories.HomeworkRepository
+import io.github.wulkanowy.data.repositories.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.MessageRepository
+import io.github.wulkanowy.data.repositories.PreferencesRepository
+import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
+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.calculatePercentage
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import java.time.LocalDate
+import java.time.LocalDateTime
+import javax.inject.Inject
+
+class DashboardPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val luckyNumberRepository: LuckyNumberRepository,
+    private val gradeRepository: GradeRepository,
+    private val semesterRepository: SemesterRepository,
+    private val messageRepository: MessageRepository,
+    private val attendanceSummaryRepository: AttendanceSummaryRepository,
+    private val timetableRepository: TimetableRepository,
+    private val homeworkRepository: HomeworkRepository,
+    private val examRepository: ExamRepository,
+    private val conferenceRepository: ConferenceRepository,
+    private val preferencesRepository: PreferencesRepository,
+    private val schoolAnnouncementRepository: SchoolAnnouncementRepository
+) : BasePresenter<DashboardView>(errorHandler, studentRepository) {
+
+    private val dashboardItemLoadedList = mutableListOf<DashboardItem>()
+
+    private val dashboardItemRefreshLoadedList = mutableListOf<DashboardItem>()
+
+    private lateinit var dashboardItemsToLoad: Set<DashboardItem.Type>
+
+    private var dashboardTilesToLoad: Set<DashboardItem.Tile> = emptySet()
+
+    private lateinit var lastError: Throwable
+
+    override fun onAttachView(view: DashboardView) {
+        super.onAttachView(view)
+
+        with(view) {
+            initView()
+            showProgress(true)
+            showContent(false)
+        }
+
+        preferencesRepository.selectedDashboardTilesFlow
+            .onEach { loadData(tilesToLoad = it) }
+            .launch("dashboard_pref")
+    }
+
+    fun onDragAndDropEnd(list: List<DashboardItem>) {
+        dashboardItemLoadedList.clear()
+        dashboardItemLoadedList.addAll(list)
+
+        val positionList =
+            list.mapIndexed { index, dashboardItem -> Pair(dashboardItem.type, index) }.toMap()
+
+        preferencesRepository.dashboardItemsPosition = positionList
+    }
+
+    fun loadData(forceRefresh: Boolean = false, tilesToLoad: Set<DashboardItem.Tile>) {
+        val oldDashboardDataToLoad = dashboardTilesToLoad
+
+        dashboardTilesToLoad = tilesToLoad
+        dashboardItemsToLoad = dashboardTilesToLoad.map { it.toDashboardItemType() }.toSet()
+
+        removeUnselectedTiles()
+
+        val newTileList = generateTileListToLoad(oldDashboardDataToLoad, forceRefresh)
+        loadTiles(forceRefresh, newTileList)
+    }
+
+    private fun removeUnselectedTiles() {
+        val isLuckyNumberToLoad =
+            dashboardTilesToLoad.any { it == DashboardItem.Tile.LUCKY_NUMBER }
+        val isMessagesToLoad =
+            dashboardTilesToLoad.any { it == DashboardItem.Tile.MESSAGES }
+        val isAttendanceToLoad =
+            dashboardTilesToLoad.any { it == DashboardItem.Tile.ATTENDANCE }
+
+        dashboardItemLoadedList.removeAll { loadedTile -> dashboardItemsToLoad.none { it == loadedTile.type } }
+
+        val horizontalGroup =
+            dashboardItemLoadedList.find { it is DashboardItem.HorizontalGroup } as DashboardItem.HorizontalGroup?
+
+        if (horizontalGroup != null) {
+            val horizontalIndex = dashboardItemLoadedList.indexOf(horizontalGroup)
+            dashboardItemLoadedList.remove(horizontalGroup)
+
+            var updatedHorizontalGroup = horizontalGroup
+
+            if (horizontalGroup.luckyNumber != null && !isLuckyNumberToLoad) {
+                updatedHorizontalGroup = updatedHorizontalGroup.copy(luckyNumber = null)
+            }
+
+            if (horizontalGroup.attendancePercentage != null && !isAttendanceToLoad) {
+                updatedHorizontalGroup = updatedHorizontalGroup.copy(attendancePercentage = null)
+            }
+
+            if (horizontalGroup.unreadMessagesCount != null && !isMessagesToLoad) {
+                updatedHorizontalGroup = updatedHorizontalGroup.copy(unreadMessagesCount = null)
+            }
+
+            if (horizontalGroup.error != null) {
+                updatedHorizontalGroup = updatedHorizontalGroup.copy(error = null, isLoading = true)
+            }
+
+            dashboardItemLoadedList.add(horizontalIndex, updatedHorizontalGroup)
+        }
+
+        view?.updateData(dashboardItemLoadedList)
+    }
+
+    private fun loadTiles(forceRefresh: Boolean, tileList: List<DashboardItem.Tile>) {
+        tileList.forEach {
+            when (it) {
+                DashboardItem.Tile.ACCOUNT -> loadCurrentAccount(forceRefresh)
+                DashboardItem.Tile.LUCKY_NUMBER -> loadLuckyNumber(forceRefresh)
+                DashboardItem.Tile.MESSAGES -> loadMessages(forceRefresh)
+                DashboardItem.Tile.ATTENDANCE -> loadAttendance(forceRefresh)
+                DashboardItem.Tile.LESSONS -> loadLessons(forceRefresh)
+                DashboardItem.Tile.GRADES -> loadGrades(forceRefresh)
+                DashboardItem.Tile.HOMEWORK -> loadHomework(forceRefresh)
+                DashboardItem.Tile.ANNOUNCEMENTS -> loadSchoolAnnouncements(forceRefresh)
+                DashboardItem.Tile.EXAMS -> loadExams(forceRefresh)
+                DashboardItem.Tile.CONFERENCES -> loadConferences(forceRefresh)
+                DashboardItem.Tile.ADS -> TODO()
+            }
+        }
+    }
+
+    private fun generateTileListToLoad(
+        oldDashboardTileToLoad: Set<DashboardItem.Tile>,
+        forceRefresh: Boolean
+    ) = dashboardTilesToLoad.filter { newTileToLoad ->
+        oldDashboardTileToLoad.none { it == newTileToLoad } || forceRefresh
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the dashboard")
+        loadData(true, preferencesRepository.selectedDashboardTiles)
+    }
+
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
+        loadData(true, preferencesRepository.selectedDashboardTiles)
+    }
+
+    fun onViewReselected() {
+        Timber.i("Dashboard view is reselected")
+        view?.run {
+            resetView()
+            popViewToRoot()
+        }
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    fun onDashboardTileSettingsSelected(): Boolean {
+        view?.showDashboardTileSettings(preferencesRepository.selectedDashboardTiles.toList())
+        return true
+    }
+
+    fun onDashboardTileSettingSelected(selectedItems: List<String>) {
+        preferencesRepository.selectedDashboardTiles = selectedItems.map {
+            DashboardItem.Tile.valueOf(it)
+        }.toSet()
+    }
+
+    private fun loadCurrentAccount(forceRefresh: Boolean) {
+        flowWithResource { studentRepository.getCurrentStudent(false) }
+            .onEach {
+                when (it.status) {
+                    Status.LOADING -> {
+                        Timber.i("Loading dashboard account data started")
+                        if (forceRefresh) return@onEach
+                        updateData(DashboardItem.Account(it.data, isLoading = true), forceRefresh)
+                    }
+                    Status.SUCCESS -> {
+                        Timber.i("Loading dashboard account result: Success")
+                        updateData(DashboardItem.Account(it.data), forceRefresh)
+                    }
+                    Status.ERROR -> {
+                        Timber.i("Loading dashboard account result: An exception occurred")
+                        errorHandler.dispatch(it.error!!)
+                        updateData(DashboardItem.Account(error = it.error), forceRefresh)
+                    }
+                }
+            }
+            .launch("dashboard_account")
+    }
+
+    private fun loadLuckyNumber(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+
+            luckyNumberRepository.getLuckyNumber(student, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard lucky number data started")
+                    if (forceRefresh) return@onEach
+                    processHorizontalGroupData(
+                        luckyNumber = it.data?.luckyNumber,
+                        isLoading = true,
+                        forceRefresh = forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard lucky number result: Success")
+                    processHorizontalGroupData(
+                        luckyNumber = it.data?.luckyNumber ?: -1,
+                        forceRefresh = forceRefresh
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard lucky number result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    processHorizontalGroupData(error = it.error, forceRefresh = forceRefresh)
+                }
+            }
+        }.launch("dashboard_lucky_number")
+    }
+
+    private fun loadMessages(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+            val semester = semesterRepository.getCurrentSemester(student)
+
+            messageRepository.getMessages(student, semester, MessageFolder.RECEIVED, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard messages data started")
+                    if (forceRefresh) return@onEach
+                    val unreadMessagesCount = it.data?.count { message -> message.unread }
+
+                    processHorizontalGroupData(
+                        unreadMessagesCount = unreadMessagesCount,
+                        isLoading = true,
+                        forceRefresh = forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard messages result: Success")
+                    val unreadMessagesCount = it.data?.count { message -> message.unread }
+
+                    processHorizontalGroupData(
+                        unreadMessagesCount = unreadMessagesCount,
+                        forceRefresh = forceRefresh
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard messages result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    processHorizontalGroupData(error = it.error, forceRefresh = forceRefresh)
+                }
+            }
+        }.launch("dashboard_messages")
+    }
+
+    private fun loadAttendance(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+            val semester = semesterRepository.getCurrentSemester(student)
+
+            attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard attendance data started")
+                    if (forceRefresh) return@onEach
+                    val attendancePercentage = it.data?.calculatePercentage()
+
+                    processHorizontalGroupData(
+                        attendancePercentage = attendancePercentage,
+                        isLoading = true,
+                        forceRefresh = forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard attendance result: Success")
+                    val attendancePercentage = it.data?.calculatePercentage()
+
+                    processHorizontalGroupData(
+                        attendancePercentage = attendancePercentage,
+                        forceRefresh = forceRefresh
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard attendance result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+
+                    processHorizontalGroupData(error = it.error, forceRefresh = forceRefresh)
+                }
+            }
+        }.launch("dashboard_attendance")
+    }
+
+    private fun loadGrades(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+            val semester = semesterRepository.getCurrentSemester(student)
+
+            gradeRepository.getGrades(student, semester, forceRefresh)
+        }.map { originalResource ->
+            val filteredSubjectWithGrades = originalResource.data?.first.orEmpty()
+                .filter { grade ->
+                    grade.date.isAfter(LocalDate.now().minusDays(7))
+                }
+                .groupBy { grade -> grade.subject }
+                .mapValues { entry ->
+                    entry.value
+                        .take(5)
+                        .sortedBy { grade -> grade.date }
+                }
+                .toList()
+                .sortedBy { subjectWithGrades -> subjectWithGrades.second[0].date }
+                .toMap()
+
+            Resource(
+                status = originalResource.status,
+                data = filteredSubjectWithGrades.takeIf { originalResource.data != null },
+                error = originalResource.error
+            )
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard grades data started")
+                    if (forceRefresh) return@onEach
+                    updateData(
+                        DashboardItem.Grades(
+                            subjectWithGrades = it.data,
+                            gradeTheme = preferencesRepository.gradeColorTheme,
+                            isLoading = true
+                        ), forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard grades result: Success")
+                    updateData(
+                        DashboardItem.Grades(
+                            subjectWithGrades = it.data,
+                            gradeTheme = preferencesRepository.gradeColorTheme
+                        ), forceRefresh
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard grades result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    updateData(DashboardItem.Grades(error = it.error), forceRefresh)
+                }
+            }
+        }.launch("dashboard_grades")
+    }
+
+    private fun loadLessons(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+            val semester = semesterRepository.getCurrentSemester(student)
+            val date = LocalDate.now().nextOrSameSchoolDay
+
+            timetableRepository.getTimetable(
+                student = student,
+                semester = semester,
+                start = date,
+                end = date.plusDays(1),
+                forceRefresh = forceRefresh
+            )
+
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard lessons data started")
+                    if (forceRefresh) return@onEach
+                    updateData(DashboardItem.Lessons(it.data, isLoading = true), forceRefresh)
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard lessons result: Success")
+                    updateData(DashboardItem.Lessons(it.data), forceRefresh)
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard lessons result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    updateData(DashboardItem.Lessons(error = it.error), forceRefresh)
+                }
+            }
+        }.launch("dashboard_lessons")
+    }
+
+    private fun loadHomework(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+            val semester = semesterRepository.getCurrentSemester(student)
+            val date = LocalDate.now().nextOrSameSchoolDay
+
+            homeworkRepository.getHomework(
+                student = student,
+                semester = semester,
+                start = date,
+                end = date,
+                forceRefresh = forceRefresh
+            )
+        }.map { homeworkResource ->
+            val currentDate = LocalDate.now()
+
+            val filteredHomework = homeworkResource.data?.filter {
+                (it.date.isAfter(currentDate) || it.date == currentDate) && !it.isDone
+            }
+
+            homeworkResource.copy(data = filteredHomework)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard homework data started")
+                    if (forceRefresh) return@onEach
+                    updateData(
+                        DashboardItem.Homework(it.data ?: emptyList(), isLoading = true),
+                        forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard homework result: Success")
+                    updateData(DashboardItem.Homework(it.data ?: emptyList()), forceRefresh)
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard homework result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    updateData(DashboardItem.Homework(error = it.error), forceRefresh)
+                }
+            }
+        }.launch("dashboard_homework")
+    }
+
+    private fun loadSchoolAnnouncements(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+
+            schoolAnnouncementRepository.getSchoolAnnouncements(student, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard announcements data started")
+                    if (forceRefresh) return@onEach
+                    updateData(
+                        DashboardItem.Announcements(
+                            it.data ?: emptyList(),
+                            isLoading = true
+                        ), forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard announcements result: Success")
+                    updateData(DashboardItem.Announcements(it.data ?: emptyList()), forceRefresh)
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard announcements result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    updateData(DashboardItem.Announcements(error = it.error), forceRefresh)
+                }
+            }
+        }.launch("dashboard_announcements")
+    }
+
+    private fun loadExams(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+            val semester = semesterRepository.getCurrentSemester(student)
+
+            examRepository.getExams(
+                student = student,
+                semester = semester,
+                start = LocalDate.now(),
+                end = LocalDate.now().plusDays(7),
+                forceRefresh = forceRefresh
+            )
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard exams data started")
+                    if (forceRefresh) return@onEach
+                    updateData(
+                        DashboardItem.Exams(it.data.orEmpty(), isLoading = true),
+                        forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard exams result: Success")
+                    updateData(DashboardItem.Exams(it.data ?: emptyList()), forceRefresh)
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard exams result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    updateData(DashboardItem.Exams(error = it.error), forceRefresh)
+                }
+            }
+        }.launch("dashboard_exams")
+    }
+
+    private fun loadConferences(forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent(true)
+            val semester = semesterRepository.getCurrentSemester(student)
+
+            conferenceRepository.getConferences(
+                student = student,
+                semester = semester,
+                forceRefresh = forceRefresh,
+                startDate = LocalDateTime.now()
+            )
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    Timber.i("Loading dashboard conferences data started")
+                    if (forceRefresh) return@onEach
+                    updateData(
+                        DashboardItem.Conferences(it.data ?: emptyList(), isLoading = true),
+                        forceRefresh
+                    )
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading dashboard conferences result: Success")
+                    updateData(DashboardItem.Conferences(it.data ?: emptyList()), forceRefresh)
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading dashboard conferences result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    updateData(DashboardItem.Conferences(error = it.error), forceRefresh)
+                }
+            }
+        }.launch("dashboard_conferences")
+    }
+
+    private fun processHorizontalGroupData(
+        luckyNumber: Int? = null,
+        unreadMessagesCount: Int? = null,
+        attendancePercentage: Double? = null,
+        error: Throwable? = null,
+        isLoading: Boolean = false,
+        forceRefresh: Boolean
+    ) {
+        val isLuckyNumberToLoad =
+            dashboardTilesToLoad.any { it == DashboardItem.Tile.LUCKY_NUMBER }
+        val isMessagesToLoad =
+            dashboardTilesToLoad.any { it == DashboardItem.Tile.MESSAGES }
+        val isAttendanceToLoad =
+            dashboardTilesToLoad.any { it == DashboardItem.Tile.ATTENDANCE }
+        val isPushedToList =
+            dashboardItemLoadedList.any { it.type == DashboardItem.Type.HORIZONTAL_GROUP }
+
+        if (error != null) {
+            updateData(DashboardItem.HorizontalGroup(error = error), forceRefresh)
+            return
+        }
+
+        if (isLoading) {
+            val horizontalGroup =
+                dashboardItemLoadedList.find { it is DashboardItem.HorizontalGroup } as DashboardItem.HorizontalGroup?
+            val updatedHorizontalGroup =
+                horizontalGroup?.copy(isLoading = true) ?: DashboardItem.HorizontalGroup(isLoading = true)
+
+            updateData(updatedHorizontalGroup, forceRefresh)
+        }
+
+        if (forceRefresh && !isPushedToList) {
+            updateData(DashboardItem.HorizontalGroup(), forceRefresh)
+        }
+
+        val horizontalGroup =
+            dashboardItemLoadedList.single { it is DashboardItem.HorizontalGroup } as DashboardItem.HorizontalGroup
+
+        when {
+            luckyNumber != null -> {
+                updateData(horizontalGroup.copy(luckyNumber = luckyNumber), forceRefresh)
+            }
+            unreadMessagesCount != null -> {
+                updateData(
+                    horizontalGroup.copy(unreadMessagesCount = unreadMessagesCount),
+                    forceRefresh
+                )
+            }
+            attendancePercentage != null -> {
+                updateData(
+                    horizontalGroup.copy(attendancePercentage = attendancePercentage),
+                    forceRefresh
+                )
+            }
+        }
+
+        val isHorizontalGroupLoaded = dashboardItemLoadedList.any {
+            if (it !is DashboardItem.HorizontalGroup) return@any false
+
+            val isLuckyNumberStateCorrect = (it.luckyNumber != null) == isLuckyNumberToLoad
+            val isMessagesStateCorrect = (it.unreadMessagesCount != null) == isMessagesToLoad
+            val isAttendanceStateCorrect = (it.attendancePercentage != null) == isAttendanceToLoad
+
+            isLuckyNumberStateCorrect && isAttendanceStateCorrect && isMessagesStateCorrect
+        }
+
+        if (isHorizontalGroupLoaded) {
+            val updatedHorizontalGroup =
+                dashboardItemLoadedList.single { it is DashboardItem.HorizontalGroup } as DashboardItem.HorizontalGroup
+
+            updateData(updatedHorizontalGroup.copy(isLoading = false, error = null), forceRefresh)
+        }
+    }
+
+    private fun updateData(dashboardItem: DashboardItem, forceRefresh: Boolean) {
+        val isForceRefreshError = forceRefresh && dashboardItem.error != null
+        val dashboardItemsPosition = preferencesRepository.dashboardItemsPosition
+
+        with(dashboardItemLoadedList) {
+            removeAll { it.type == dashboardItem.type && !isForceRefreshError }
+            if (!isForceRefreshError) add(dashboardItem)
+            sortBy { tile -> dashboardItemsToLoad.single { it == tile.type }.ordinal }
+        }
+
+        if (forceRefresh) {
+            with(dashboardItemRefreshLoadedList) {
+                removeAll { it.type == dashboardItem.type }
+                add(dashboardItem)
+            }
+        }
+
+        dashboardItemLoadedList.sortBy { tile ->
+            dashboardItemsPosition?.getOrDefault(
+                tile.type,
+                tile.type.ordinal + 100
+            ) ?: tile.type.ordinal
+        }
+
+        val isItemsLoaded =
+            dashboardItemsToLoad.all { type -> dashboardItemLoadedList.any { it.type == type } }
+        val isRefreshItemLoaded =
+            dashboardItemsToLoad.all { type -> dashboardItemRefreshLoadedList.any { it.type == type } }
+        val isItemsDataLoaded = isItemsLoaded && dashboardItemLoadedList.all {
+            it.isDataLoaded || it.error != null
+        }
+        val isRefreshItemsDataLoaded = isRefreshItemLoaded && dashboardItemRefreshLoadedList.all {
+            it.isDataLoaded || it.error != null
+        }
+
+        if (isRefreshItemsDataLoaded) {
+            view?.showRefresh(false)
+            dashboardItemRefreshLoadedList.clear()
+        }
+
+        view?.run {
+            if (!forceRefresh) {
+                showProgress(!isItemsDataLoaded)
+                showContent(isItemsDataLoaded)
+            }
+            updateData(dashboardItemLoadedList.toList())
+        }
+
+        if (isItemsLoaded) {
+            val filteredItems =
+                dashboardItemLoadedList.filterNot { it.type == DashboardItem.Type.ACCOUNT }
+            val isAccountItemError =
+                dashboardItemLoadedList.single { it.type == DashboardItem.Type.ACCOUNT }.error != null
+            val isGeneralError =
+                filteredItems.all { it.error != null } && filteredItems.isNotEmpty() || isAccountItemError
+
+            val errorMessage = filteredItems.map { it.error?.stackTraceToString() }.toString()
+
+            lastError = Exception(errorMessage)
+
+            view?.run {
+                showProgress(false)
+                showContent(!isGeneralError)
+                showErrorView(isGeneralError)
+            }
+        }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..d5c5e5a70
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardView.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.ui.modules.dashboard
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface DashboardView : BaseView {
+
+    fun initView()
+
+    fun updateData(data: List<DashboardItem>)
+
+    fun showDashboardTileSettings(selectedItems: List<DashboardItem.Tile>)
+
+    fun showProgress(show: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showRefresh(show: Boolean)
+
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
+    fun resetView()
+
+    fun popViewToRoot()
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugAdapter.kt
new file mode 100644
index 000000000..36f99ca30
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugAdapter.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.ui.modules.debug
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.databinding.ItemDebugBinding
+
+class DebugAdapter : RecyclerView.Adapter<DebugAdapter.ItemViewHolder>() {
+
+    var items = emptyList<DebugItem>()
+
+    var onItemClickListener: (DebugItem) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemDebugBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+        with(holder.binding) {
+            debugItemName.setText(item.title)
+
+            root.setOnClickListener {
+                onItemClickListener(item)
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemDebugBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugFragment.kt
new file mode 100644
index 000000000..000916b17
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugFragment.kt
@@ -0,0 +1,65 @@
+package io.github.wulkanowy.ui.modules.debug
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentDebugBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.debug.logviewer.LogViewerFragment
+import io.github.wulkanowy.ui.modules.debug.notification.NotificationDebugFragment
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class DebugFragment : BaseFragment<FragmentDebugBinding>(R.layout.fragment_debug), DebugView,
+    MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: DebugPresenter
+
+    private val debugAdapter = DebugAdapter()
+
+    override val titleStringId: Int
+        get() = R.string.debug_title
+
+    companion object {
+        fun newInstance() = DebugFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentDebugBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        debugAdapter.onItemClickListener = presenter::onItemSelect
+        with(binding.debugRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = debugAdapter
+        }
+    }
+
+    override fun setItems(itemList: List<DebugItem>) {
+        with(debugAdapter) {
+            items = itemList
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun openLogViewer() {
+        (activity as? MainActivity)?.pushView(LogViewerFragment.newInstance())
+    }
+
+    override fun openNotificationsDebug() {
+        (activity as? MainActivity)?.pushView(NotificationDebugFragment.newInstance())
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugItem.kt
new file mode 100644
index 000000000..2273294ef
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugItem.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.ui.modules.debug
+
+import androidx.annotation.StringRes
+
+data class DebugItem(
+    @StringRes val title: Int,
+)
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugPresenter.kt
new file mode 100644
index 000000000..67ac88861
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugPresenter.kt
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.ui.modules.debug
+
+import io.github.wulkanowy.R
+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 DebugPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+) : BasePresenter<DebugView>(errorHandler, studentRepository) {
+
+    val items = listOf(
+        DebugItem(R.string.logviewer_title),
+        DebugItem(R.string.notification_debug_title),
+    )
+
+    override fun onAttachView(view: DebugView) {
+        super.onAttachView(view)
+        Timber.i("Debug view was initialized")
+
+        with(view) {
+            initView()
+            setItems(items)
+        }
+    }
+
+    fun onItemSelect(item: DebugItem) {
+        when (item.title) {
+            R.string.logviewer_title -> view?.openLogViewer()
+            R.string.notification_debug_title -> view?.openNotificationsDebug()
+            else -> Timber.d("Unknown debug item: $item")
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugView.kt
new file mode 100644
index 000000000..9396ec6ac
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/DebugView.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.ui.modules.debug
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface DebugView : BaseView {
+
+    fun initView()
+
+    fun setItems(itemList: List<DebugItem>)
+
+    fun openLogViewer()
+
+    fun openNotificationsDebug()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerAdapter.kt
similarity index 91%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerAdapter.kt
index 45c304aae..5a0e21046 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerAdapter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
+package io.github.wulkanowy.ui.modules.debug.logviewer
 
 import android.view.ViewGroup
 import android.widget.TextView
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerFragment.kt
similarity index 90%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerFragment.kt
index cf40975e7..1e11c874b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerFragment.kt
@@ -1,12 +1,9 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
+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.net.Uri
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
@@ -81,8 +78,7 @@ class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragme
             putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
             addFlags(FLAG_GRANT_READ_URI_PERMISSION)
             putParcelableArrayListExtra(EXTRA_STREAM, ArrayList(files.map {
-                if (SDK_INT < LOLLIPOP) Uri.fromFile(it)
-                else FileProvider.getUriForFile(requireContext(), "$APPLICATION_ID.fileprovider", it)
+                FileProvider.getUriForFile(requireContext(), "$APPLICATION_ID.fileprovider", it)
             }))
         }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerPresenter.kt
similarity index 97%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerPresenter.kt
index 80020c81d..4310ff87c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerPresenter.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
+package io.github.wulkanowy.ui.modules.debug.logviewer
 
 import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.LoggerRepository
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerView.kt
similarity index 78%
rename from app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
rename to app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerView.kt
index bd98c24fd..3d138ecec 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/logviewer/LogViewerView.kt
@@ -1,4 +1,4 @@
-package io.github.wulkanowy.ui.modules.about.logviewer
+package io.github.wulkanowy.ui.modules.debug.logviewer
 
 import io.github.wulkanowy.ui.base.BaseView
 import java.io.File
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugAdapter.kt
new file mode 100644
index 000000000..78107d436
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugAdapter.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.ui.modules.debug.notification
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.databinding.ItemDebugNotificationsBinding
+
+class NotificationDebugAdapter : RecyclerView.Adapter<NotificationDebugAdapter.ItemViewHolder>() {
+
+    var items = emptyList<NotificationDebugItem>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemDebugNotificationsBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            title.setText(item.title)
+            button1.setOnClickListener { item.onClickCallback(1) }
+            button2.setOnClickListener { item.onClickCallback(3) }
+            button3.setOnClickListener { item.onClickCallback(10) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemDebugNotificationsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugFragment.kt
new file mode 100644
index 000000000..c5c797d0b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugFragment.kt
@@ -0,0 +1,54 @@
+package io.github.wulkanowy.ui.modules.debug.notification
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentDebugNotificationsBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class NotificationDebugFragment :
+    BaseFragment<FragmentDebugNotificationsBinding>(R.layout.fragment_debug_notifications),
+    NotificationDebugView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: NotificationDebugPresenter
+
+    private val notificationDebugAdapter = NotificationDebugAdapter()
+
+    override val titleStringId: Int
+        get() = R.string.notification_debug_title
+
+    companion object {
+        fun newInstance() = NotificationDebugFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentDebugNotificationsBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(binding.recyclerView) {
+            adapter = notificationDebugAdapter
+            layoutManager = LinearLayoutManager(requireContext())
+        }
+    }
+
+    override fun setItems(notificationDebugs: List<NotificationDebugItem>) {
+        with(notificationDebugAdapter) {
+            items = notificationDebugs
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugItem.kt
new file mode 100644
index 000000000..5a5287873
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugItem.kt
@@ -0,0 +1,8 @@
+package io.github.wulkanowy.ui.modules.debug.notification
+
+import androidx.annotation.StringRes
+
+data class NotificationDebugItem(
+    @StringRes val title: Int,
+    val onClickCallback: (numberOfNotifications: Int) -> Unit,
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugPresenter.kt
new file mode 100644
index 000000000..07468daa6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugPresenter.kt
@@ -0,0 +1,95 @@
+package io.github.wulkanowy.ui.modules.debug.notification
+
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.services.sync.notifications.NewConferenceNotification
+import io.github.wulkanowy.services.sync.notifications.NewExamNotification
+import io.github.wulkanowy.services.sync.notifications.NewGradeNotification
+import io.github.wulkanowy.services.sync.notifications.NewHomeworkNotification
+import io.github.wulkanowy.services.sync.notifications.NewLuckyNumberNotification
+import io.github.wulkanowy.services.sync.notifications.NewMessageNotification
+import io.github.wulkanowy.services.sync.notifications.NewNoteNotification
+import io.github.wulkanowy.services.sync.notifications.NewSchoolAnnouncementNotification
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugConferenceItems
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugExamItems
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugGradeDetailsItems
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugGradeSummaryItems
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugHomeworkItems
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugLuckyNumber
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugMessageItems
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugNoteItems
+import io.github.wulkanowy.ui.modules.debug.notification.mock.debugSchoolAnnouncementItems
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+class NotificationDebugPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val newGradeNotification: NewGradeNotification,
+    private val newHomeworkNotification: NewHomeworkNotification,
+    private val newConferenceNotification: NewConferenceNotification,
+    private val newExamNotification: NewExamNotification,
+    private val newMessageNotification: NewMessageNotification,
+    private val newNoteNotification: NewNoteNotification,
+    private val newSchoolAnnouncementNotification: NewSchoolAnnouncementNotification,
+    private val newLuckyNumberNotification: NewLuckyNumberNotification,
+) : BasePresenter<NotificationDebugView>(errorHandler, studentRepository) {
+
+    private val items = listOf(
+        NotificationDebugItem(R.string.grade_title) { n ->
+            withStudent { newGradeNotification.notifyDetails(debugGradeDetailsItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.grade_summary_predicted_grade) { n ->
+            withStudent { newGradeNotification.notifyPredicted(debugGradeSummaryItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.grade_summary_final_grade) { n ->
+            withStudent { newGradeNotification.notifyFinal(debugGradeSummaryItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.homework_title) { n ->
+            withStudent { newHomeworkNotification.notify(debugHomeworkItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.conferences_title) { n ->
+            withStudent { newConferenceNotification.notify(debugConferenceItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.exam_title) { n ->
+            withStudent { newExamNotification.notify(debugExamItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.message_title) { n ->
+            withStudent { newMessageNotification.notify(debugMessageItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.note_title) { n ->
+            withStudent { newNoteNotification.notify(debugNoteItems.take(n), it) }
+        },
+        NotificationDebugItem(R.string.school_announcement_title) { n ->
+            withStudent {
+                newSchoolAnnouncementNotification.notify(debugSchoolAnnouncementItems.take(n), it)
+            }
+        },
+        NotificationDebugItem(R.string.lucky_number_title) { n ->
+            withStudent {
+                repeat(n) { _ ->
+                    newLuckyNumberNotification.notify(debugLuckyNumber, it)
+                }
+            }
+        },
+    )
+
+    override fun onAttachView(view: NotificationDebugView) {
+        super.onAttachView(view)
+        Timber.i("Notification debug view was initialized")
+        with(view) {
+            initView()
+            setItems(items)
+        }
+    }
+
+    private fun withStudent(block: (Student) -> Unit) {
+        launch {
+            block(studentRepository.getCurrentStudent(false))
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugView.kt
new file mode 100644
index 000000000..e2c043c3b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/NotificationDebugView.kt
@@ -0,0 +1,10 @@
+package io.github.wulkanowy.ui.modules.debug.notification
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface NotificationDebugView : BaseView {
+
+    fun initView()
+
+    fun setItems(notificationDebugs: List<NotificationDebugItem>)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/conference.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/conference.kt
new file mode 100644
index 000000000..40af6bfbb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/conference.kt
@@ -0,0 +1,58 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.Conference
+import java.time.LocalDateTime
+
+val debugConferenceItems = listOf(
+    generateConference(
+        title = "Spotkanie z rodzicami/opiekunami",
+        subject = "Podsumowanie I semestru - średnia klasy, oceny, frekwencja, zachowanie"
+    ),
+    generateConference(
+        title = "ZSW",
+        subject = "Pierwsze - organizacyjne zebranie z rodzicami klas pierwszych"
+    ),
+    generateConference(
+        title = "Spotkanie z rodzicami w sprawie bójki",
+        subject = "Pierwsze - i miejmy nadzieję ostatnie - zebranie w takiej sprawie"
+    ),
+    generateConference(
+        title = "Spotkanie z rodzicami w sprawie kolejnej bójki",
+        subject = "Kolejne - ale miejmy jeszcze nadzieję, że ostatnie - zebranie w takiej sprawie"
+    ),
+    generateConference(
+        title = "Spotkanie z rodzicami w sprawie jeszcze jednej bójki",
+        subject = "Proszę państwa, proszę uspokoić swoje dzieci"
+    ),
+    generateConference(
+        title = "Spotkanie w sprawie wydalenia części uczniów",
+        subject = "Proszę państwa, to jest krok ostateczny, którego nikt nie chciał się podjąć, ale ktoś musi"
+    ),
+    generateConference(
+        title = "Spotkanie organizacyjne w drugim semestrze",
+        subject = "Prezentacja na temat projektu 'Spokojnej szkoły'"
+    ),
+    generateConference(
+        title = "Spotkanie z pierwszakami",
+        subject = "Mamy sobie do pogadania"
+    ),
+    generateConference(
+        title = "Spotkanie z rodzicami szóstoklaistów",
+        subject = "Musimy przygotować dzieci do ważnej uroczystości"
+    ),
+    generateConference(
+        title = "Spotkanie podsumowujące pracę w ciągu ostatniego roku szkolnego",
+        subject = "Proszę państwa, zapraszam serdecznie na spotkanie"
+    ),
+)
+
+private fun generateConference(title: String, subject: String) = Conference(
+    title = title,
+    subject = subject,
+    studentId = 0,
+    diaryId = 0,
+    agenda = "",
+    conferenceId = 0,
+    date = LocalDateTime.now().plusMinutes(10),
+    presentOnConference = "",
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/exam.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/exam.kt
new file mode 100644
index 000000000..45700c29a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/exam.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.Exam
+import java.time.LocalDate
+
+val debugExamItems = listOf(
+    generateExam("Matematyka", "Figury na płaszczyźnie"),
+    generateExam("Język angielski", "czasowniki nieregularne 1 część"),
+    generateExam("Geografia", "Opolszczyzna - mapa"),
+    generateExam("Sieci komputerowe", "Zaciskanie erjotek"),
+    generateExam("Systemy operacyjne", "Instalacja ubuntu 16.04"),
+    generateExam("Język niemiecki", "oral exam"),
+    generateExam("Biologia", "Budowa koniczyny"),
+    generateExam("Chemia", "synteza płynnego zaliczenia"),
+    generateExam("Fizyka", "telekineza"),
+    generateExam("Matematyka", "Liczby zespolone i pochodne piątego rzędu"),
+)
+
+private fun generateExam(subject: String, description: String) = Exam(
+    subject = subject,
+    description = description,
+    studentId = 0,
+    diaryId = 0,
+    date = LocalDate.now(),
+    entryDate = LocalDate.now(),
+    group = "",
+    type = "",
+    teacher = "",
+    teacherSymbol = ""
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt
new file mode 100644
index 000000000..f9c481e39
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeDetails.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.Grade
+import java.time.LocalDate
+
+val debugGradeDetailsItems = listOf(
+    generateGrade("Matematyka", "+"),
+    generateGrade("Matematyka", "2="),
+    generateGrade("Fizyka", "-"),
+    generateGrade("Geografia", "4+"),
+    generateGrade("Sieci komputerowe", "1"),
+    generateGrade("Systemy operacyjne", "3+"),
+    generateGrade("Język polski", "2-"),
+    generateGrade("Język angielski", "4+"),
+    generateGrade("Religia", "6"),
+    generateGrade("Język niemiecki", "1!"),
+    generateGrade("Wychowanie fizyczne", "5"),
+)
+
+private fun generateGrade(subject: String, entry: String) = Grade(
+    subject = subject,
+    entry = entry,
+    semesterId = 0,
+    studentId = 0,
+    value = 0.0,
+    modifier = 0.0,
+    comment = "",
+    color = "",
+    gradeSymbol = "",
+    description = "",
+    weight = "",
+    weightValue = 0.0,
+    date = LocalDate.now(),
+    teacher = ""
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt
new file mode 100644
index 000000000..c452204b9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/gradeSummary.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.GradeSummary
+
+val debugGradeSummaryItems = listOf(
+    generateSummary("Matematyka", "2-", "2"),
+    generateSummary("Fizyka", "1", "2"),
+    generateSummary("Geografia", "4+", "5"),
+    generateSummary("Sieci komputerowe", "2", "5"),
+    generateSummary("Systemy operacyjne", "3", "4"),
+    generateSummary("Język polski", "1", "3"),
+    generateSummary("Język angielski", "4", "3"),
+    generateSummary("Religia", "5", "6"),
+    generateSummary("Język niemiecki", "2", "2"),
+    generateSummary("Wychowanie fizyczne", "5", "5"),
+    generateSummary("Biologia", "4", "4"),
+)
+
+private fun generateSummary(subject: String, predicted: String, final: String) = GradeSummary(
+    semesterId = 0,
+    studentId = 0,
+    position = 0,
+    subject = subject,
+    predictedGrade = predicted,
+    finalGrade = final,
+    proposedPoints = "",
+    finalPoints = "",
+    pointsSum = "",
+    average = .0
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/homework.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/homework.kt
new file mode 100644
index 000000000..6c7d7fac6
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/homework.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.Homework
+import java.time.LocalDate
+
+val debugHomeworkItems = listOf(
+    generateHomework("Chemia", "Test diagnozujący i Rozdział I do 30.10"),
+    generateHomework("Etyka", "Notatka własna do zajęć o ks. Jerzym Popiełuszko"),
+    generateHomework("Język angielski", "Zadania egzaminacyjne"),
+    generateHomework("Metodologia programowania", "Wszystkie instrukcje"),
+    generateHomework("Język polski", "Notatka własna na temat Wokulskiego z lektury Lalka"),
+    generateHomework("Systemy operacyjne", "Sprawozdanie z wykonania ćwiczenia nr 21.137"),
+    generateHomework("Matematyka", "Zadania od strony 1 do 128"),
+    generateHomework("Język niemiecki", "Opis swoich wakacji - dialog z kolegą"),
+    generateHomework("Język angielski", "Opis swoich wakacji - dialog z kolegą"),
+    generateHomework("Wychowanie fizyczne", "Notatka na temat skoku w dald"),
+    generateHomework("Biologia", "Notatka na temat grzechotnika"),
+)
+
+private fun generateHomework(subject: String, content: String) = Homework(
+    subject = subject,
+    content = content,
+    semesterId = 0,
+    studentId = 0,
+    date = LocalDate.now(),
+    entryDate = LocalDate.now(),
+    teacher = "",
+    teacherSymbol = "",
+    attachments = listOf(),
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/luckyNumber.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/luckyNumber.kt
new file mode 100644
index 000000000..e929a0904
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/luckyNumber.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.LuckyNumber
+import java.time.LocalDate
+import kotlin.random.Random
+
+val debugLuckyNumber
+    get() = LuckyNumber(
+        studentId = 0,
+        date = LocalDate.now(),
+        luckyNumber = Random.nextInt(1, 128),
+    )
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
new file mode 100644
index 000000000..f506d2f6e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/message.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.Message
+import java.time.LocalDateTime
+
+val debugMessageItems = listOf(
+    generateMessage("Kowalski Jan", "Tytuł"),
+    generateMessage("Nazwisko Imię", "Tytuł wiadomości"),
+    generateMessage("Malinowski Kazimierz", "Nakrętki"),
+    generateMessage("Jastębowszki Orest", "Prośba do uczniów o pomoc przy projekcie"),
+    generateMessage("Metylowy Oranż", "Pozew o plagiat"),
+    generateMessage("VULCAN", "Uwaga na nieautoryzowane aplikacje"),
+    generateMessage("Mama", "Zacznij się w końcu uczyć do matury!!!11"),
+    generateMessage("Tata", "Kupisz mi coś w sklepie?"),
+    generateMessage("Wychowawca", "Upomnienie od wychowawcy za nieobecności"),
+    generateMessage("Kochanowska Joanna", "Poprawa rozprawki - termin"),
+)
+
+private fun generateMessage(sender: String, subject: String) = Message(
+    sender = sender,
+    subject = subject,
+    studentId = 0,
+    realId = 0,
+    messageId = 0,
+    senderId = 0,
+    recipient = "",
+    date = LocalDateTime.now(),
+    folderId = 0,
+    unread = true,
+    removed = false,
+    hasAttachments = false
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/note.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/note.kt
new file mode 100644
index 000000000..b287a508b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/note.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
+import java.time.LocalDate
+
+val debugNoteItems = listOf(
+    generateNote("Aleksadra Krajewska", "Przeszkadzanie na lekcjach", NoteCategory.NEGATIVE),
+    generateNote("Zofia Czerwińska", "Udział w konkursie szkolnym", NoteCategory.POSITIVE),
+    generateNote("Stanisław Krupa", "Kultura języka", NoteCategory.NEUTRAL),
+    generateNote("Karolina Kowalska", "Wypełnianie obowiązków ucznia", NoteCategory.NEUTRAL),
+    generateNote("Joanna Krupa", "Umycie tablicy cifem", NoteCategory.POSITIVE),
+    generateNote("Duchowicz Maksymilian", "Reprezentowanie szkoły", NoteCategory.POSITIVE),
+    generateNote("Michał Mazur", "Przeszkadzanie na lekcji", NoteCategory.NEGATIVE),
+    generateNote("Karolina Kowalska", "Wypełnianie obowiązków ucznia", NoteCategory.NEGATIVE),
+    generateNote("Aleksandra Krajewska", "Wysadzenie klasy w powietrze", NoteCategory.NEGATIVE),
+)
+
+private fun generateNote(teacher: String, category: String, type: NoteCategory) = Note(
+    teacher = teacher,
+    category = category,
+    categoryType = type.id,
+    studentId = 0,
+    date = LocalDate.now(),
+    teacherSymbol = "",
+    isPointsShow = false,
+    points = 0,
+    content = ""
+)
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
new file mode 100644
index 000000000..42524e6e0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt
@@ -0,0 +1,24 @@
+package io.github.wulkanowy.ui.modules.debug.notification.mock
+
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import java.time.LocalDate
+
+val debugSchoolAnnouncementItems = listOf(
+    generateAnnouncement("Dzień wolny od zajęć dydaktycznych", "Dzień wolny od zajęć dydaktycznych\n03.05.2021 - poniedziałek"),
+    generateAnnouncement("Zasady bezpieczeństwa", "Wszyscy uczniowie są zobowiązani do noszenia maseczek"),
+    generateAnnouncement("Święto szkoły", "W najbliższych dniach obchodzimy święto szkoły, podczas którego..."),
+    generateAnnouncement("Rocznica odzyskania przez szkołę sztandaru", "Juz niedługo, bo za tydzień, a dokładnie za 8 dni..."),
+    generateAnnouncement("Ogłoszenie w sprawie otwarcia stołówki", "Wszyscy uczniowie zainteresowani obiadami w szkole..."),
+    generateAnnouncement("Uczniowie proszeni do sekretariatu", "Kuba i Jacek z klasy czwartej proszeni do dyrektora w trybie pilnym"),
+    generateAnnouncement("Dzień wolny od zajęć dydaktycznych", "Dzień wolny od zajęć dydaktycznych\n21.06.2021 - poniedziałek"),
+    generateAnnouncement("Zasady bezpieczeństwa", "Wszyscy uczniowie są zobowiązani do zdjęcia maseczek"),
+    generateAnnouncement("Święto państwowe", "W najbliższych dniach obchodzimy święto państwowe, podczas którego..."),
+    generateAnnouncement("Uczniowie proszeni do sekretariatu", "Kuba i Jacek z klasy czwartej proszeni do dyrektora w trybie wolnym"),
+)
+
+private fun generateAnnouncement(subject: String, content: String) = SchoolAnnouncement(
+    subject = subject,
+    content = content,
+    studentId = 0,
+    date = LocalDate.now()
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
index 535587399..4dc8afd30 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.databinding.HeaderExamBinding
 import io.github.wulkanowy.databinding.ItemExamBinding
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.weekDayName
 import java.time.LocalDate
@@ -42,7 +43,7 @@ class ExamAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.View
     @SuppressLint("DefaultLocale")
     private fun bindHeaderViewHolder(binding: HeaderExamBinding, date: LocalDate) {
         with(binding) {
-            examHeaderDay.text = date.weekDayName.capitalize()
+            examHeaderDay.text = date.weekDayName.capitalise()
             examHeaderDate.text = date.toFormattedString()
         }
     }
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 0940b0bdf..fb7939bc5 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
@@ -20,7 +20,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
-    MainView.MainChildView, MainView.TitledView {
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: ExamPresenter
@@ -90,14 +90,6 @@ class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam),
         }
     }
 
-    override fun resetView() {
-        binding.examRecycler.scrollToPosition(0)
-    }
-
-    override fun onFragmentReselected() {
-        if (::presenter.isInitialized) presenter.onViewReselected()
-    }
-
     override fun showEmpty(show: Boolean) {
         binding.examEmpty.visibility = if (show) VISIBLE else GONE
     }
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 b70a648f4..582641fcf 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
@@ -82,16 +82,6 @@ class ExamPresenter @Inject constructor(
         view?.showExamDialog(exam)
     }
 
-    fun onViewReselected() {
-        Timber.i("Exam view is reselected")
-        baseDate.also {
-            if (currentDate != it) {
-                reloadView(it)
-                loadData()
-            } else if (view?.isViewEmpty == false) view?.resetView()
-        }
-    }
-
     private fun setBaseDateOnHolidays() {
         flow {
             val student = studentRepository.getCurrentStudent()
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 ac1a87fe9..45b9e788c 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
@@ -17,8 +17,6 @@ interface ExamView : BaseView {
 
     fun showRefresh(show: Boolean)
 
-    fun resetView()
-
     fun showEmpty(show: Boolean)
 
     fun showErrorView(show: Boolean)
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 d83b1490c..4a3049721 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
@@ -34,6 +34,8 @@ class GradeAverageProvider @Inject constructor(
 
     private val minusModifier get() = preferencesRepository.gradeMinusModifier
 
+    private val isOptionalArithmeticAverage get() = preferencesRepository.isOptionalArithmeticAverage
+
     fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean) =
         flowWithResourceIn {
             val semesters = semesterRepository.getSemesters(student)
@@ -129,7 +131,7 @@ class GradeAverageProvider @Inject constructor(
         val updatedFirstSemesterGrades =
             firstSemesterSubject?.grades?.updateModifiers(student).orEmpty()
 
-        (updatedSecondSemesterGrades + updatedFirstSemesterGrades).calcAverage()
+        (updatedSecondSemesterGrades + updatedFirstSemesterGrades).calcAverage(isOptionalArithmeticAverage)
     } else {
         secondSemesterSubject.average
     }
@@ -145,9 +147,9 @@ class GradeAverageProvider @Inject constructor(
 
         return if (!isAnyVulcanAverage || isGradeAverageForceCalc) {
             val secondSemesterAverage =
-                secondSemesterSubject.grades.updateModifiers(student).calcAverage()
+                secondSemesterSubject.grades.updateModifiers(student).calcAverage(isOptionalArithmeticAverage)
             val firstSemesterAverage = firstSemesterSubject?.grades?.updateModifiers(student)
-                ?.calcAverage() ?: secondSemesterAverage
+                ?.calcAverage(isOptionalArithmeticAverage) ?: secondSemesterAverage
 
             (secondSemesterAverage + firstSemesterAverage) / divider
         } else {
@@ -178,7 +180,7 @@ class GradeAverageProvider @Inject constructor(
                     GradeSubject(
                         subject = summary.subject,
                         average = if (!isAnyAverage || isGradeAverageForceCalc) {
-                            grades.updateModifiers(student).calcAverage()
+                            grades.updateModifiers(student).calcAverage(isOptionalArithmeticAverage)
                         } else summary.average,
                         points = summary.pointsSum,
                         summary = summary,
@@ -211,7 +213,7 @@ class GradeAverageProvider @Inject constructor(
                 proposedPoints = "",
                 finalPoints = "",
                 pointsSum = "",
-                average = if (calcAverage) details.updateModifiers(student).calcAverage() else .0
+                average = if (calcAverage) details.updateModifiers(student).calcAverage(isOptionalArithmeticAverage) else .0
             )
         }
     }
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 6f9321692..01631140c 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
@@ -108,7 +108,7 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
 
     private fun bindHeaderViewHolder(holder: HeaderViewHolder, header: GradeDetailsHeader, position: Int) {
         val headerPosition = headers.indexOf(items[position])
-        val adapterPosition = holder.adapterPosition
+        val adapterPosition = holder.bindingAdapterPosition
 
         with(holder.binding) {
             gradeHeaderDivider.visibility = if (adapterPosition == 0) View.GONE else View.VISIBLE
@@ -161,7 +161,7 @@ class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<Recycler
             gradeItemNote.visibility = if (!grade.isRead) View.VISIBLE else View.GONE
 
             root.setOnClickListener {
-                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(grade, it) }
+                holder.bindingAdapterPosition.let { if (it != NO_POSITION) onClickListener(grade, it) }
             }
         }
     }
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 6d86c7bb2..7544d2aa1 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
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import android.annotation.SuppressLint
 import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.repositories.GradeRepository
@@ -202,8 +201,9 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun updateNewGradesAmount(grades: List<GradeSubject>) {
-        newGradesAmount =
-            grades.sumBy { item -> item.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
+        newGradesAmount = grades.sumOf { item ->
+            item.grades.sumOf { grade -> (if (!grade.isRead) 1 else 0).toInt() }
+        }
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -217,7 +217,6 @@ class GradeDetailsPresenter @Inject constructor(
         }
     }
 
-    @SuppressLint("DefaultLocale")
     private fun createGradeItems(items: List<GradeSubject>): List<GradeDetailsItem> {
         return items
             .let { gradesWithAverages ->
@@ -228,7 +227,7 @@ class GradeDetailsPresenter @Inject constructor(
             .let {
                 when (preferencesRepository.gradeSortingMode) {
                     DATE -> it.sortedByDescending { gradeDetailsWithAverage -> gradeDetailsWithAverage.grades.firstOrNull()?.date }
-                    ALPHABETIC -> it.sortedBy { gradeDetailsWithAverage -> gradeDetailsWithAverage.subject.toLowerCase() }
+                    ALPHABETIC -> it.sortedBy { gradeDetailsWithAverage -> gradeDetailsWithAverage.subject.lowercase() }
                 }
             }
             .map { (subject, average, points, _, grades) ->
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 edc2a9e19..0754361c9 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
@@ -5,15 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
 import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
-import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.utils.calcAverage
-import io.github.wulkanowy.utils.changeModifier
 import java.util.Locale
 import javax.inject.Inject
 
@@ -39,8 +36,12 @@ class GradeSummaryAdapter @Inject constructor(
         val inflater = LayoutInflater.from(parent.context)
 
         return when (viewType) {
-            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false))
-            ViewType.ITEM.id -> ItemViewHolder(ItemGradeSummaryBinding.inflate(inflater, parent, false))
+            ViewType.HEADER.id -> HeaderViewHolder(
+                ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false)
+            )
+            ViewType.ITEM.id -> ItemViewHolder(
+                ItemGradeSummaryBinding.inflate(inflater, parent, false)
+            )
             else -> throw IllegalStateException()
         }
     }
@@ -55,13 +56,32 @@ class GradeSummaryAdapter @Inject constructor(
     private fun bindHeaderViewHolder(binding: ScrollableHeaderGradeSummaryBinding) {
         if (items.isEmpty()) return
 
+        val context = binding.root.context
+        val finalItemsCount = items.count { it.finalGrade.matches("[0-6][+-]?".toRegex()) }
+        val calculatedItemsCount = items.count { value -> value.average != 0.0 }
+        val allItemsCount = items.count { !it.subject.equals("zachowanie", true) }
+        val finalAverage = items.calcAverage(
+            preferencesRepository.gradePlusModifier,
+            preferencesRepository.gradeMinusModifier
+        )
+        val calculatedAverage = items.filter { value -> value.average != 0.0 }
+            .map { values -> values.average }
+            .reversed() // fix average precision
+            .average()
+
         with(binding) {
-            gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier))
-            gradeSummaryScrollableHeaderCalculated.text = formatAverage(items
-                .filter { value -> value.average != 0.0 }
-                .map { values -> values.average }
-                .reversed() // fix average precision
-                .average()
+            gradeSummaryScrollableHeaderFinal.text = formatAverage(finalAverage)
+            gradeSummaryScrollableHeaderCalculated.text = formatAverage(calculatedAverage)
+            gradeSummaryScrollableHeaderFinalSubjectCount.text =
+                context.getString(
+                    R.string.grade_summary_from_subjects,
+                    finalItemsCount,
+                    allItemsCount
+                )
+            gradeSummaryScrollableHeaderCalculatedSubjectCount.text = context.getString(
+                R.string.grade_summary_from_subjects,
+                calculatedItemsCount,
+                allItemsCount
             )
         }
     }
@@ -75,7 +95,8 @@ class GradeSummaryAdapter @Inject constructor(
             gradeSummaryItemPredicted.text = "${item.predictedGrade} ${item.proposedPoints}".trim()
             gradeSummaryItemFinal.text = "${item.finalGrade} ${item.finalPoints}".trim()
 
-            gradeSummaryItemPointsContainer.visibility = if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE
+            gradeSummaryItemPointsContainer.visibility =
+                if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
index 8ae06aeb5..9dcd3d4a2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.databinding.HeaderHomeworkBinding
 import io.github.wulkanowy.databinding.ItemHomeworkBinding
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.weekDayName
 import java.time.LocalDate
@@ -43,7 +44,7 @@ class HomeworkAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.
     @SuppressLint("DefaultLocale")
     private fun bindHeaderViewHolder(binding: HeaderHomeworkBinding, date: LocalDate) {
         with(binding) {
-            homeworkHeaderDay.text = date.weekDayName.capitalize()
+            homeworkHeaderDay.text = date.weekDayName.capitalise()
             homeworkHeaderDate.text = date.toFormattedString()
         }
     }
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 4e09bd4d6..e383072ec 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
@@ -79,7 +79,11 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
             loginFormFaq.setOnClickListener { presenter.onFaqClick() }
             loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
             loginFormRecoverLink.setOnClickListener { presenter.onRecoverClick() }
+            loginFormRecoverLinkSecond.setOnClickListener { presenter.onRecoverClick() }
             loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+            loginFormHost.setOnFocusChangeListener { _, hasFocus ->
+                if (hasFocus) requireActivity().hideSoftInput()
+            }
         }
 
         with(binding.loginFormHost) {
@@ -110,49 +114,42 @@ class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragme
 
     override fun setErrorUsernameRequired() {
         with(binding.loginFormUsernameLayout) {
-            requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorLoginRequired() {
         with(binding.loginFormUsernameLayout) {
-            requestFocus()
             error = getString(R.string.login_invalid_login)
         }
     }
 
     override fun setErrorEmailRequired() {
         with(binding.loginFormUsernameLayout) {
-            requestFocus()
             error = getString(R.string.login_invalid_email)
         }
     }
 
     override fun setErrorPassRequired(focus: Boolean) {
         with(binding.loginFormPassLayout) {
-            if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
         with(binding.loginFormPassLayout) {
-            if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
         with(binding.loginFormPassLayout) {
-            requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
     override fun setErrorEmailInvalid(domain: String) {
         with(binding.loginFormUsernameLayout) {
-            requestFocus()
             error = getString(R.string.login_invalid_custom_email,domain)
         }
     }
@@ -196,6 +193,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
     }
 
     override fun openAdvancedLogin() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
index 7c09c96fe..0c1b89c8e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryAdapter.kt
@@ -6,9 +6,9 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.databinding.ItemLuckyNumberHistoryBinding
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.toFormattedString
 import io.github.wulkanowy.utils.weekDayName
-import java.util.Locale
 import javax.inject.Inject
 
 class LuckyNumberHistoryAdapter @Inject constructor() :
@@ -26,7 +26,7 @@ class LuckyNumberHistoryAdapter @Inject constructor() :
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
         val item = items[position]
         with(holder.binding) {
-            luckyNumberHistoryWeekName.text = item.date.weekDayName.capitalize()
+            luckyNumberHistoryWeekName.text = item.date.weekDayName.capitalise()
             luckyNumberHistoryDate.text = item.date.toFormattedString()
             luckyNumberHistory.text = item.luckyNumber.toString()
         }
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 6e991ba13..dc141f8d3 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
@@ -5,7 +5,8 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.MaterialDatePicker
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
@@ -13,15 +14,18 @@ import io.github.wulkanowy.databinding.FragmentLuckyNumberHistoryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.SchoolDaysValidator
 import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.schoolYearStart
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.utils.toTimestamp
 import java.time.LocalDate
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class LuckyNumberHistoryFragment :
-    BaseFragment<FragmentLuckyNumberHistoryBinding>(R.layout.fragment_lucky_number_history), LuckyNumberHistoryView,
+    BaseFragment<FragmentLuckyNumberHistoryBinding>(R.layout.fragment_lucky_number_history),
+    LuckyNumberHistoryView,
     MainView.TitledView {
 
     @Inject
@@ -108,19 +112,26 @@ class LuckyNumberHistoryFragment :
     }
 
     override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
+        val baseDate = currentDate.schoolYearStart
+        val rangeStart = baseDate.toTimestamp()
+        val rangeEnd = LocalDate.now().plusWeeks(1).toTimestamp()
 
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@LuckyNumberHistoryFragment.parentFragmentManager, null)
+        val constraintsBuilder = CalendarConstraints.Builder().apply {
+            setValidator(SchoolDaysValidator(rangeStart, rangeEnd))
+            setStart(rangeStart)
+            setEnd(rangeEnd)
         }
+        val datePicker = MaterialDatePicker.Builder.datePicker()
+            .setCalendarConstraints(constraintsBuilder.build())
+            .setSelection(currentDate.toTimestamp())
+            .build()
+
+        datePicker.addOnPositiveButtonClickListener {
+            val date = it.toLocalDateTime()
+            presenter.onDateSet(date.year, date.monthValue, date.dayOfMonth)
+        }
+
+        datePicker.show(this@LuckyNumberHistoryFragment.parentFragmentManager, null)
     }
 
     override fun showContent(show: Boolean) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt
index 556dda759..c45cb69a7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt
@@ -2,18 +2,22 @@ package io.github.wulkanowy.ui.modules.luckynumber.history
 
 import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.LuckyNumberRepository
+import io.github.wulkanowy.data.repositories.SemesterRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.afterLoading
 import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.previousOrSameSchoolDay
 import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.time.LocalDate
@@ -22,6 +26,7 @@ import javax.inject.Inject
 class LuckyNumberHistoryPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
+    private val semesterRepository: SemesterRepository,
     private val luckyNumberRepository: LuckyNumberRepository,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<LuckyNumberHistoryView>(errorHandler, studentRepository) {
@@ -40,6 +45,19 @@ class LuckyNumberHistoryPresenter @Inject constructor(
         Timber.i("Lucky number history view was initialized")
         errorHandler.showErrorMessage = ::showErrorViewOnError
         loadData()
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
+    }
+
+    private fun setBaseDateOnHolidays() {
+        flow {
+            val student = studentRepository.getCurrentStudent()
+            emit(semesterRepository.getCurrentSemester(student))
+        }.catch {
+            Timber.i("Loading semester result: An exception occurred")
+        }.onEach {
+            currentDate = currentDate.getLastSchoolDayIfHoliday(it.schoolYear)
+            reloadNavigation()
+        }.launch("holidays")
     }
 
     private fun loadData() {
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 37c6c6e75..d758ac0da 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
@@ -9,25 +9,18 @@ import android.content.pm.ShortcutInfo
 import android.content.pm.ShortcutManager
 import android.graphics.drawable.Icon
 import android.os.Build
-import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Build.VERSION_CODES.P
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.ViewGroup
 import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updateMargins
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW
-import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
@@ -39,6 +32,8 @@ import io.github.wulkanowy.databinding.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.accountquick.AccountQuickDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.conference.ConferenceFragment
+import io.github.wulkanowy.ui.modules.dashboard.DashboardFragment
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
@@ -46,9 +41,11 @@ import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
 import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
+import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.InAppReviewHelper
 import io.github.wulkanowy.utils.UpdateHelper
 import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.dpToPx
@@ -72,6 +69,9 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     @Inject
     lateinit var updateHelper: UpdateHelper
 
+    @Inject
+    lateinit var inAppReviewHelper: InAppReviewHelper
+
     @Inject
     lateinit var appInfo: AppInfo
 
@@ -80,7 +80,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     private val overlayProvider by lazy { ElevationOverlayProvider(this) }
 
     private val navController =
-        FragNavController(supportFragmentManager, R.id.mainFragmentContainer)
+        FragNavController(supportFragmentManager, R.id.main_fragment_container)
 
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
@@ -112,9 +112,12 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
 
     private val moreMenuFragments = mapOf<Int, Fragment>(
         MainView.Section.MESSAGE.id to MessageFragment.newInstance(),
+        MainView.Section.EXAM.id to ExamFragment.newInstance(),
         MainView.Section.HOMEWORK.id to HomeworkFragment.newInstance(),
         MainView.Section.NOTE.id to NoteFragment.newInstance(),
-        MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance()
+        MainView.Section.CONFERENCE.id to ConferenceFragment.newInstance(),
+        MainView.Section.SCHOOL_ANNOUNCEMENT.id to SchoolAnnouncementFragment.newInstance(),
+        MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance(),
     )
 
     @SuppressLint("NewApi")
@@ -122,7 +125,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         super.onCreate(savedInstanceState)
         setContentView(ActivityMainBinding.inflate(layoutInflater).apply { binding = this }.root)
         setSupportActionBar(binding.mainToolbar)
-        messageContainer = binding.mainFragmentContainer
+        messageContainer = binding.mainMessageContainer
         updateHelper.messageContainer = binding.mainFragmentContainer
 
         val section = MainView.Section.values()
@@ -213,57 +216,40 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
     @SuppressLint("NewApi")
     override fun initView() {
         with(binding.mainToolbar) {
-            if (SDK_INT >= LOLLIPOP) stateListAnimator = null
+            stateListAnimator = null
             setBackgroundColor(
                 overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f))
             )
         }
 
         with(binding.mainBottomNav) {
-            addItems(
-                listOf(
-                    AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0),
-                    AHBottomNavigationItem(
-                        R.string.attendance_title,
-                        R.drawable.ic_main_attendance,
-                        0
-                    ),
-                    AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_main_exam, 0),
-                    AHBottomNavigationItem(
-                        R.string.timetable_title,
-                        R.drawable.ic_main_timetable,
-                        0
-                    ),
-                    AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
-                )
-            )
-            accentColor = getThemeAttrColor(R.attr.colorPrimary)
-            inactiveColor = getThemeAttrColor(R.attr.colorOnSurface, 153)
-            defaultBackgroundColor =
-                overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
-            titleState = ALWAYS_SHOW
-            currentItem = startMenuIndex
-            isBehaviorTranslationEnabled = false
-            setTitleTextSizeInSp(10f, 10f)
-            setOnTabSelectedListener(presenter::onTabSelected)
+            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)
+                add(Menu.NONE, 4, Menu.NONE, R.string.more_title)
+                    .setIcon(R.drawable.ic_main_more)
+            }
+            selectedItemId = startMenuIndex
+            setOnItemSelectedListener { presenter.onTabSelected(it.itemId, false) }
+            setOnItemReselectedListener { presenter.onTabSelected(it.itemId, true) }
         }
 
         with(navController) {
             setOnViewChangeListener { section, name ->
                 if (section == MainView.Section.ACCOUNT || section == MainView.Section.STUDENT_INFO) {
                     binding.mainBottomNav.isVisible = false
-                    binding.mainFragmentContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                        updateMargins(bottom = 0)
-                    }
 
                     if (appInfo.systemVersion >= P) {
                         window.navigationBarColor = getThemeAttrColor(R.attr.colorSurface)
                     }
                 } else {
                     binding.mainBottomNav.isVisible = true
-                    binding.mainFragmentContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                        updateMargins(bottom = dpToPx(56f).toInt())
-                    }
 
                     if (appInfo.systemVersion >= P) {
                         window.navigationBarColor =
@@ -276,9 +262,9 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
             }
             fragmentHideStrategy = HIDE
             rootFragments = listOf(
+                DashboardFragment.newInstance(),
                 GradeFragment.newInstance(),
                 AttendanceFragment.newInstance(),
-                ExamFragment.newInstance(),
                 TimetableFragment.newInstance(),
                 MoreFragment.newInstance()
             )
@@ -380,6 +366,10 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         }
     }
 
+    override fun showInAppReview() {
+        inAppReviewHelper.showInAppReview(this)
+    }
+
     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 ffcfcb614..4805b5a1c 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,6 +14,7 @@ import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.flowWithResource
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import java.time.LocalDate
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
@@ -24,7 +25,7 @@ class MainPresenter @Inject constructor(
     private val analytics: AnalyticsHelper,
 ) : BasePresenter<MainView>(errorHandler, studentRepository) {
 
-    var studentsWitSemesters: List<StudentWithSemesters>? = null
+    private var studentsWitSemesters: List<StudentWithSemesters>? = null
 
     fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
@@ -106,11 +107,27 @@ class MainPresenter @Inject constructor(
             } else {
                 notifyMenuViewChanged()
                 switchMenuView(index)
+                checkInAppReview()
                 true
             }
         } == true
     }
 
+    private fun checkInAppReview() {
+        prefRepository.inAppReviewCount++
+
+        if (prefRepository.inAppReviewDate == null) {
+            prefRepository.inAppReviewDate = LocalDate.now()
+        }
+
+        if (!prefRepository.isAppReviewDone && prefRepository.inAppReviewCount >= 50 &&
+            LocalDate.now().minusDays(14).isAfter(prefRepository.inAppReviewDate)
+        ) {
+            view?.showInAppReview()
+            prefRepository.isAppReviewDone = true
+        }
+    }
+
     private fun showCurrentStudentAvatar() {
         val currentStudent =
             studentsWitSemesters?.singleOrNull { it.student.isCurrent }?.student ?: return
@@ -118,11 +135,9 @@ class MainPresenter @Inject constructor(
         view?.showStudentAvatar(currentStudent)
     }
 
-    private fun getProperViewIndexes(initMenu: MainView.Section?): Pair<Int, Int> {
-        return when (initMenu?.id) {
-            in 0..3 -> initMenu!!.id to -1
-            in 4..10 -> 4 to initMenu!!.id
-            else -> prefRepository.startMenuIndex to -1
-        }
+    private fun getProperViewIndexes(initMenu: MainView.Section?) = when (initMenu?.id) {
+        in 0..3 -> initMenu!!.id to -1
+        in 4..100 -> 4 to initMenu!!.id
+        else -> prefRepository.startMenuIndex to -1
     }
 }
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 a4b7d094b..8851f5878 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
@@ -40,6 +40,8 @@ interface MainView : BaseView {
 
     fun showStudentAvatar(student: Student)
 
+    fun showInAppReview()
+
     interface MainChildView {
 
         fun onFragmentReselected()
@@ -56,20 +58,24 @@ interface MainView : BaseView {
             set(_) {}
     }
 
-    enum class Section(val id: Int) {
-        GRADE(0),
-        ATTENDANCE(1),
-        EXAM(2),
-        TIMETABLE(3),
-        MORE(4),
-        MESSAGE(5),
-        HOMEWORK(6),
-        NOTE(7),
-        LUCKY_NUMBER(8),
-        SETTINGS(9),
-        ABOUT(10),
-        SCHOOL(11),
-        ACCOUNT(12),
-        STUDENT_INFO(13)
+    enum class Section {
+        DASHBOARD,
+        GRADE,
+        ATTENDANCE,
+        TIMETABLE,
+        MORE,
+        MESSAGE,
+        EXAM,
+        HOMEWORK,
+        NOTE,
+        CONFERENCE,
+        SCHOOL_ANNOUNCEMENT,
+        SCHOOL,
+        LUCKY_NUMBER,
+        ACCOUNT,
+        STUDENT_INFO,
+        SETTINGS;
+
+        val id get() = ordinal
     }
 }
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 206a74602..421453c94 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
@@ -33,7 +33,8 @@ class MessagePreviewAdapter @Inject constructor() :
 
     private var attachments: List<MessageAttachment> = emptyList()
 
-    override fun getItemCount() = if (messageWithAttachment == null) 0 else attachments.size + 1 + if (attachments.isNotEmpty()) 1 else 0
+    override fun getItemCount() =
+        if (messageWithAttachment == null) 0 else attachments.size + 1 + if (attachments.isNotEmpty()) 1 else 0
 
     override fun getItemViewType(position: Int) = when (position) {
         0 -> ViewType.MESSAGE.id
@@ -45,25 +46,60 @@ class MessagePreviewAdapter @Inject constructor() :
         val inflater = LayoutInflater.from(parent.context)
 
         return when (viewType) {
-            ViewType.MESSAGE.id -> MessageViewHolder(ItemMessagePreviewBinding.inflate(inflater, parent, false))
-            ViewType.DIVIDER.id -> DividerViewHolder(ItemMessageDividerBinding.inflate(inflater, parent, false))
-            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemMessageAttachmentBinding.inflate(inflater, parent, false))
+            ViewType.MESSAGE.id -> MessageViewHolder(
+                ItemMessagePreviewBinding.inflate(inflater, parent, false)
+            )
+            ViewType.DIVIDER.id -> DividerViewHolder(
+                ItemMessageDividerBinding.inflate(inflater, parent, false)
+            )
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(
+                ItemMessageAttachmentBinding.inflate(inflater, parent, false)
+            )
             else -> throw IllegalStateException()
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
-            is MessageViewHolder -> bindMessage(holder, requireNotNull(messageWithAttachment).message)
-            is AttachmentViewHolder -> bindAttachment(holder, requireNotNull(messageWithAttachment).attachments[position - 2])
+            is MessageViewHolder -> bindMessage(
+                holder,
+                requireNotNull(messageWithAttachment).message
+            )
+            is AttachmentViewHolder -> bindAttachment(
+                holder,
+                requireNotNull(messageWithAttachment).attachments[position - 2]
+            )
         }
     }
 
     @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.resources.getQuantityString(
+                    R.plurals.message_read_by,
+                    message.readBy,
+                    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))
+        }
+
         with(holder.binding) {
-            messagePreviewSubject.text = message.subject.ifBlank { root.context.getString(R.string.message_no_subject) }
-            messagePreviewDate.text = root.context.getString(R.string.message_date, message.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
+            messagePreviewSubject.text =
+                message.subject.ifBlank { root.context.getString(R.string.message_no_subject) }
+            messagePreviewDate.text = root.context.getString(
+                R.string.message_date,
+                message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
+            )
+            messagePreviewRead.text = readText
             messagePreviewContent.text = message.content
             messagePreviewFromSender.text = message.sender
             messagePreviewToRecipient.text = message.recipient
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
index dd2d2b9bd..26ab7f488 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/RecipientChipItem.kt
@@ -1,8 +1,10 @@
 package io.github.wulkanowy.ui.modules.message.send
 
+import com.squareup.moshi.JsonClass
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.materialchipsinput.ChipItem
 
+@JsonClass(generateAdapter = true)
 data class RecipientChipItem(
 
     override val title: String,
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 59944d41d..1432a9945 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,6 +1,7 @@
 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
@@ -12,6 +13,7 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.core.widget.doOnTextChanged
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
@@ -24,7 +26,8 @@ import io.github.wulkanowy.utils.showSoftInput
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(), SendMessageView {
+class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(),
+    SendMessageView {
 
     @Inject
     override lateinit var presenter: SendMessagePresenter
@@ -32,6 +35,8 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     companion object {
         private const val EXTRA_MESSAGE = "EXTRA_MESSAGE"
 
+        private const val EXTRA_REASON = "EXTRA_REASON"
+
         private const val EXTRA_REPLY = "EXTRA_REPLY"
 
         fun getStartIntent(context: Context) = Intent(context, SendMessageActivity::class.java)
@@ -41,20 +46,22 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
                 .putExtra(EXTRA_MESSAGE, message)
                 .putExtra(EXTRA_REPLY, reply)
         }
+
+        fun getStartIntent(context: Context, reason: String): Intent {
+            return getStartIntent(context)
+                .putExtra(EXTRA_REASON, reason)
+        }
     }
 
     override val isDropdownListVisible: Boolean
         get() = binding.sendMessageTo.isDropdownListVisible
 
     @Suppress("UNCHECKED_CAST")
-    override val formRecipientsData: List<RecipientChipItem>
-        get() = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
+    override lateinit var formRecipientsData: List<RecipientChipItem>
 
-    override val formSubjectValue: String
-        get() = binding.sendMessageSubject.text.toString()
+    override lateinit var formSubjectValue: String
 
-    override val formContentValue: String
-        get() = binding.sendMessageMessageContent.text.toString()
+    override lateinit var formContentValue: String
 
     override val messageRequiredRecipients: String
         get() = getString(R.string.message_required_recipients)
@@ -65,6 +72,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
     override val messageSuccess: String
         get() = getString(R.string.message_send_successful)
 
+    @Suppress("UNCHECKED_CAST")
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
@@ -72,7 +80,16 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         messageContainer = binding.sendMessageContainer
 
-        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
+        formRecipientsData = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
+        formSubjectValue = binding.sendMessageSubject.text.toString()
+        formContentValue = binding.sendMessageMessageContent.text.toString()
+
+        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
+        )
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -80,10 +97,27 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         setUpExtendedHitArea()
         with(binding) {
             sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
+            sendMessageTo.onChipAddListener = { onRecipientChange() }
             sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
+            sendMessageSubject.doOnTextChanged { text, _, _, _ -> onMessageSubjectChange(text) }
+            sendMessageMessageContent.doOnTextChanged { text, _, _, _ -> onMessageContentChange(text) }
         }
     }
 
+    private fun onMessageSubjectChange(text: CharSequence?) {
+        formSubjectValue = text.toString()
+        presenter.onMessageContentChange()
+    }
+
+    private fun onMessageContentChange(text: CharSequence?) {
+        formContentValue = text.toString()
+        presenter.onMessageContentChange()
+    }
+
+    private fun onRecipientChange() {
+        presenter.onMessageContentChange()
+    }
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.action_menu_send_message, menu)
         return true
@@ -171,7 +205,8 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
             contentHitRect.top = contentHitRect.bottom
             contentHitRect.bottom = containerHitRect.bottom
 
-            binding.sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, binding.sendMessageMessageContent)
+            binding.sendMessageContent.touchDelegate =
+                TouchDelegate(contentHitRect, binding.sendMessageMessageContent)
         }
 
         with(binding.sendMessageMessageContent) {
@@ -181,4 +216,25 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
             }
         }
     }
+
+    override fun showMessageBackupDialog() {
+        AlertDialog.Builder(this)
+            .setTitle(R.string.message_title)
+            .setMessage(presenter.getMessageBackupContent(presenter.getRecipientsNames()))
+            .setPositiveButton(R.string.all_yes) { _, _ -> presenter.restoreMessageParts() }
+            .setNegativeButton(R.string.all_no) { _, _ -> presenter.clearDraft() }
+            .show()
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun clearDraft() {
+        formRecipientsData = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
+        presenter.clearDraft()
+    }
+
+    override fun getMessageBackupDialogString() =
+        resources.getString(R.string.message_restore_dialog)
+
+    override fun getMessageBackupDialogStringWithRecipients(recipients: String) =
+        resources.getString(R.string.message_restore_dialog_with_recipients, recipients)
 }
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 77bd0f5e6..60a23e58a 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
@@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.modules.message.send
 import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
+import io.github.wulkanowy.data.pojos.MessageDraft
 import io.github.wulkanowy.data.repositories.MessageRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.RecipientRepository
@@ -15,7 +16,14 @@ import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.afterLoading
 import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -30,12 +38,22 @@ class SendMessagePresenter @Inject constructor(
     private val analytics: AnalyticsHelper
 ) : BasePresenter<SendMessageView>(errorHandler, studentRepository) {
 
-    fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
+    private val messageUpdateChannel = Channel<Unit>()
+
+    fun onAttachView(view: SendMessageView, reason: String?, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
         view.initView()
+        initializeSubjectStream()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
         with(view) {
+            if (messageRepository.draftMessage != null && reply == null) {
+                view.showMessageBackupDialog()
+            }
+            reason?.let {
+                setSubject("Usprawiedliwenie")
+                setContent(it)
+            }
             message?.let {
                 setSubject(when (reply) {
                     true -> "RE: "
@@ -159,6 +177,7 @@ class SendMessagePresenter @Inject constructor(
                 }
                 Status.SUCCESS -> {
                     Timber.i("Sending message result: Success")
+                    view?.clearDraft()
                     view?.run {
                         showMessage(messageSuccess)
                         popView()
@@ -203,4 +222,51 @@ class SendMessagePresenter @Inject constructor(
             )
         }
     }
+
+    fun onMessageContentChange() {
+        launch {
+            messageUpdateChannel.send(Unit)
+        }
+    }
+
+    @OptIn(FlowPreview::class)
+    private fun initializeSubjectStream() {
+        launch {
+            messageUpdateChannel.consumeAsFlow()
+                .debounce(250)
+                .catch { Timber.e(it) }
+                .collect {
+                    saveDraftMessage()
+                    Timber.i("Draft message was saved!")
+                }
+        }
+    }
+
+    private fun saveDraftMessage() {
+        messageRepository.draftMessage = MessageDraft(
+            view?.formRecipientsData!!,
+            view?.formSubjectValue!!,
+            view?.formContentValue!!
+        )
+    }
+
+    fun restoreMessageParts() {
+        val draftMessage = messageRepository.draftMessage ?: return
+        view?.setSelectedRecipients(draftMessage.recipients)
+        view?.setSubject(draftMessage.subject)
+        view?.setContent(draftMessage.content)
+        Timber.i("Continue work on draft")
+    }
+
+    fun getRecipientsNames(): String {
+        return messageRepository.draftMessage?.recipients.orEmpty().joinToString { it.recipient.name }
+    }
+
+    fun clearDraft() {
+        messageRepository.draftMessage = null
+        Timber.i("Draft cleared!")
+    }
+
+    fun getMessageBackupContent(recipients: String) = if (recipients.isEmpty()) view?.getMessageBackupDialogString()
+        else view?.getMessageBackupDialogStringWithRecipients(recipients)
 }
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 2839f9ce7..21b42e3e4 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
@@ -4,14 +4,13 @@ import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.ui.base.BaseView
 
 interface SendMessageView : BaseView {
-
     val isDropdownListVisible: Boolean
 
-    val formRecipientsData: List<RecipientChipItem>
+    var formRecipientsData: List<RecipientChipItem>
 
-    val formSubjectValue: String
+    var formSubjectValue: String
 
-    val formContentValue: String
+    var formContentValue: String
 
     val messageRequiredRecipients: String
 
@@ -46,4 +45,12 @@ interface SendMessageView : BaseView {
     fun scrollToRecipients()
 
     fun popView()
+
+    fun showMessageBackupDialog()
+
+    fun getMessageBackupDialogString(): String
+
+    fun getMessageBackupDialogStringWithRecipients(recipients: String): String
+
+    fun clearDraft()
 }
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 f0f65e087..571cc6d55 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
@@ -4,6 +4,8 @@ import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CompoundButton
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.NO_POSITION
@@ -11,60 +13,114 @@ import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 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
 import javax.inject.Inject
 
 class MessageTabAdapter @Inject constructor() :
-    RecyclerView.Adapter<MessageTabAdapter.ItemViewHolder>() {
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
+    enum class ViewType { HEADER, ITEM }
+
+    var onItemClickListener: (Message, position: Int) -> Unit = { _, _ -> }
+    var onHeaderClickListener: (chip: CompoundButton, isChecked: Boolean) -> Unit = { _, _ -> }
 
     var onChangesDetectedListener = {}
 
-    private var items = mutableListOf<Message>()
+    private var items = mutableListOf<MessageTabDataItem>()
+    private var onlyUnread: Boolean? = null
+    private var onlyWithAttachments = false
 
-    fun setDataItems(data: List<Message>) {
+    fun setDataItems(
+        data: List<MessageTabDataItem>,
+        onlyUnread: Boolean?,
+        onlyWithAttachments: Boolean
+    ) {
         if (items.size != data.size) onChangesDetectedListener()
         val diffResult = DiffUtil.calculateDiff(MessageTabDiffUtil(items, data))
         items = data.toMutableList()
+        this.onlyUnread = onlyUnread
+        this.onlyWithAttachments = onlyWithAttachments
         diffResult.dispatchUpdatesTo(this)
     }
 
+    override fun getItemViewType(position: Int): Int {
+        return when (position) {
+            0 -> ViewType.HEADER.ordinal
+            else -> ViewType.ITEM.ordinal
+        }
+    }
+
     override fun getItemCount() = items.size
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
-        ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-    )
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            ViewType.ITEM.ordinal -> ItemViewHolder(
+                ItemMessageBinding.inflate(inflater, parent, false)
+            )
+            ViewType.HEADER.ordinal -> HeaderViewHolder(
+                ItemMessageChipsBinding.inflate(inflater, parent, false)
+            )
+            else -> throw IllegalStateException()
+        }
+    }
 
-    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
-        val item = items[position]
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is ItemViewHolder -> {
+                val item = (items[position] as MessageTabDataItem.MessageItem).message
 
-        with(holder.binding) {
-            val style = if (item.unread) Typeface.BOLD else Typeface.NORMAL
+                with(holder.binding) {
+                    val style = if (item.unread) Typeface.BOLD else Typeface.NORMAL
 
-            messageItemAuthor.run {
-                text = if (item.folderId == MessageFolder.SENT.id) item.recipient else item.sender
-                setTypeface(null, style)
+                    messageItemAuthor.run {
+                        text =
+                            if (item.folderId == MessageFolder.SENT.id) item.recipient else item.sender
+                        setTypeface(null, style)
+                    }
+                    messageItemSubject.run {
+                        text =
+                            if (item.subject.isNotBlank()) item.subject else context.getString(R.string.message_no_subject)
+                        setTypeface(null, style)
+                    }
+                    messageItemDate.run {
+                        text = item.date.toFormattedString()
+                        setTypeface(null, style)
+                    }
+                    messageItemAttachmentIcon.visibility =
+                        if (item.hasAttachments) View.VISIBLE else View.GONE
+
+                    root.setOnClickListener {
+                        holder.bindingAdapterPosition.let {
+                            if (it != NO_POSITION) onItemClickListener(item, it)
+                        }
+                    }
+                }
             }
-            messageItemSubject.run {
-                text = if (item.subject.isNotBlank()) item.subject else context.getString(R.string.message_no_subject)
-                setTypeface(null, style)
-            }
-            messageItemDate.run {
-                text = item.date.toFormattedString()
-                setTypeface(null, style)
-            }
-            messageItemAttachmentIcon.visibility = if (item.hasAttachments) View.VISIBLE else View.GONE
-
-            root.setOnClickListener {
-                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(item, it) }
+            is HeaderViewHolder -> {
+                with(holder.binding) {
+                    if (onlyUnread == null) chipUnread.isVisible = false
+                    else {
+                        chipUnread.isVisible = true
+                        chipUnread.isChecked = onlyUnread!!
+                        chipUnread.setOnCheckedChangeListener(onHeaderClickListener)
+                    }
+                    chipAttachments.isChecked = onlyWithAttachments
+                    chipAttachments.setOnCheckedChangeListener(onHeaderClickListener)
+                }
             }
         }
     }
 
     class ItemViewHolder(val binding: ItemMessageBinding) : RecyclerView.ViewHolder(binding.root)
+    class HeaderViewHolder(val binding: ItemMessageChipsBinding) :
+        RecyclerView.ViewHolder(binding.root)
 
-    private class MessageTabDiffUtil(private val old: List<Message>, private val new: List<Message>) :
+    private class MessageTabDiffUtil(
+        private val old: List<MessageTabDataItem>,
+        private val new: List<MessageTabDataItem>
+    ) :
         DiffUtil.Callback() {
         override fun getOldListSize(): Int = old.size
 
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
new file mode 100644
index 000000000..4f51a936f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabDataItem.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.ui.modules.message.tab
+
+import io.github.wulkanowy.data.db.entities.Message
+
+sealed class MessageTabDataItem {
+    data class MessageItem(val message: Message) : MessageTabDataItem() {
+        override val id = message.id
+    }
+
+    object Header : MessageTabDataItem() {
+        override val id = Long.MIN_VALUE
+    }
+
+    abstract val id: Long
+}
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 f08059f2c..54ee74eb1 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.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
+import android.widget.CompoundButton
 import androidx.appcompat.widget.SearchView
 import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
@@ -20,7 +21,6 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.getThemeAttrColor
-import kotlinx.coroutines.FlowPreview
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -48,36 +48,46 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
     override val isViewEmpty
         get() = tabAdapter.itemCount == 0
 
+    override var onlyUnread: Boolean? = false
+
+    override var onlyWithAttachments = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    @FlowPreview
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMessageTabBinding.bind(view)
         messageContainer = binding.messageTabRecycler
-        presenter.onAttachView(this, MessageFolder.valueOf(
-            (savedInstanceState ?: arguments)?.getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
-        ))
+
+        val folder = MessageFolder.valueOf(
+            (savedInstanceState ?: requireArguments()).getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
+        )
+        presenter.onAttachView(this, folder)
     }
 
     override fun initView() {
         with(tabAdapter) {
-            onClickListener = presenter::onMessageItemSelected
+            onItemClickListener = presenter::onMessageItemSelected
+            onHeaderClickListener = ::onChipChecked
             onChangesDetectedListener = ::resetListPosition
         }
 
         with(binding.messageTabRecycler) {
             layoutManager = LinearLayoutManager(context)
             adapter = tabAdapter
-            addItemDecoration(DividerItemDecoration(context))
+            addItemDecoration(DividerItemDecoration(context, false))
         }
         with(binding) {
             messageTabSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
             messageTabSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            messageTabSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            messageTabSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(
+                    R.attr.colorSwipeRefresh
+                )
+            )
             messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
             messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
@@ -99,8 +109,9 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         })
     }
 
-    override fun updateData(data: List<Message>) {
-        tabAdapter.setDataItems(data)
+    override fun updateData(data: List<MessageTabDataItem>, hide: Boolean) {
+        if (hide) onlyUnread = null
+        tabAdapter.setDataItems(data, onlyUnread, onlyWithAttachments)
     }
 
     override fun showProgress(show: Boolean) {
@@ -143,8 +154,19 @@ class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.frag
         (parentFragment as? MessageFragment)?.onChildFragmentLoaded()
     }
 
-    fun onParentLoadData(forceRefresh: Boolean) {
-        presenter.onParentViewLoadData(forceRefresh)
+    fun onParentLoadData(
+        forceRefresh: Boolean,
+        onlyUnread: Boolean? = this.onlyUnread,
+        onlyWithAttachments: Boolean = this.onlyWithAttachments
+    ) {
+        presenter.onParentViewLoadData(forceRefresh, onlyUnread, onlyWithAttachments)
+    }
+
+    private fun onChipChecked(chip: CompoundButton, isChecked: Boolean) {
+        when (chip.id) {
+            R.id.chip_unread -> presenter.onUnreadFilterSelected(isChecked)
+            R.id.chip_attachments -> presenter.onAttachmentsFilterSelected(isChecked)
+        }
     }
 
     fun onParentDeleteMessage() {
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 c560a77de..3e5e09b48 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
@@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import me.xdrop.fuzzywuzzy.FuzzySearch
 import timber.log.Timber
-import java.util.Locale
 import javax.inject.Inject
 import kotlin.math.pow
 
@@ -45,7 +44,6 @@ class MessageTabPresenter @Inject constructor(
 
     private val searchChannel = Channel<String>()
 
-    @FlowPreview
     fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
@@ -56,15 +54,15 @@ class MessageTabPresenter @Inject constructor(
 
     fun onSwipeRefresh() {
         Timber.i("Force refreshing the $folder message")
-        onParentViewLoadData(true)
+        view?.run { onParentViewLoadData(true, onlyUnread, onlyWithAttachments) }
     }
 
     fun onRetry() {
         view?.run {
             showErrorView(false)
             showProgress(true)
+            loadData(true, onlyUnread == true, onlyWithAttachments)
         }
-        loadData(true)
     }
 
     fun onDetailsClick() {
@@ -72,11 +70,15 @@ class MessageTabPresenter @Inject constructor(
     }
 
     fun onDeleteMessage() {
-        loadData(true)
+        view?.run { loadData(true, onlyUnread == true, onlyWithAttachments) }
     }
 
-    fun onParentViewLoadData(forceRefresh: Boolean) {
-        loadData(forceRefresh)
+    fun onParentViewLoadData(
+        forceRefresh: Boolean,
+        onlyUnread: Boolean? = view?.onlyUnread,
+        onlyWithAttachments: Boolean = view?.onlyWithAttachments == true
+    ) {
+        loadData(forceRefresh, onlyUnread == true, onlyWithAttachments)
     }
 
     fun onMessageItemSelected(message: Message, position: Int) {
@@ -84,7 +86,25 @@ class MessageTabPresenter @Inject constructor(
         view?.openMessage(message)
     }
 
-    private fun loadData(forceRefresh: Boolean) {
+    fun onUnreadFilterSelected(isChecked: Boolean) {
+        view?.run {
+            onlyUnread = isChecked
+            onParentViewLoadData(false, onlyUnread, onlyWithAttachments)
+        }
+    }
+
+    fun onAttachmentsFilterSelected(isChecked: Boolean) {
+        view?.run {
+            onlyWithAttachments = isChecked
+            onParentViewLoadData(false, onlyUnread, onlyWithAttachments)
+        }
+    }
+
+    private fun loadData(
+        forceRefresh: Boolean,
+        onlyUnread: Boolean,
+        onlyWithAttachments: Boolean
+    ) {
         Timber.i("Loading $folder message data started")
 
         flowWithResourceIn {
@@ -101,7 +121,15 @@ class MessageTabPresenter @Inject constructor(
                             showProgress(false)
                             showContent(true)
                             messages = it.data
-                            updateData(getFilteredData(lastSearchQuery))
+                            val filteredData = getFilteredData(
+                                lastSearchQuery,
+                                onlyUnread,
+                                onlyWithAttachments
+                            )
+                            val newItems = listOf(MessageTabDataItem.Header) + filteredData.map {
+                                MessageTabDataItem.MessageItem(it)
+                            }
+                            updateData(newItems, folder.id == MessageFolder.SENT.id)
                             notifyParentDataLoaded()
                         }
                     }
@@ -109,7 +137,7 @@ class MessageTabPresenter @Inject constructor(
                 Status.SUCCESS -> {
                     Timber.i("Loading $folder message result: Success")
                     messages = it.data!!
-                    updateData(getFilteredData(lastSearchQuery))
+                    updateData(getFilteredData(lastSearchQuery, onlyUnread, onlyWithAttachments))
                     analytics.logEvent(
                         "load_data",
                         "type" to "messages",
@@ -149,14 +177,16 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
-    @FlowPreview
+    @OptIn(FlowPreview::class)
     private fun initializeSearchStream() {
         launch {
             searchChannel.consumeAsFlow()
                 .debounce(250)
                 .map { query ->
                     lastSearchQuery = query
-                    getFilteredData(query)
+                    val isOnlyUnread = view?.onlyUnread == true
+                    val isOnlyWithAttachments = view?.onlyWithAttachments == true
+                    getFilteredData(query, isOnlyUnread, isOnlyWithAttachments)
                 }
                 .catch { Timber.e(it) }
                 .collect {
@@ -167,55 +197,62 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
-    private fun getFilteredData(query: String): List<Message> {
-        return if (query.trim().isEmpty()) {
-            messages.sortedByDescending { it.date }
+    private fun getFilteredData(
+        query: String,
+        onlyUnread: Boolean = false,
+        onlyWithAttachments: Boolean = false
+    ): List<Message> {
+        if (query.trim().isEmpty()) {
+            val sortedMessages = messages.sortedByDescending { it.date }
+            return when {
+                onlyUnread && onlyWithAttachments -> sortedMessages.filter { it.unread == onlyUnread && it.hasAttachments == onlyWithAttachments }
+                onlyUnread -> sortedMessages.filter { it.unread == onlyUnread }
+                onlyWithAttachments -> sortedMessages.filter { it.hasAttachments == onlyWithAttachments }
+                else -> sortedMessages
+            }
         } else {
-            messages
+            val sortedMessages = messages
                 .map { it to calculateMatchRatio(it, query) }
-                .sortedByDescending { it.second }
-                .filter { it.second > 5000 }
+                .sortedWith(compareBy<Pair<Message, Int>> { -it.second }.thenByDescending { it.first.date })
+                .filter { it.second > 6000 }
                 .map { it.first }
+            return when {
+                onlyUnread && onlyWithAttachments -> sortedMessages.filter { it.unread == onlyUnread && it.hasAttachments == onlyWithAttachments }
+                onlyUnread -> sortedMessages.filter { it.unread == onlyUnread }
+                onlyWithAttachments -> sortedMessages.filter { it.hasAttachments == onlyWithAttachments }
+                else -> sortedMessages
+            }
         }
     }
 
     private fun updateData(data: List<Message>) {
         view?.run {
             showEmpty(data.isEmpty())
-            showContent(data.isNotEmpty())
+            showContent(true)
             showErrorView(false)
-            updateData(data)
+            val newItems =
+                listOf(MessageTabDataItem.Header) + data.map { MessageTabDataItem.MessageItem(it) }
+            updateData(newItems, folder.id == MessageFolder.SENT.id)
         }
     }
 
     private fun calculateMatchRatio(message: Message, query: String): Int {
-        val subjectRatio = FuzzySearch.tokenSortPartialRatio(
-            query.toLowerCase(Locale.getDefault()),
-            message.subject
-        )
+        val subjectRatio = FuzzySearch.tokenSortPartialRatio(query.lowercase(), message.subject)
 
         val senderOrRecipientRatio = FuzzySearch.tokenSortPartialRatio(
-            query.toLowerCase(Locale.getDefault()),
-            if (message.sender.isNotEmpty()) message.sender.toLowerCase(Locale.getDefault())
-            else message.recipient.toLowerCase(Locale.getDefault())
+            query.lowercase(),
+            if (message.sender.isNotEmpty()) message.sender.lowercase()
+            else message.recipient.lowercase()
         )
 
         val dateRatio = listOf(
             FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("dd.MM").toLowerCase(Locale.getDefault())
+                query.lowercase(),
+                message.date.toFormattedString("dd.MM").lowercase()
             ),
             FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("dd.MM.yyyy").toLowerCase(Locale.getDefault())
-            ),
-            FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("d MMMM").toLowerCase(Locale.getDefault())
-            ),
-            FuzzySearch.ratio(
-                query.toLowerCase(Locale.getDefault()),
-                message.date.toFormattedString("d MMMM yyyy").toLowerCase(Locale.getDefault())
+                query.lowercase(),
+                message.date.toFormattedString("dd.MM.yyyy").lowercase()
             )
         ).maxOrNull() ?: 0
 
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 fe9b60077..a856da3bc 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
@@ -7,11 +7,15 @@ interface MessageTabView : BaseView {
 
     val isViewEmpty: Boolean
 
+    var onlyUnread: Boolean?
+
+    var onlyWithAttachments: Boolean
+
     fun initView()
 
     fun resetListPosition()
 
-    fun updateData(data: List<Message>)
+    fun updateData(data: List<MessageTabDataItem>, hide: Boolean)
 
     fun showProgress(show: Boolean)
 
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 6357c495a..eb420a6ae 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
@@ -52,15 +52,15 @@ class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(),
     }
 
     override fun updateData(token: MobileDeviceToken) {
-        with(binding.mobileDeviceDialogToken) {
+        with(binding.mobileDeviceDialogTokenValue) {
             text = token.token
             setOnClickListener { clickCopy(token.token) }
         }
-        with(binding.mobileDeviceDialogSymbol) {
+        with(binding.mobileDeviceDialogSymbolValue) {
             text = token.symbol
             setOnClickListener { clickCopy(token.symbol) }
         }
-        with(binding.mobileDeviceDialogPin) {
+        with(binding.mobileDeviceDialogPinValue) {
             text = token.pin
             setOnClickListener { clickCopy(token.pin) }
         }
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 c4a14a521..2f0957c46 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
@@ -8,16 +8,16 @@ 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.about.AboutFragment
 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.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
@@ -48,21 +48,24 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     override val noteRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.note_title) to getCompatDrawable(R.drawable.ic_more_note) }
 
-    override val luckyNumberRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.lucky_number_title) to getCompatDrawable(R.drawable.ic_more_lucky_number) }
-
-    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 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 fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding = FragmentMoreBinding.bind(view)
@@ -101,12 +104,8 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         (activity as? MainActivity)?.pushView(NoteFragment.newInstance())
     }
 
-    override fun openLuckyNumberView() {
-        (activity as? MainActivity)?.pushView(LuckyNumberFragment.newInstance())
-    }
-
-    override fun openMobileDevicesView() {
-        (activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
+    override fun openSchoolAnnouncementView() {
+        (activity as? MainActivity)?.pushView(SchoolAnnouncementFragment.newInstance())
     }
 
     override fun openConferencesView() {
@@ -117,10 +116,18 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         (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 popView(depth: Int) {
         (activity as? MainActivity)?.popView(depth)
     }
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 6079141f4..a2b7f204e 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
@@ -23,12 +23,13 @@ class MorePresenter @Inject constructor(
         view?.run {
             when (title) {
                 messagesRes?.first -> openMessagesView()
+                examRes?.first -> openExamView()
                 homeworkRes?.first -> openHomeworkView()
                 noteRes?.first -> openNoteView()
-                luckyNumberRes?.first -> openLuckyNumberView()
-                mobileDevicesRes?.first -> openMobileDevicesView()
                 conferencesRes?.first -> openConferencesView()
+                schoolAnnouncementRes?.first -> openSchoolAnnouncementView()
                 schoolAndTeachersRes?.first -> openSchoolAndTeachersView()
+                mobileDevicesRes?.first -> openMobileDevicesView()
                 settingsRes?.first -> openSettingsView()
             }
         }
@@ -44,12 +45,13 @@ class MorePresenter @Inject constructor(
         view?.run {
             updateData(listOfNotNull(
                 messagesRes,
+                examRes,
                 homeworkRes,
                 noteRes,
-                luckyNumberRes,
-                mobileDevicesRes,
                 conferencesRes,
+                schoolAnnouncementRes,
                 schoolAndTeachersRes,
+                mobileDevicesRes,
                 settingsRes
             ))
         }
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 0543742e4..c4a07bdcc 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
@@ -11,16 +11,18 @@ interface MoreView : BaseView {
 
     val noteRes: Pair<String, Drawable?>?
 
-    val luckyNumberRes: Pair<String, Drawable?>?
-
-    val mobileDevicesRes: 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?>?
+
     fun initView()
 
     fun updateData(data: List<Pair<String, Drawable?>>)
@@ -35,11 +37,13 @@ interface MoreView : BaseView {
 
     fun openNoteView()
 
-    fun openLuckyNumberView()
-
-    fun openMobileDevicesView()
+    fun openSchoolAnnouncementView()
 
     fun openConferencesView()
 
     fun openSchoolAndTeachersView()
+
+    fun openMobileDevicesView()
+
+    fun openExamView()
 }
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 4cb1cda02..5811456b6 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
@@ -49,14 +49,14 @@ class NoteDialog : DialogFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         with(binding) {
-            noteDialogDate.text = note.date.toFormattedString()
-            noteDialogCategory.text = note.category
-            noteDialogTeacher.text = note.teacher
-            noteDialogContent.text = note.content
+            noteDialogDateValue.text = note.date.toFormattedString()
+            noteDialogCategoryValue.text = note.category
+            noteDialogTeacherValue.text = note.teacher
+            noteDialogContentValue.text = note.content
         }
 
         if (note.isPointsShow) {
-            with(binding.noteDialogPoints) {
+            with(binding.noteDialogPointsValue) {
                 text = "${if (note.points > 0) "+" else ""}${note.points}"
                 setTextColor(
                     when (NoteCategory.getByValue(note.categoryType)) {
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 e80f54946..c441231e0 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
@@ -67,7 +67,7 @@ class NotePresenter @Inject constructor(
                             showRefresh(true)
                             showProgress(false)
                             showContent(true)
-                            updateData(it.data)
+                            updateData(it.data.sortedByDescending { item -> item.date })
                         }
                     }
                 }
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
new file mode 100644
index 000000000..e7c202676
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementAdapter.kt
@@ -0,0 +1,37 @@
+package io.github.wulkanowy.ui.modules.schoolannouncement
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.text.HtmlCompat
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.databinding.ItemSchoolAnnouncementBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class SchoolAnnouncementAdapter @Inject constructor() :
+    RecyclerView.Adapter<SchoolAnnouncementAdapter.ViewHolder>() {
+
+    var items = emptyList<SchoolAnnouncement>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder(
+        ItemSchoolAnnouncementBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            schoolAnnouncementItemDate.text = item.date.toFormattedString()
+            schoolAnnouncementItemType.text = item.subject
+            schoolAnnouncementItemContent.text = HtmlCompat.fromHtml(
+                item.content, HtmlCompat.FROM_HTML_MODE_COMPACT
+            )
+        }
+    }
+
+    class ViewHolder(val binding: ItemSchoolAnnouncementBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementFragment.kt
new file mode 100644
index 000000000..a5a53aefc
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementFragment.kt
@@ -0,0 +1,106 @@
+package io.github.wulkanowy.ui.modules.schoolannouncement
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.databinding.FragmentSchoolAnnouncementBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SchoolAnnouncementFragment :
+    BaseFragment<FragmentSchoolAnnouncementBinding>(R.layout.fragment_school_announcement),
+    SchoolAnnouncementView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: SchoolAnnouncementPresenter
+
+    @Inject
+    lateinit var schoolAnnouncementAdapter: SchoolAnnouncementAdapter
+
+    companion object {
+        fun newInstance() = SchoolAnnouncementFragment()
+    }
+
+    override val titleStringId: Int
+        get() = R.string.school_announcement_title
+
+    override val isViewEmpty: Boolean
+        get() = schoolAnnouncementAdapter.items.isEmpty()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentSchoolAnnouncementBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(binding.directorInformationRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = schoolAnnouncementAdapter
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        with(binding) {
+            directorInformationSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            directorInformationSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+            directorInformationSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh)
+            )
+            directorInformationErrorRetry.setOnClickListener { presenter.onRetry() }
+            directorInformationErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
+    }
+
+    override fun updateData(data: List<SchoolAnnouncement>) {
+        with(schoolAnnouncementAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun clearData() {
+        with(schoolAnnouncementAdapter) {
+            items = listOf()
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun showEmpty(show: Boolean) {
+        binding.directorInformationEmpty.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        binding.directorInformationError.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        binding.directorInformationErrorMessage.text = message
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.directorInformationProgress.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun enableSwipe(enable: Boolean) {
+        binding.directorInformationSwipe.isEnabled = enable
+    }
+
+    override fun showContent(show: Boolean) {
+        binding.directorInformationRecycler.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    override fun showRefresh(show: Boolean) {
+        binding.directorInformationSwipe.isRefreshing = show
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementPresenter.kt
new file mode 100644
index 000000000..ba89ab1f4
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementPresenter.kt
@@ -0,0 +1,105 @@
+package io.github.wulkanowy.ui.modules.schoolannouncement
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
+import io.github.wulkanowy.data.repositories.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class SchoolAnnouncementPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val analytics: AnalyticsHelper,
+    private val schoolAnnouncementRepository: SchoolAnnouncementRepository,
+) : BasePresenter<SchoolAnnouncementView>(errorHandler, studentRepository) {
+
+    private lateinit var lastError: Throwable
+
+    override fun onAttachView(view: SchoolAnnouncementView) {
+        super.onAttachView(view)
+        view.initView()
+        Timber.i("School announcement view was initialized")
+        errorHandler.showErrorMessage = ::showErrorViewOnError
+        loadData()
+    }
+
+    fun onSwipeRefresh() {
+        Timber.i("Force refreshing the School announcement")
+        loadData(true)
+    }
+
+    fun onRetry() {
+        view?.run {
+            showErrorView(false)
+            showProgress(true)
+        }
+        loadData(true)
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    private fun loadData(forceRefresh: Boolean = false) {
+        Timber.i("Loading School announcement data started")
+
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            schoolAnnouncementRepository.getSchoolAnnouncements(student, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> {
+                    if (!it.data.isNullOrEmpty()) {
+                        view?.run {
+                            enableSwipe(true)
+                            showRefresh(true)
+                            showProgress(false)
+                            showContent(true)
+                            updateData(it.data)
+                        }
+                    }
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Loading School announcement result: Success")
+                    view?.apply {
+                        updateData(it.data!!.sortedByDescending { item -> item.date })
+                        showEmpty(it.data.isEmpty())
+                        showErrorView(false)
+                        showContent(it.data.isNotEmpty())
+                    }
+                    analytics.logEvent(
+                        "load_school_announcement",
+                        "items" to it.data!!.size
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading School announcement result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                showRefresh(false)
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
+    }
+
+    private fun showErrorViewOnError(message: String, error: Throwable) {
+        view?.run {
+            if (isViewEmpty) {
+                lastError = error
+                setErrorDetails(message)
+                showErrorView(true)
+                showEmpty(false)
+            } else showError(message, error)
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementView.kt
new file mode 100644
index 000000000..0553df1e7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolannouncement/SchoolAnnouncementView.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.ui.modules.schoolannouncement
+
+import io.github.wulkanowy.data.db.entities.SchoolAnnouncement
+import io.github.wulkanowy.ui.base.BaseView
+
+interface SchoolAnnouncementView : BaseView {
+
+    val isViewEmpty: Boolean
+
+    fun initView()
+
+    fun updateData(data: List<SchoolAnnouncement>)
+
+    fun clearData()
+
+    fun showEmpty(show: Boolean)
+
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
+    fun showProgress(show: Boolean)
+
+    fun enableSwipe(enable: Boolean)
+
+    fun showContent(show: Boolean)
+
+    fun showRefresh(show: Boolean)
+}
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 524d7ba6d..9f29731f6 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
@@ -58,6 +58,10 @@ class AdvancedFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
+    }
+
     override fun openClearLoginView() {
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedView.kt
index c2e8e52dc..90c0474e7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedView.kt
@@ -2,4 +2,4 @@ package io.github.wulkanowy.ui.modules.settings.advanced
 
 import io.github.wulkanowy.ui.base.BaseView
 
-interface AdvancedView : BaseView {}
+interface AdvancedView : BaseView
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 5ac801dc6..a7ee800be 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
@@ -70,6 +70,10 @@ class AppearanceFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
+    }
+
     override fun openClearLoginView() {
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
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 a9641d887..0fc7e68e7 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,7 +1,12 @@
 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.os.Bundle
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +21,9 @@ 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.main.MainView
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openInternetBrowser
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -27,6 +34,9 @@ class NotificationsFragment : PreferenceFragmentCompat(),
     @Inject
     lateinit var presenter: NotificationsPresenter
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     companion object {
         fun newInstance() = NotificationsFragment()
     }
@@ -46,6 +56,13 @@ class NotificationsFragment : PreferenceFragmentCompat(),
                 true
             }
         }
+
+        findPreference<Preference>(getString(R.string.pref_key_notifications_system_settings))?.run {
+            setOnPreferenceClickListener {
+                presenter.onOpenSystemSettingsClicked()
+                true
+            }
+        }
     }
 
     override fun onCreateRecyclerView(
@@ -90,6 +107,10 @@ class NotificationsFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
+    }
+
     override fun openClearLoginView() {
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
@@ -118,6 +139,24 @@ 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)
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
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 981af17de..8366d3094 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
@@ -55,4 +55,8 @@ class NotificationsPresenter @Inject constructor(
     fun onFixSyncIssuesClicked() {
         view?.showFixSyncDialog()
     }
+
+    fun onOpenSystemSettingsClicked() {
+        view?.openSystemSettings()
+    }
 }
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 2618cde1e..2ab9b0352 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
@@ -8,5 +8,7 @@ interface NotificationsView : BaseView {
 
     fun showFixSyncDialog()
 
+    fun openSystemSettings()
+
     fun enableNotification(notificationKey: String, enable: Boolean)
 }
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 207fe2ff6..83caa3b0a 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
@@ -39,6 +39,12 @@ class SyncFragment : PreferenceFragmentCompat(),
         }
     }
 
+    override fun setLastSyncDate(lastSyncDate: String) {
+        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
+            summary = getString(R.string.pref_services_last_full_sync_date, lastSyncDate)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         presenter.onAttachView(this)
@@ -80,6 +86,10 @@ class SyncFragment : PreferenceFragmentCompat(),
         (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
+    override fun showChangePasswordSnackbar(redirectUrl: String) {
+        (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl)
+    }
+
     override fun openClearLoginView() {
         (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
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 36b8d792c..63e86a475 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
@@ -8,6 +8,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.toFormattedString
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -27,6 +28,7 @@ class SyncPresenter @Inject constructor(
         Timber.i("Settings sync view was initialized")
         view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
         view.initView()
+        setSyncDateInView()
     }
 
     fun onSharedPreferenceChanged(key: String) {
@@ -63,10 +65,21 @@ class SyncPresenter @Inject constructor(
                     }
                     else -> Timber.d("Sync now state: ${workInfo.state}")
                 }
-                if (workInfo.state.isFinished) setSyncInProgress(false)
+                if (workInfo.state.isFinished) {
+                    setSyncInProgress(false)
+                    setSyncDateInView()
+                }
             }.catch {
                 Timber.e(it, "Sync now failed")
             }.launch("sync")
         }
     }
+
+    private fun setSyncDateInView() {
+        val lastSyncDate = preferencesRepository.lasSyncDate
+
+        if (lastSyncDate.year == 1970) return
+
+        view?.setLastSyncDate(lastSyncDate.toFormattedString("dd.MM.yyyy HH:mm:ss"))
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt
index 9da473ba7..6ffe156f2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt
@@ -10,6 +10,8 @@ interface SyncView : BaseView {
 
     fun initView()
 
+    fun setLastSyncDate(lastSyncDate: String)
+
     fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
 
     fun setSyncInProgress(inProgress: Boolean)
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 2b96a9a0c..376ef3743 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
@@ -3,10 +3,8 @@ package io.github.wulkanowy.ui.modules.splash
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.appcompat.app.AlertDialog
 import androidx.viewbinding.ViewBinding
 import dagger.hilt.android.AndroidEntryPoint
-import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
@@ -46,14 +44,4 @@ class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView
     override fun showError(text: String, error: Throwable) {
         Toast.makeText(this, text, LENGTH_LONG).show()
     }
-
-    override fun showKitkatView() {
-        AlertDialog.Builder(this)
-            .setTitle(R.string.drop_kitkat_title)
-            .setMessage(R.string.drop_kitkat_content)
-            .setPositiveButton(android.R.string.ok, null)
-            .setNeutralButton(R.string.drop_kitkat_again) { _, _ -> presenter.onNeutralButtonSelected() }
-            .setOnDismissListener { presenter.onKitkatViewDismissed() }
-            .show()
-    }
 }
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 4590d91a5..03e43efa8 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
@@ -1,12 +1,9 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import android.os.Build
 import io.github.wulkanowy.data.Status
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.flowWithResource
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -15,26 +12,13 @@ import javax.inject.Inject
 class SplashPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val preferencesRepository: PreferencesRepository,
-    private val appInfo: AppInfo
 ) : BasePresenter<SplashView>(errorHandler, studentRepository) {
 
-    private var externalUrl: String? = null
-
     fun onAttachView(view: SplashView, externalUrl: String?) {
         super.onAttachView(view)
-        this.externalUrl = externalUrl
 
-        if (appInfo.systemVersion < Build.VERSION_CODES.LOLLIPOP && !preferencesRepository.isKitkatDialogDisabled) {
-            view.showKitkatView()
-        } else {
-            loadCorrectDataOrUser()
-        }
-    }
-
-    private fun loadCorrectDataOrUser() {
         if (!externalUrl.isNullOrBlank()) {
-            view?.openExternalUrlAndFinish(externalUrl!!)
+            view.openExternalUrlAndFinish(externalUrl)
             return
         }
 
@@ -42,19 +26,11 @@ class SplashPresenter @Inject constructor(
             when (it.status) {
                 Status.LOADING -> Timber.d("Is current user set check started")
                 Status.SUCCESS -> {
-                    if (it.data!!) view?.openMainView()
-                    else view?.openLoginView()
+                    if (it.data!!) view.openMainView()
+                    else view.openLoginView()
                 }
                 Status.ERROR -> errorHandler.dispatch(it.error!!)
             }
         }.launch()
     }
-
-    fun onKitkatViewDismissed() {
-        loadCorrectDataOrUser()
-    }
-
-    fun onNeutralButtonSelected() {
-        preferencesRepository.isKitkatDialogDisabled = true
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
index c9c5fe9a4..a5aa14091 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashView.kt
@@ -9,6 +9,4 @@ interface SplashView : BaseView {
     fun openMainView()
 
     fun openExternalUrlAndFinish(url: String)
-
-    fun showKitkatView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoAdapter.kt
index 602ec07ad..2d8387491 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoAdapter.kt
@@ -1,6 +1,8 @@
 package io.github.wulkanowy.ui.modules.studentinfo
 
 import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.databinding.ItemStudentInfoBinding
@@ -9,7 +11,7 @@ import javax.inject.Inject
 class StudentInfoAdapter @Inject constructor() :
     RecyclerView.Adapter<StudentInfoAdapter.ViewHolder>() {
 
-    var items = listOf<Pair<String, String>>()
+    var items = listOf<StudentInfoItem>()
 
     var onItemClickListener: (position: Int) -> Unit = {}
 
@@ -25,8 +27,9 @@ class StudentInfoAdapter @Inject constructor() :
         val item = items[position]
 
         with(holder.binding) {
-            studentInfoItemTitle.text = item.first
-            studentInfoItemSubtitle.text = item.second
+            studentInfoItemTitle.text = item.title
+            studentInfoItemSubtitle.text = item.subtitle
+            studentInfoItemArrow.visibility = if (item.showArrow) VISIBLE else GONE
 
             with(root) {
                 setOnClickListener { onItemClickListener(position) }
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 6a80b2b95..e9ef41372 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
@@ -23,6 +23,7 @@ import io.github.wulkanowy.databinding.FragmentStudentInfoBinding
 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.utils.capitalise
 import io.github.wulkanowy.utils.getThemeAttrColor
 import javax.inject.Inject
 
@@ -38,7 +39,15 @@ class StudentInfoFragment :
     lateinit var studentInfoAdapter: StudentInfoAdapter
 
     override val titleStringId: Int
-        get() = R.string.student_info_title
+        get() = when (requireArguments().getSerializable(INFO_TYPE_ARGUMENT_KEY) as? StudentInfoView.Type) {
+            StudentInfoView.Type.PERSONAL -> R.string.account_personal_data
+            StudentInfoView.Type.CONTACT -> R.string.account_contact
+            StudentInfoView.Type.ADDRESS -> R.string.account_address
+            StudentInfoView.Type.FAMILY -> R.string.account_family
+            StudentInfoView.Type.SECOND_GUARDIAN -> R.string.student_info_guardian
+            StudentInfoView.Type.FIRST_GUARDIAN -> R.string.student_info_guardian
+            else -> R.string.student_info_title
+        }
 
     override val isViewEmpty get() = studentInfoAdapter.items.isEmpty()
 
@@ -98,7 +107,7 @@ class StudentInfoFragment :
         }
     }
 
-    override fun updateData(data: List<Pair<String, String>>) {
+    override fun updateData(data: List<StudentInfoItem>) {
         with(studentInfoAdapter) {
             items = data
             notifyDataSetChanged()
@@ -120,7 +129,11 @@ class StudentInfoFragment :
                 getString(R.string.student_info_family_name) to studentInfo.familyName,
                 getString(R.string.student_info_parents_name) to studentInfo.parentsNames
             ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
+                StudentInfoItem(
+                    it.first,
+                    it.second.ifBlank { getString(R.string.all_no_data) },
+                    false,
+                )
             }
         )
     }
@@ -132,7 +145,11 @@ class StudentInfoFragment :
                 getString(R.string.student_info_cellphone) to studentInfo.cellPhoneNumber,
                 getString(R.string.student_info_email) to studentInfo.email
             ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
+                StudentInfoItem(
+                    it.first,
+                    it.second.ifBlank { getString(R.string.all_no_data) },
+                    false,
+                )
             }
         )
     }
@@ -141,13 +158,14 @@ class StudentInfoFragment :
     override fun showFamilyTypeData(studentInfo: StudentInfo) {
         updateData(
             listOfNotNull(
-                studentInfo.firstGuardian?.let { it.kinship.capitalize() to it.fullName },
-                studentInfo.secondGuardian?.let { it.kinship.capitalize() to it.fullName },
+                studentInfo.firstGuardian?.let { it.kinship.capitalise() to it.fullName },
+                studentInfo.secondGuardian?.let { it.kinship.capitalise() to it.fullName },
             ).map { (title, value) ->
-                val updatedValue = value.ifBlank { getString(R.string.all_no_data) }
-                val updatedTitle = title.ifBlank { getString(R.string.all_no_data) }
-
-                updatedTitle to updatedValue
+                StudentInfoItem(
+                    title.ifBlank { getString(R.string.all_no_data) },
+                    value.ifBlank { getString(R.string.all_no_data) },
+                    true,
+                )
             }
         )
     }
@@ -159,7 +177,11 @@ class StudentInfoFragment :
                 getString(R.string.student_info_registered_address) to studentInfo.registeredAddress,
                 getString(R.string.student_info_correspondence_address) to studentInfo.correspondenceAddress
             ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
+                StudentInfoItem(
+                    it.first,
+                    it.second.ifBlank { getString(R.string.all_no_data) },
+                    false,
+                )
             }
         )
     }
@@ -173,7 +195,11 @@ class StudentInfoFragment :
                 getString(R.string.student_info_phones) to studentGuardian.phones,
                 getString(R.string.student_info_email) to studentGuardian.email
             ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
+                StudentInfoItem(
+                    it.first,
+                    it.second.ifBlank { getString(R.string.all_no_data) },
+                    false,
+                )
             }
         )
     }
@@ -187,7 +213,11 @@ class StudentInfoFragment :
                 getString(R.string.student_info_phones) to studentGuardian.phones,
                 getString(R.string.student_info_email) to studentGuardian.email
             ).map {
-                if (it.second.isBlank()) it.copy(second = getString(R.string.all_no_data)) else it
+                StudentInfoItem(
+                    it.first,
+                    it.second.ifBlank { getString(R.string.all_no_data) },
+                    false,
+                )
             }
         )
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoItem.kt
new file mode 100644
index 000000000..bb149b2b1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoItem.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.ui.modules.studentinfo
+
+data class StudentInfoItem(
+    val title: String,
+    val subtitle: String,
+    val showArrow: Boolean
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoPresenter.kt
index d5f84dc21..55ac66d0b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoPresenter.kt
@@ -61,11 +61,11 @@ class StudentInfoPresenter @Inject constructor(
     fun onItemSelected(position: Int) {
         if (infoType != StudentInfoView.Type.FAMILY) return
 
-        if (position == 0) {
-            view?.openStudentInfoView(StudentInfoView.Type.FIRST_GUARDIAN, studentWithSemesters)
-        } else {
-            view?.openStudentInfoView(StudentInfoView.Type.SECOND_GUARDIAN, studentWithSemesters)
-        }
+        view?.openStudentInfoView(
+            if (position == 0) StudentInfoView.Type.FIRST_GUARDIAN
+            else StudentInfoView.Type.SECOND_GUARDIAN,
+            studentWithSemesters
+        )
     }
 
     fun onItemLongClick(text: String) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoView.kt
index 2f0c6753a..87613e626 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/studentinfo/StudentInfoView.kt
@@ -15,7 +15,7 @@ interface StudentInfoView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<Pair<String, String>>)
+    fun updateData(data: List<StudentInfoItem>)
 
     fun showPersonalTypeData(studentInfo: StudentInfo)
 
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 f049f828e..87b3362db 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
@@ -7,6 +7,7 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
@@ -26,31 +27,58 @@ import kotlin.concurrent.timer
 
 class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private enum class ViewType(val id: Int) {
-        ITEM_NORMAL(1),
-        ITEM_SMALL(2)
+    private enum class ViewType {
+        ITEM_NORMAL,
+        ITEM_SMALL
     }
 
-    var items = mutableListOf<Timetable>()
-        set(value) {
-            field = value
-            resetTimers()
-        }
-
     var onClickListener: (Timetable) -> Unit = {}
 
-    var showWholeClassPlan: String = "no"
+    private var showWholeClassPlan: String = "no"
 
-    var showGroupsInPlan: Boolean = false
+    private var showGroupsInPlan: Boolean = false
 
-    var showTimers: Boolean = false
+    private var showTimers: Boolean = false
 
-    private val timers = mutableMapOf<Int, Timer>()
+    private val timers = mutableMapOf<Int, Timer?>()
 
-    fun resetTimers() {
-        Timber.d("Timetable timers (${timers.size}) reset")
+    private val items = mutableListOf<Timetable>()
+
+    fun submitList(
+        newTimetable: List<Timetable>,
+        showWholeClassPlan: String = this.showWholeClassPlan,
+        showGroupsInPlan: Boolean = this.showGroupsInPlan,
+        showTimers: Boolean = this.showTimers
+    ) {
+        val isFlagsDifferent = this.showWholeClassPlan != showWholeClassPlan
+            || this.showGroupsInPlan != showGroupsInPlan
+            || this.showTimers != showTimers
+
+        val diffResult = DiffUtil.calculateDiff(
+            TimetableAdapterDiffCallback(
+                oldList = items.toMutableList(),
+                newList = newTimetable,
+                isFlagsDifferent = isFlagsDifferent
+            )
+        )
+
+        this.showGroupsInPlan = showGroupsInPlan
+        this.showTimers = showTimers
+        this.showWholeClassPlan = showWholeClassPlan
+
+        items.clear()
+        items.addAll(newTimetable)
+
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    fun clearTimers() {
+        Timber.d("Timetable timers (${timers.size}) cleared")
         with(timers) {
-            forEach { (_, timer) -> timer.cancel() }
+            forEach { (_, timer) ->
+                timer?.cancel()
+                timer?.purge()
+            }
             clear()
         }
     }
@@ -58,16 +86,20 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
     override fun getItemCount() = items.size
 
     override fun getItemViewType(position: Int) = when {
-        !items[position].isStudentPlan && showWholeClassPlan == "small" -> ViewType.ITEM_SMALL.id
-        else -> ViewType.ITEM_NORMAL.id
+        !items[position].isStudentPlan && showWholeClassPlan == "small" -> ViewType.ITEM_SMALL.ordinal
+        else -> ViewType.ITEM_NORMAL.ordinal
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
 
         return when (viewType) {
-            ViewType.ITEM_NORMAL.id -> ItemViewHolder(ItemTimetableBinding.inflate(inflater, parent, false))
-            ViewType.ITEM_SMALL.id -> SmallItemViewHolder(ItemTimetableSmallBinding.inflate(inflater, parent, false))
+            ViewType.ITEM_NORMAL.ordinal -> ItemViewHolder(
+                ItemTimetableBinding.inflate(inflater, parent, false)
+            )
+            ViewType.ITEM_SMALL.ordinal -> SmallItemViewHolder(
+                ItemTimetableSmallBinding.inflate(inflater, parent, false)
+            )
             else -> throw IllegalStateException()
         }
     }
@@ -111,6 +143,12 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
             bindNormalDescription(binding, lesson)
             bindNormalColors(binding, lesson)
 
+            timers[position]?.let {
+                it.cancel()
+                it.purge()
+            }
+            timers[position] = null
+
             if (lesson.isStudentPlan && showTimers) {
                 timers[position] = timer(period = 1000) {
                     if (ViewCompat.isAttachedToWindow(root)) {
@@ -128,10 +166,12 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
     }
 
     private fun getPreviousLesson(position: Int): LocalDateTime? {
-        return items.filter { it.isStudentPlan }.getOrNull(position - 1 - items.filterIndexed { i, item -> i < position && !item.isStudentPlan }.size)?.let {
-            if (!it.canceled && it.isStudentPlan) it.end
-            else null
-        }
+        return items.filter { it.isStudentPlan }
+            .getOrNull(position - 1 - items.filterIndexed { i, item -> i < position && !item.isStudentPlan }.size)
+            ?.let {
+                if (!it.canceled && it.isStudentPlan) it.end
+                else null
+            }
     }
 
     private fun updateTimeLeft(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
@@ -148,11 +188,18 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                     timetableItemTimeLeft.visibility = GONE
                     with(timetableItemTimeUntil) {
                         visibility = VISIBLE
-                        text = context.getString(R.string.timetable_time_until,
+                        text = context.getString(
+                            R.string.timetable_time_until,
                             if (until.seconds <= 60) {
-                                context.getString(R.string.timetable_seconds, until.seconds.toString(10))
+                                context.getString(
+                                    R.string.timetable_seconds,
+                                    until.seconds.toString(10)
+                                )
                             } else {
-                                context.getString(R.string.timetable_minutes, until.toMinutes().toString(10))
+                                context.getString(
+                                    R.string.timetable_minutes,
+                                    until.toMinutes().toString(10)
+                                )
                             }
                         )
                     }
@@ -166,9 +213,15 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                         text = context.getString(
                             R.string.timetable_time_left,
                             if (left.seconds < 60) {
-                                context.getString(R.string.timetable_seconds, left.seconds.toString(10))
+                                context.getString(
+                                    R.string.timetable_seconds,
+                                    left.seconds.toString(10)
+                                )
                             } else {
-                                context.getString(R.string.timetable_minutes, left.toMinutes().toString(10))
+                                context.getString(
+                                    R.string.timetable_minutes,
+                                    left.toMinutes().toString(10)
+                                )
                             }
                         )
                     }
@@ -189,8 +242,9 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
     }
 
     private fun bindSubjectStyle(subjectView: TextView, lesson: Timetable) {
-        subjectView.paintFlags = if (lesson.canceled) subjectView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-        else subjectView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+        subjectView.paintFlags =
+            if (lesson.canceled) subjectView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+            else subjectView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
     }
 
     private fun bindSmallDescription(binding: ItemTimetableSmallBinding, lesson: Timetable) {
@@ -202,10 +256,12 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                 timetableSmallItemRoom.visibility = GONE
                 timetableSmallItemTeacher.visibility = GONE
 
-                timetableSmallItemDescription.setTextColor(root.context.getThemeAttrColor(
-                    if (lesson.canceled) R.attr.colorPrimary
-                    else R.attr.colorTimetableChange
-                ))
+                timetableSmallItemDescription.setTextColor(
+                    root.context.getThemeAttrColor(
+                        if (lesson.canceled) R.attr.colorPrimary
+                        else R.attr.colorTimetableChange
+                    )
+                )
             } else {
                 timetableSmallItemDescription.visibility = GONE
                 timetableSmallItemRoom.visibility = VISIBLE
@@ -224,14 +280,17 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
                 timetableItemGroup.visibility = GONE
                 timetableItemTeacher.visibility = GONE
 
-                timetableItemDescription.setTextColor(root.context.getThemeAttrColor(
-                    if (lesson.canceled) R.attr.colorPrimary
-                    else R.attr.colorTimetableChange
-                ))
+                timetableItemDescription.setTextColor(
+                    root.context.getThemeAttrColor(
+                        if (lesson.canceled) R.attr.colorPrimary
+                        else R.attr.colorTimetableChange
+                    )
+                )
             } else {
                 timetableItemDescription.visibility = GONE
                 timetableItemRoom.visibility = VISIBLE
-                timetableItemGroup.visibility = if (showGroupsInPlan && lesson.group.isNotBlank()) VISIBLE else GONE
+                timetableItemGroup.visibility =
+                    if (showGroupsInPlan && lesson.group.isNotBlank()) VISIBLE else GONE
                 timetableItemTeacher.visibility = VISIBLE
             }
         }
@@ -240,7 +299,10 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
     private fun bindSmallColors(binding: ItemTimetableSmallBinding, lesson: Timetable) {
         with(binding) {
             if (lesson.canceled) {
-                updateNumberAndSubjectCanceledColor(timetableSmallItemNumber, timetableSmallItemSubject)
+                updateNumberAndSubjectCanceledColor(
+                    timetableSmallItemNumber,
+                    timetableSmallItemSubject
+                )
             } else {
                 updateNumberColor(timetableSmallItemNumber, lesson)
                 updateSubjectColor(timetableSmallItemSubject, lesson)
@@ -269,31 +331,39 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
     }
 
     private fun updateNumberColor(numberView: TextView, lesson: Timetable) {
-        numberView.setTextColor(numberView.context.getThemeAttrColor(
-            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
+        numberView.setTextColor(
+            numberView.context.getThemeAttrColor(
+                if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
+                else android.R.attr.textColorPrimary
+            )
+        )
     }
 
     private fun updateSubjectColor(subjectView: TextView, lesson: Timetable) {
-        subjectView.setTextColor(subjectView.context.getThemeAttrColor(
-            if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
+        subjectView.setTextColor(
+            subjectView.context.getThemeAttrColor(
+                if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
+                else android.R.attr.textColorPrimary
+            )
+        )
     }
 
     private fun updateRoomColor(roomView: TextView, lesson: Timetable) {
-        roomView.setTextColor(roomView.context.getThemeAttrColor(
-            if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
+        roomView.setTextColor(
+            roomView.context.getThemeAttrColor(
+                if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
+                else android.R.attr.textColorSecondary
+            )
+        )
     }
 
     private fun updateTeacherColor(teacherTextView: TextView, lesson: Timetable) {
-        teacherTextView.setTextColor(teacherTextView.context.getThemeAttrColor(
-            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
+        teacherTextView.setTextColor(
+            teacherTextView.context.getThemeAttrColor(
+                if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
+                else android.R.attr.textColorSecondary
+            )
+        )
     }
 
     private class ItemViewHolder(val binding: ItemTimetableBinding) :
@@ -301,4 +371,21 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView
 
     private class SmallItemViewHolder(val binding: ItemTimetableSmallBinding) :
         RecyclerView.ViewHolder(binding.root)
+
+    class TimetableAdapterDiffCallback(
+        private val oldList: List<Timetable>,
+        private val newList: List<Timetable>,
+        private val isFlagsDifferent: Boolean
+    ) : DiffUtil.Callback() {
+
+        override fun getOldListSize() = oldList.size
+
+        override fun getNewListSize() = newList.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            oldList[oldItemPosition].id == newList[newItemPosition].id
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+            oldList[oldItemPosition] == newList[newItemPosition] && !isFlagsDifferent
+    }
 }
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 7744515d9..3f8622f85 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
@@ -12,6 +12,8 @@ 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.decapitalise
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
@@ -63,13 +65,13 @@ class TimetableDialog : DialogFragment() {
 
     private fun setSubject(subject: String, subjectOld: String) {
         with(binding) {
-            timetableDialogSubject.text = subject
+            timetableDialogLessonValue.text = subject
             if (subjectOld.isNotBlank() && subjectOld != subject) {
-                timetableDialogSubject.run {
+                timetableDialogLessonValue.run {
                     paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
                     text = subjectOld
                 }
-                timetableDialogSubjectNew.run {
+                timetableDialogLessonNewValue.run {
                     visibility = VISIBLE
                     text = subject
                 }
@@ -88,26 +90,26 @@ class TimetableDialog : DialogFragment() {
                                 R.attr.colorPrimary
                             )
                         )
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                        timetableDialogChangesValue.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
                     } else {
                         timetableDialogChangesTitle.setTextColor(
                             requireContext().getThemeAttrColor(
                                 R.attr.colorTimetableChange
                             )
                         )
-                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                        timetableDialogChangesValue.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
                     }
 
-                    timetableDialogChanges.text = when {
+                    timetableDialogChangesValue.text = when {
                         canceled && !changes -> "Lekcja odwołana: $info"
                         changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
-                        changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
-                        else -> info.capitalize()
+                        changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalise()}"
+                        else -> info.capitalise()
                     }
                 }
                 else -> {
                     timetableDialogChangesTitle.visibility = GONE
-                    timetableDialogChanges.visibility = GONE
+                    timetableDialogChangesValue.visibility = GONE
                 }
             }
         }
@@ -117,22 +119,22 @@ class TimetableDialog : DialogFragment() {
         with(binding) {
             when {
                 teacherOld.isNotBlank() && teacherOld != teacher -> {
-                    timetableDialogTeacher.run {
+                    timetableDialogTeacherValue.run {
                         visibility = VISIBLE
                         paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
                         text = teacherOld
                     }
                     if (teacher.isNotBlank()) {
-                        timetableDialogTeacherNew.run {
+                        timetableDialogTeacherNewValue.run {
                             visibility = VISIBLE
                             text = teacher
                         }
                     }
                 }
-                teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+                teacher.isNotBlank() -> timetableDialogTeacherValue.text = teacher
                 else -> {
                     timetableDialogTeacherTitle.visibility = GONE
-                    timetableDialogTeacher.visibility = GONE
+                    timetableDialogTeacherValue.visibility = GONE
                 }
             }
         }
@@ -141,10 +143,10 @@ class TimetableDialog : DialogFragment() {
     private fun setGroup(group: String) {
         with(binding) {
             when {
-                group.isNotBlank() -> timetableDialogGroup.text = group
+                group.isNotBlank() -> timetableDialogGroupValue.text = group
                 else -> {
                     timetableDialogGroupTitle.visibility = GONE
-                    timetableDialogGroup.visibility = GONE
+                    timetableDialogGroupValue.visibility = GONE
                 }
             }
         }
@@ -154,22 +156,22 @@ class TimetableDialog : DialogFragment() {
         with(binding) {
             when {
                 roomOld.isNotBlank() && roomOld != room -> {
-                    timetableDialogRoom.run {
+                    timetableDialogRoomValue.run {
                         visibility = VISIBLE
                         paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
                         text = roomOld
                     }
                     if (room.isNotBlank()) {
-                        timetableDialogRoomNew.run {
+                        timetableDialogRoomNewValue.run {
                             visibility = VISIBLE
                             text = room
                         }
                     }
                 }
-                room.isNotBlank() -> timetableDialogRoom.text = room
+                room.isNotBlank() -> timetableDialogRoomValue.text = room
                 else -> {
                     timetableDialogRoomTitle.visibility = GONE
-                    timetableDialogRoom.visibility = GONE
+                    timetableDialogRoomValue.visibility = GONE
                 }
             }
         }
@@ -177,7 +179,7 @@ class TimetableDialog : DialogFragment() {
 
     @SuppressLint("SetTextI18n")
     private fun setTime(start: LocalDateTime, end: LocalDateTime) {
-        binding.timetableDialogTime.text =
+        binding.timetableDialogTimeValue.text =
             "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
     }
 }
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 91f09ccc4..a65d69211 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,8 +7,10 @@ import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import androidx.core.text.HtmlCompat
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.MaterialDatePicker
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
@@ -19,9 +21,13 @@ import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.additional.AdditionalLessonsFragment
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.SchoolDaysValidator
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.schoolYearEnd
+import io.github.wulkanowy.utils.schoolYearStart
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.utils.toTimestamp
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -43,7 +49,7 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
 
     override val titleStringId get() = R.string.timetable_title
 
-    override val isViewEmpty get() = timetableAdapter.items.isEmpty()
+    override val isViewEmpty get() = timetableAdapter.itemCount > 0
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
@@ -71,7 +77,9 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         with(binding) {
             timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
             timetableSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            timetableSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            timetableSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh)
+            )
             timetableErrorRetry.setOnClickListener { presenter.onRetry() }
             timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -95,21 +103,22 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         }
     }
 
-    override fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showGroupsInPlanType: Boolean, showTimetableTimers: Boolean) {
-        with(timetableAdapter) {
-            items = data.toMutableList()
-            showTimers = showTimetableTimers
+    override fun updateData(
+        data: List<Timetable>,
+        showWholeClassPlanType: String,
+        showGroupsInPlanType: Boolean,
+        showTimetableTimers: Boolean
+    ) {
+        timetableAdapter.submitList(
+            newTimetable = data.toMutableList(),
+            showGroupsInPlan = showGroupsInPlanType,
+            showTimers = showTimetableTimers,
             showWholeClassPlan = showWholeClassPlanType
-            showGroupsInPlan = showGroupsInPlanType
-            notifyDataSetChanged()
-        }
+        )
     }
 
     override fun clearData() {
-        with(timetableAdapter) {
-            items = mutableListOf()
-            notifyDataSetChanged()
-        }
+        timetableAdapter.submitList(listOf())
     }
 
     override fun updateNavigationDay(date: String) {
@@ -136,6 +145,13 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
         binding.timetableEmpty.visibility = if (show) VISIBLE else GONE
     }
 
+    override fun setDayHeaderMessage(message: String?) {
+        binding.timetableEmptyMessage.visibility = if (message.isNullOrEmpty()) GONE else VISIBLE
+        binding.timetableEmptyMessage.text = HtmlCompat.fromHtml(
+            message.orEmpty(), HtmlCompat.FROM_HTML_MODE_COMPACT
+        )
+    }
+
     override fun showErrorView(show: Boolean) {
         binding.timetableError.visibility = if (show) VISIBLE else GONE
     }
@@ -169,19 +185,26 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
     }
 
     override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
+        val baseDate = currentDate.schoolYearStart
+        val rangeStart = baseDate.toTimestamp()
+        val rangeEnd = LocalDate.now().schoolYearEnd.toTimestamp()
 
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@TimetableFragment.parentFragmentManager, null)
+        val constraintsBuilder = CalendarConstraints.Builder().apply {
+            setValidator(SchoolDaysValidator(rangeStart, rangeEnd))
+            setStart(rangeStart)
+            setEnd(rangeEnd)
         }
+        val datePicker = MaterialDatePicker.Builder.datePicker()
+            .setCalendarConstraints(constraintsBuilder.build())
+            .setSelection(currentDate.toTimestamp())
+            .build()
+
+        datePicker.addOnPositiveButtonClickListener {
+            val date = it.toLocalDateTime()
+            presenter.onDateSet(date.year, date.monthValue, date.dayOfMonth)
+        }
+
+        datePicker.show(this@TimetableFragment.parentFragmentManager, null)
     }
 
     override fun openAdditionalLessonsView() {
@@ -198,7 +221,7 @@ class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragme
     }
 
     override fun onDestroyView() {
-        timetableAdapter.resetTimers()
+        timetableAdapter.clearTimers()
         presenter.onDetachView()
         super.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 3cd15bcfd..fa1bbfb28 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
@@ -11,6 +11,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
@@ -138,32 +139,37 @@ class TimetablePresenter @Inject constructor(
         flowWithResourceIn {
             val student = studentRepository.getCurrentStudent()
             val semester = semesterRepository.getCurrentSemester(student)
-            timetableRepository.getTimetable(student, semester, currentDate, currentDate, forceRefresh)
+            timetableRepository.getTimetable(
+                student, semester, currentDate, currentDate, forceRefresh
+            )
         }.onEach {
             when (it.status) {
                 Status.LOADING -> {
-                    if (!it.data?.first.isNullOrEmpty()) {
+                    if (!it.data?.lessons.isNullOrEmpty()) {
                         view?.run {
                             enableSwipe(true)
                             showRefresh(true)
                             showProgress(false)
                             showContent(true)
-                            updateData(it.data!!.first)
+                            updateData(it.data!!.lessons)
                         }
                     }
                 }
                 Status.SUCCESS -> {
                     Timber.i("Loading timetable result: Success")
                     view?.apply {
-                        updateData(it.data!!.first)
-                        showEmpty(it.data.first.isEmpty())
+                        updateData(it.data!!.lessons)
+                        showEmpty(it.data.lessons.isEmpty())
+                        setDayHeaderMessage(it.data.headers.singleOrNull { header ->
+                            header.date == currentDate
+                        }?.content)
                         showErrorView(false)
-                        showContent(it.data.first.isNotEmpty())
+                        showContent(it.data.lessons.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "timetable",
-                        "items" to it.data!!.first.size
+                        "items" to it.data!!.lessons.size
                     )
                 }
                 Status.ERROR -> {
@@ -224,7 +230,7 @@ class TimetablePresenter @Inject constructor(
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalise())
         }
     }
 }
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 c6bceb9e8..4afb0b051 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
@@ -24,6 +24,8 @@ interface TimetableView : BaseView {
 
     fun showEmpty(show: Boolean)
 
+    fun setDayHeaderMessage(message: String?)
+
     fun showErrorView(show: Boolean)
 
     fun setErrorDetails(message: String)
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 7982387df..a4e1f0fc0 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
@@ -3,7 +3,8 @@ package io.github.wulkanowy.ui.modules.timetable.additional
 import android.os.Bundle
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.MaterialDatePicker
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.TimetableAdditional
@@ -11,9 +12,13 @@ import io.github.wulkanowy.databinding.FragmentTimetableAdditionalBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.widgets.DividerItemDecoration
-import io.github.wulkanowy.utils.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.SchoolDaysValidator
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.schoolYearEnd
+import io.github.wulkanowy.utils.schoolYearStart
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.utils.toTimestamp
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -55,7 +60,11 @@ class AdditionalLessonsFragment :
         with(binding) {
             additionalLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
             additionalLessonsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            additionalLessonsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            additionalLessonsSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(
+                    R.attr.colorSwipeRefresh
+                )
+            )
             additionalLessonsErrorRetry.setOnClickListener { presenter.onRetry() }
             additionalLessonsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -114,7 +123,8 @@ class AdditionalLessonsFragment :
     }
 
     override fun showPreButton(show: Boolean) {
-        binding.additionalLessonsPreviousButton.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.additionalLessonsPreviousButton.visibility =
+            if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
@@ -122,19 +132,27 @@ class AdditionalLessonsFragment :
     }
 
     override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
+        val now = LocalDate.now()
+        val startOfSchoolYear = now.schoolYearStart.toTimestamp()
+        val endOfSchoolYear = now.schoolYearEnd.toTimestamp()
 
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@AdditionalLessonsFragment.parentFragmentManager, null)
+        val constraintsBuilder = CalendarConstraints.Builder().apply {
+            setValidator(SchoolDaysValidator(startOfSchoolYear, endOfSchoolYear))
+            setStart(startOfSchoolYear)
+            setEnd(endOfSchoolYear)
         }
+        val datePicker =
+            MaterialDatePicker.Builder.datePicker()
+                .setCalendarConstraints(constraintsBuilder.build())
+                .setSelection(currentDate.toTimestamp())
+                .build()
+
+        datePicker.addOnPositiveButtonClickListener {
+            val date = it.toLocalDateTime()
+            presenter.onDateSet(date.year, date.monthValue, date.dayOfMonth)
+        }
+
+        datePicker.show(this@AdditionalLessonsFragment.parentFragmentManager, null)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
index 21997b33f..3496e141a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
@@ -9,6 +9,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
@@ -110,15 +111,15 @@ class AdditionalLessonsPresenter @Inject constructor(
                 Status.SUCCESS -> {
                     Timber.i("Loading additional lessons lessons result: Success")
                     view?.apply {
-                        updateData(it.data!!.second.sortedBy { item -> item.date })
-                        showEmpty(it.data.second.isEmpty())
+                        updateData(it.data!!.additional.sortedBy { item -> item.date })
+                        showEmpty(it.data.additional.isEmpty())
                         showErrorView(false)
-                        showContent(it.data.second.isNotEmpty())
+                        showContent(it.data.additional.isNotEmpty())
                     }
                     analytics.logEvent(
                         "load_data",
                         "type" to "additional_lessons",
-                        "items" to it.data!!.second.size
+                        "items" to it.data!!.additional.size
                     )
                 }
                 Status.ERROR -> {
@@ -164,7 +165,7 @@ class AdditionalLessonsPresenter @Inject constructor(
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalise())
         }
     }
 }
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 258fc59df..7d32278f0 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
@@ -42,39 +42,39 @@ class CompletedLessonDialog : DialogFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         with(binding) {
-            completedLessonDialogSubject.text = completedLesson.subject
-            completedLessonDialogTopic.text = completedLesson.topic
-            completedLessonDialogTeacher.text = completedLesson.teacher
-            completedLessonDialogAbsence.text = completedLesson.absence
-            completedLessonDialogChanges.text = completedLesson.substitution
-            completedLessonDialogResources.text = completedLesson.resources
+            completedLessonDialogSubjectValue.text = completedLesson.subject
+            completedLessonDialogTopicValue.text = completedLesson.topic
+            completedLessonDialogTeacherValue.text = completedLesson.teacher
+            completedLessonDialogAbsenceValue.text = completedLesson.absence
+            completedLessonDialogChangesValue.text = completedLesson.substitution
+            completedLessonDialogResourcesValue.text = completedLesson.resources
         }
 
         completedLesson.substitution.let {
             if (it.isBlank()) {
                 with(binding) {
                     completedLessonDialogChangesTitle.visibility = View.GONE
-                    completedLessonDialogChanges.visibility = View.GONE
+                    completedLessonDialogChangesValue.visibility = View.GONE
                 }
-            } else binding.completedLessonDialogChanges.text = it
+            } else binding.completedLessonDialogChangesValue.text = it
         }
 
         completedLesson.absence.let {
             if (it.isBlank()) {
                 with(binding) {
                     completedLessonDialogAbsenceTitle.visibility = View.GONE
-                    completedLessonDialogAbsence.visibility = View.GONE
+                    completedLessonDialogAbsenceValue.visibility = View.GONE
                 }
-            } else binding.completedLessonDialogAbsence.text = it
+            } else binding.completedLessonDialogAbsenceValue.text = it
         }
 
         completedLesson.resources.let {
             if (it.isBlank()) {
                 with(binding) {
                     completedLessonDialogResourcesTitle.visibility = View.GONE
-                    completedLessonDialogResources.visibility = View.GONE
+                    completedLessonDialogResourcesValue.visibility = View.GONE
                 }
-            } else binding.completedLessonDialogResources.text = it
+            } else binding.completedLessonDialogResourcesValue.text = it
         }
 
         binding.completedLessonDialogClose.setOnClickListener { dismiss() }
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 b6041b8ac..ad698c1cf 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
@@ -6,7 +6,8 @@ import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.MaterialDatePicker
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
@@ -15,10 +16,14 @@ 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.SchooldaysRangeLimiter
+import io.github.wulkanowy.utils.SchoolDaysValidator
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getCompatDrawable
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.schoolYearEnd
+import io.github.wulkanowy.utils.schoolYearStart
+import io.github.wulkanowy.utils.toLocalDateTime
+import io.github.wulkanowy.utils.toTimestamp
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -62,7 +67,11 @@ class CompletedLessonsFragment :
         with(binding) {
             completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
             completedLessonsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-            completedLessonsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh))
+            completedLessonsSwipe.setProgressBackgroundColorSchemeColor(
+                requireContext().getThemeAttrColor(
+                    R.attr.colorSwipeRefresh
+                )
+            )
             completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
             completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
@@ -136,23 +145,35 @@ class CompletedLessonsFragment :
     }
 
     override fun showCompletedLessonDialog(completedLesson: CompletedLesson) {
-        (activity as? MainActivity)?.showDialogFragment(CompletedLessonDialog.newInstance(completedLesson))
+        (activity as? MainActivity)?.showDialogFragment(
+            CompletedLessonDialog.newInstance(
+                completedLesson
+            )
+        )
     }
 
     override fun showDatePickerDialog(currentDate: LocalDate) {
-        val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, month, dayOfMonth ->
-            presenter.onDateSet(year, month + 1, dayOfMonth)
-        }
-        val datePickerDialog = DatePickerDialog.newInstance(dateSetListener,
-            currentDate.year, currentDate.monthValue - 1, currentDate.dayOfMonth)
+        val now = LocalDate.now()
+        val startOfSchoolYear = now.schoolYearStart.toTimestamp()
+        val endOfSchoolYear = now.schoolYearEnd.toTimestamp()
 
-        with(datePickerDialog) {
-            setDateRangeLimiter(SchooldaysRangeLimiter())
-            version = DatePickerDialog.Version.VERSION_2
-            scrollOrientation = DatePickerDialog.ScrollOrientation.VERTICAL
-            vibrate(false)
-            show(this@CompletedLessonsFragment.parentFragmentManager, null)
+        val constraintsBuilder = CalendarConstraints.Builder().apply {
+            setValidator(SchoolDaysValidator(startOfSchoolYear, endOfSchoolYear))
+            setStart(startOfSchoolYear)
+            setEnd(endOfSchoolYear)
         }
+        val datePicker =
+            MaterialDatePicker.Builder.datePicker()
+                .setCalendarConstraints(constraintsBuilder.build())
+                .setSelection(currentDate.toTimestamp())
+                .build()
+
+        datePicker.addOnPositiveButtonClickListener {
+            val date = it.toLocalDateTime()
+            presenter.onDateSet(date.year, date.monthValue, date.dayOfMonth)
+        }
+
+        datePicker.show(this@CompletedLessonsFragment.parentFragmentManager, null)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
index 04e2a5cd7..b75b42f8b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -9,6 +9,7 @@ import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.AnalyticsHelper
 import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
@@ -188,7 +189,7 @@ class CompletedLessonsPresenter @Inject constructor(
         view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
             showNextButton(!currentDate.plusDays(1).isHolidays)
-            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalize())
+            updateNavigationDay(currentDate.toFormattedString("EEEE, dd.MM").capitalise())
         }
     }
 }
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 df656c008..45b79b50f 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
@@ -107,13 +107,13 @@ class TimetableWidgetFactory(
 
             val semester = semesterRepository.getCurrentSemester(student)
             timetableRepository.getTimetable(student, semester, date, date, false)
-                .toFirstResult().data?.first.orEmpty()
+                .toFirstResult().data?.lessons.orEmpty()
                 .sortedWith(compareBy({ it.number }, { !it.isStudentPlan }))
                 .filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true }
         }
     } catch (e: Exception) {
         Timber.e(e, "An error has occurred in timetable widget factory")
-        emptyList<Timetable>()
+        emptyList()
     }
 
     @SuppressLint("DefaultLocale")
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 071a2d178..f9079b5f9 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
@@ -27,6 +27,7 @@ import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AnalyticsHelper
+import io.github.wulkanowy.utils.capitalise
 import io.github.wulkanowy.utils.createNameInitialsDrawable
 import io.github.wulkanowy.utils.getCompatColor
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
@@ -34,6 +35,7 @@ import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.nickOrName
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -80,6 +82,7 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
             "timetable_widget_current_theme_$appWidgetId"
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
         GlobalScope.launch {
@@ -180,7 +183,7 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
             setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
             setTextViewText(
                 R.id.timetableWidgetDate,
-                date.toFormattedString("EEEE, dd.MM").capitalize()
+                date.toFormattedString("EEEE, dd.MM").capitalise()
             )
             setTextViewText(
                 R.id.timetableWidgetName,
@@ -230,7 +233,7 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() {
 
     private suspend fun getStudent(studentId: Long, appWidgetId: Int) = try {
         val students = studentRepository.getSavedStudents(false)
-        val student = students.singleOrNull { it -> it.student.id == studentId }?.student
+        val student = students.singleOrNull { it.student.id == studentId }?.student
         when {
             student != null -> student
             studentId != 0L && studentRepository.isCurrentStudentSet() -> {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
index b0b6999eb..933301317 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
@@ -2,23 +2,27 @@ package io.github.wulkanowy.ui.widgets
 
 import android.content.Context
 import android.graphics.Canvas
-import android.view.View
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
 
-class DividerItemDecoration(context: Context) : DividerItemDecoration(context, VERTICAL) {
+class DividerItemDecoration(
+    context: Context,
+    private val showDividerWithFirstItem: Boolean = true
+) : DividerItemDecoration(context, VERTICAL) {
 
     override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
         canvas.save()
         val dividerLeft = parent.paddingLeft
         val dividerRight = parent.width - parent.paddingRight
-        val childCount = parent.childCount
 
-        for (i in 0..childCount - 2) {
-            val child: View = parent.getChildAt(i)
+        for (i in 0..parent.childCount - 2) {
+            if (!showDividerWithFirstItem && i == 0) continue
+
+            val child = parent.getChildAt(i)
             val params = child.layoutParams as RecyclerView.LayoutParams
-            val dividerTop: Int = child.bottom + params.bottomMargin
+            val dividerTop = child.bottom + params.bottomMargin
             val dividerBottom = dividerTop + drawable!!.intrinsicHeight
+
             drawable?.setBounds(dividerLeft, dividerTop, dividerRight, dividerBottom)
             drawable?.draw(canvas)
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/SwipeDisabledViewPager.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/SwipeDisabledViewPager.kt
new file mode 100644
index 000000000..eb5cae4f3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/SwipeDisabledViewPager.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.viewpager.widget.ViewPager
+
+class SwipeDisabledViewPager : ViewPager {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attr: AttributeSet) : super(context, attr)
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouchEvent(ev: MotionEvent) = false
+
+    override fun onInterceptTouchEvent(ev: MotionEvent) = false
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
index f10b00a07..479cc5188 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
@@ -16,10 +16,13 @@ private inline val AttendanceSummary.allPresences: Double
 private inline val AttendanceSummary.allAbsences: Double
     get() = absence.toDouble() + absenceExcused
 
+inline val Attendance.isExcusableOrNotExcused: Boolean
+    get() = excusable || ((absence || lateness) && !excused)
+
 fun AttendanceSummary.calculatePercentage() = calculatePercentage(allPresences, allAbsences)
 
 fun List<AttendanceSummary>.calculatePercentage(): Double {
-    return calculatePercentage(sumByDouble { it.allPresences }, sumByDouble { it.allAbsences })
+    return calculatePercentage(sumOf { it.allPresences }, sumOf { it.allAbsences })
 }
 
 private fun calculatePercentage(presence: Double, absence: Double): Double {
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 92c0ddfc5..cb31389e0 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -6,6 +6,8 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.graphics.Rect
 import android.graphics.Typeface
 import android.net.Uri
@@ -20,6 +22,7 @@ import androidx.core.graphics.ColorUtils
 import androidx.core.graphics.applyCanvas
 import androidx.core.graphics.drawable.RoundedBitmapDrawable
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
+import androidx.core.graphics.drawable.toBitmap
 import io.github.wulkanowy.BuildConfig.APPLICATION_ID
 
 @ColorInt
@@ -43,7 +46,17 @@ fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(thi
 fun Context.getCompatDrawable(@DrawableRes drawableRes: Int) =
     ContextCompat.getDrawable(this, drawableRes)
 
-fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit) {
+fun Context.getCompatDrawable(@DrawableRes drawableRes: Int, @ColorRes colorRes: Int) =
+    getCompatDrawable(drawableRes)?.mutate()?.apply {
+        colorFilter = PorterDuffColorFilter(
+            getCompatColor(colorRes), PorterDuff.Mode.MULTIPLY
+        )
+    }
+
+fun Context.getCompatBitmap(@DrawableRes drawableRes: Int, @ColorRes colorRes: Int) =
+    getCompatDrawable(drawableRes, colorRes)?.toBitmap()
+
+fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit = {}) {
     Intent.parseUri(uri, 0).let {
         if (it.resolveActivity(packageManager) != null) startActivity(it)
         else onActivityNotFound(uri)
@@ -113,7 +126,7 @@ fun Context.createNameInitialsDrawable(
     val firstCharFirstWord = words.getOrNull(0)?.firstOrNull() ?: ""
     val firstCharSecondWord = words.getOrNull(1)?.firstOrNull() ?: ""
 
-    val initials = "$firstCharFirstWord$firstCharSecondWord".toUpperCase()
+    val initials = "$firstCharFirstWord$firstCharSecondWord".uppercase()
 
     val bounds = Rect()
     val dimension = this.dpToPx(64f * scaleFactory).toInt()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
index a49360d7a..210a62090 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt
@@ -1,10 +1,11 @@
 package io.github.wulkanowy.utils
 
 import androidx.fragment.app.Fragment
-import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.account.AccountFragment
 import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsFragment
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
+import io.github.wulkanowy.ui.modules.conference.ConferenceFragment
+import io.github.wulkanowy.ui.modules.dashboard.DashboardFragment
 import io.github.wulkanowy.ui.modules.exam.ExamFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
@@ -14,6 +15,7 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 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.ui.modules.studentinfo.StudentInfoFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
@@ -30,11 +32,13 @@ fun Fragment.toSection(): MainView.Section? {
         is NoteFragment -> MainView.Section.NOTE
         is LuckyNumberFragment -> MainView.Section.LUCKY_NUMBER
         is SettingsFragment -> MainView.Section.SETTINGS
-        is AboutFragment -> MainView.Section.ABOUT
         is SchoolAndTeachersFragment -> MainView.Section.SCHOOL
         is AccountFragment -> MainView.Section.ACCOUNT
         is AccountDetailsFragment -> MainView.Section.ACCOUNT
         is StudentInfoFragment -> MainView.Section.STUDENT_INFO
+        is ConferenceFragment -> MainView.Section.CONFERENCE
+        is SchoolAnnouncementFragment -> MainView.Section.SCHOOL_ANNOUNCEMENT
+        is DashboardFragment -> MainView.Section.DASHBOARD
         else -> null
     }
 }
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 6facb5ef6..820e7f435 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -3,14 +3,17 @@ package io.github.wulkanowy.utils
 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.sdk.scrapper.grades.*
 
-fun List<Grade>.calcAverage(): Double {
+fun List<Grade>.calcAverage(isOptionalArithmeticAverage: Boolean): Double {
+    val isArithmeticAverage = isOptionalArithmeticAverage && !any { it.weightValue != .0 }
     var counter = 0.0
     var denominator = 0.0
 
     forEach {
-        counter += (it.value + it.modifier) * it.weightValue
-        denominator += it.weightValue
+        val weight = if (isArithmeticAverage && isGradeValid(it.entry)) 1.0 else it.weightValue
+        counter += (it.value + it.modifier) * weight
+        denominator += weight
     }
     return if (denominator != 0.0) counter / denominator else 0.0
 }
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 48d46892b..ee18453ff 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,13 @@ 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 io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import timber.log.Timber
+import java.io.InterruptedIOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -18,7 +24,20 @@ class DebugLogTree : Timber.DebugTree() {
     }
 }
 
-private fun Bundle?.checkSavedState() = if (this == null) "(STATE IS NULL)" else "(STATE IS NOT NULL)"
+object ExceptionFilter : Filter {
+
+    override fun isLoggable(priority: Int, tag: String?) = true
+
+    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?) =
+        when (t) {
+            is FeatureDisabledException,
+            is FeatureNotAvailableException,
+            is UnknownHostException,
+            is SocketTimeoutException,
+            is InterruptedIOException -> true
+            else -> false
+        }
+}
 
 class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 
@@ -52,9 +71,15 @@ class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 }
 
 @Singleton
-class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLifecycleCallbacks() {
+class FragmentLifecycleLogger @Inject constructor() :
+    FragmentManager.FragmentLifecycleCallbacks() {
 
-    override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {
+    override fun onFragmentViewCreated(
+        fm: FragmentManager,
+        f: Fragment,
+        v: View,
+        savedInstanceState: Bundle?
+    ) {
         Timber.d("${f::class.java.simpleName} VIEW CREATED ${savedInstanceState.checkSavedState()}")
     }
 
@@ -62,7 +87,11 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
         Timber.d("${f::class.java.simpleName} STOPPED")
     }
 
-    override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
+    override fun onFragmentCreated(
+        fm: FragmentManager,
+        f: Fragment,
+        savedInstanceState: Bundle?
+    ) {
         Timber.d("${f::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}")
     }
 
@@ -78,7 +107,11 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
         Timber.d("${f::class.java.simpleName} DESTROYED")
     }
 
-    override fun onFragmentSaveInstanceState(fm: FragmentManager, f: Fragment, outState: Bundle) {
+    override fun onFragmentSaveInstanceState(
+        fm: FragmentManager,
+        f: Fragment,
+        outState: Bundle
+    ) {
         Timber.d("${f::class.java.simpleName} SAVED INSTANCE STATE")
     }
 
@@ -90,7 +123,11 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
         Timber.d("${f::class.java.simpleName} VIEW DESTROYED")
     }
 
-    override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
+    override fun onFragmentActivityCreated(
+        fm: FragmentManager,
+        f: Fragment,
+        savedInstanceState: Bundle?
+    ) {
         Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${savedInstanceState.checkSavedState()}")
     }
 
@@ -102,3 +139,7 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
         Timber.d("${f::class.java.simpleName} DETACHED")
     }
 }
+
+private fun Bundle?.checkSavedState() =
+    if (this == null) "(STATE IS NULL)" else "(STATE IS NOT NULL)"
+
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
deleted file mode 100644
index e7c51745c..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package io.github.wulkanowy.utils
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.wdullaer.materialdatetimepicker.date.DateRangeLimiter
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.util.Calendar
-
-@Suppress("UNUSED_PARAMETER")
-class SchooldaysRangeLimiter : DateRangeLimiter {
-
-    private val now = LocalDate.now()
-
-    override fun setToNearestDate(day: Calendar): Calendar = day
-
-    override fun isOutOfRange(year: Int, month: Int, day: Int): Boolean {
-        val date = LocalDate.of(year, month + 1, day)
-        val dayOfWeek = date.dayOfWeek
-        return dayOfWeek == DayOfWeek.SUNDAY || date.isHolidays
-    }
-
-    override fun getStartDate(): Calendar {
-        val startYear = if (now.monthValue <= 6) now.year - 1 else now.year
-        val startOfSchoolYear = now.withYear(startYear).firstSchoolDay
-
-        val calendar = Calendar.getInstance()
-        calendar.set(startOfSchoolYear.year, startOfSchoolYear.monthValue - 1, startOfSchoolYear.dayOfMonth)
-        return calendar
-    }
-
-    override fun getEndDate(): Calendar {
-        val endYear = if (now.monthValue > 6) now.year + 1 else now.year
-        val endOfSchoolYear = now.withYear(endYear).lastSchoolDay
-
-        val calendar = Calendar.getInstance()
-        calendar.set(endOfSchoolYear.year, endOfSchoolYear.monthValue - 1, endOfSchoolYear.dayOfMonth)
-        return calendar
-    }
-
-    override fun writeToParcel(parcel: Parcel, flags: Int) {}
-
-    override fun describeContents() = 0
-
-    companion object CREATOR : Parcelable.Creator<SchooldaysRangeLimiter> {
-
-        override fun createFromParcel(parcel: Parcel): SchooldaysRangeLimiter = SchooldaysRangeLimiter()
-
-        override fun newArray(size: Int): Array<SchooldaysRangeLimiter?> = arrayOfNulls(size)
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysValidator.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysValidator.kt
new file mode 100644
index 000000000..00fccfc8d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysValidator.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.utils
+
+import com.google.android.material.datepicker.CalendarConstraints
+import kotlinx.parcelize.Parcelize
+import java.time.DayOfWeek
+import java.time.temporal.ChronoUnit
+
+@Parcelize
+class SchoolDaysValidator(val start: Long, val end: Long) : CalendarConstraints.DateValidator {
+
+    override fun isValid(dateLong: Long): Boolean {
+        val date = dateLong.toLocalDateTime()
+
+        return date.until(end.toLocalDateTime(), ChronoUnit.DAYS) >= 0 &&
+            date.until(start.toLocalDateTime(), ChronoUnit.DAYS) <= 0 &&
+            date.dayOfWeek != DayOfWeek.SUNDAY
+    }
+}
\ No newline at end of file
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 65167fd78..5c888f30a 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt
@@ -1,3 +1,9 @@
 package io.github.wulkanowy.utils
 
-inline fun String?.ifNullOrBlank(defaultValue: () -> String) = if (this.isNullOrBlank()) defaultValue() else this
+inline fun String?.ifNullOrBlank(defaultValue: () -> String) =
+    if (isNullOrBlank()) defaultValue() else this
+
+fun String.capitalise() =
+    replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+
+fun String.decapitalise() = replaceFirstChar { it.lowercase() }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index d80abbd12..94b6a2191 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,43 +1,47 @@
 package io.github.wulkanowy.utils
 
-import android.annotation.SuppressLint
 import java.text.SimpleDateFormat
 import java.time.DayOfWeek.FRIDAY
 import java.time.DayOfWeek.MONDAY
 import java.time.DayOfWeek.SATURDAY
 import java.time.DayOfWeek.SUNDAY
-import java.time.Instant.ofEpochMilli
+import java.time.Instant
 import java.time.LocalDate
 import java.time.LocalDateTime
-import java.time.LocalDateTime.now
-import java.time.LocalDateTime.ofInstant
+import java.time.LocalTime
 import java.time.Month
 import java.time.ZoneId
 import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter.ofPattern
+import java.time.format.DateTimeFormatter
 import java.time.temporal.TemporalAdjusters.firstInMonth
 import java.time.temporal.TemporalAdjusters.next
 import java.time.temporal.TemporalAdjusters.previous
 import java.util.Locale
 
-private const val DATE_PATTERN = "dd.MM.yyyy"
+private const val DEFAULT_DATE_PATTERN = "dd.MM.yyyy"
 
-fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.parse(this, ofPattern(format))
+fun String.toLocalDate(format: String = DEFAULT_DATE_PATTERN): LocalDate =
+    LocalDate.parse(this, DateTimeFormatter.ofPattern(format))
 
-fun LocalDateTime.toTimestamp() = atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
+fun LocalDateTime.toTimestamp() =
+    atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
 
-fun Long.toLocalDateTime(): LocalDateTime = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
+fun Long.toLocalDateTime(): LocalDateTime =
+    LocalDateTime.ofInstant(Instant.ofEpochMilli(this), ZoneId.systemDefault())
 
-fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
+fun LocalDate.toTimestamp() = atTime(LocalTime.now()).toTimestamp()
 
-fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
+fun LocalDate.toFormattedString(pattern: String = DEFAULT_DATE_PATTERN): String =
+    format(DateTimeFormatter.ofPattern(pattern))
+
+fun LocalDateTime.toFormattedString(pattern: String = DEFAULT_DATE_PATTERN): String =
+    format(DateTimeFormatter.ofPattern(pattern))
 
-@SuppressLint("DefaultLocale")
 fun Month.getFormattedName(): String {
     val formatter = SimpleDateFormat("LLLL", Locale.getDefault())
 
-    val date = now().withMonth(value)
-    return formatter.format(date.toInstant(ZoneOffset.UTC).toEpochMilli()).capitalize()
+    val date = LocalDateTime.now().withMonth(value)
+    return formatter.format(date.toInstant(ZoneOffset.UTC).toEpochMilli()).capitalise()
 }
 
 inline val LocalDate.nextSchoolDay: LocalDate
@@ -79,7 +83,7 @@ inline val LocalDate.previousOrSameSchoolDay: LocalDate
     }
 
 inline val LocalDate.weekDayName: String
-    get() = format(ofPattern("EEEE", Locale.getDefault()))
+    get() = format(DateTimeFormatter.ofPattern("EEEE", Locale.getDefault()))
 
 inline val LocalDate.monday: LocalDate
     get() = with(MONDAY)
@@ -105,6 +109,12 @@ inline val LocalDate.lastSchoolDay: LocalDate
     get() = LocalDate.of(year, 6, 20)
         .with(next(FRIDAY))
 
+inline val LocalDate.schoolYearStart: LocalDate
+    get() = withYear(if (this.monthValue <= 6) this.year - 1 else this.year).firstSchoolDay
+
+inline val LocalDate.schoolYearEnd: LocalDate
+    get() = withYear(if (this.monthValue > 6) this.year + 1 else this.year).lastSchoolDay
+
 private fun Int.getSchoolYearByMonth(monthValue: Int): Int {
     return when (monthValue) {
         in 9..12 -> this
diff --git a/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt b/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt
index 264f45426..74ae19326 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.kt
@@ -51,17 +51,16 @@ private val keyStore: KeyStore
 
 private val cipher: Cipher
     get() {
-        return if (SDK_INT >= M) Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding", "AndroidKeyStoreBCWorkaround")
+        return if (SDK_INT >= M) Cipher.getInstance(
+            "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
+            "AndroidKeyStoreBCWorkaround"
+        )
         else Cipher.getInstance("RSA/ECB/PKCS1Padding", "AndroidOpenSSL")
     }
 
 fun encrypt(plainText: String, context: Context): String {
     if (plainText.isEmpty()) throw ScramblerException("Text to be encrypted is empty")
 
-    if (SDK_INT < JELLY_BEAN_MR2) {
-        return String(encode(plainText.toByteArray(KEY_CHARSET), DEFAULT), KEY_CHARSET)
-    }
-
     return try {
         if (!isKeyPairExists) generateKeyPair(context)
 
@@ -90,10 +89,6 @@ fun decrypt(cipherText: String): String {
     if (cipherText.isEmpty()) throw ScramblerException("Text to be encrypted is empty")
 
     return try {
-        if (SDK_INT < JELLY_BEAN_MR2 || cipherText.length < 250) {
-            return String(decode(cipherText.toByteArray(KEY_CHARSET), DEFAULT), KEY_CHARSET)
-        }
-
         if (!isKeyPairExists) throw ScramblerException("KeyPair doesn't exist")
 
         cipher.let {
@@ -105,8 +100,8 @@ fun decrypt(cipherText: String): String {
 
             CipherInputStream(ByteArrayInputStream(decode(cipherText, DEFAULT)), it).let { input ->
                 val values = ArrayList<Byte>()
-                var nextByte = 0
-                while ({ nextByte = input.read(); nextByte }() != -1) {
+                var nextByte: Int
+                while (run { nextByte = input.read(); nextByte } != -1) {
                     values.add(nextByte.toByte())
                 }
                 val bytes = ByteArray(values.size)
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 a6f3f44ef..42fd22292 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,10 @@
-Wersja 1.1.6
+Wersja 1.2.0
 
-- naprawiliśmy błąd przy wysyłaniu wiadomości
-- naprawiliśmy oznaczanie odwołanych lekcji jako zastępstwa
+- dodaliśmy nowy ekran startowy 🎉
+- usprawniliśmy powiadomienia
+- dodaliśmy wersje robocze, filtrowanie oraz informację o odczytaniu przez odbiorcę w wiadomościach
+- dodaliśmy informacje o liczeniu średniej w podsumowaniu ocen
+- dodaliśmy opcję generowania wiadomości z usprawiedliwieniem dni w szkołach pozbawionych funkcji usprawiedliwiania przez zakładkę frekwencja
+- oraz wiele wiele innych ulepszeń i poprawek
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_push.png b/app/src/main/res/drawable-hdpi/ic_stat_all.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_stat_push.png
rename to app/src/main/res/drawable-hdpi/ic_stat_all.png
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_grade.png b/app/src/main/res/drawable-hdpi/ic_stat_grade.png
deleted file mode 100644
index d97efb5d4..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png b/app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png
deleted file mode 100644
index b91c4ae6c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_message.png b/app/src/main/res/drawable-hdpi/ic_stat_message.png
deleted file mode 100644
index ce0fdabcb..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_note.png b/app/src/main/res/drawable-hdpi/ic_stat_note.png
deleted file mode 100644
index 7318c4195..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_timetable.png b/app/src/main/res/drawable-hdpi/ic_stat_timetable.png
deleted file mode 100644
index 21095e296..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_push.png b/app/src/main/res/drawable-mdpi/ic_stat_all.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_stat_push.png
rename to app/src/main/res/drawable-mdpi/ic_stat_all.png
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_grade.png b/app/src/main/res/drawable-mdpi/ic_stat_grade.png
deleted file mode 100644
index c85b2702c..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png b/app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png
deleted file mode 100644
index bfced4eb0..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_message.png b/app/src/main/res/drawable-mdpi/ic_stat_message.png
deleted file mode 100644
index b357b3210..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_note.png b/app/src/main/res/drawable-mdpi/ic_stat_note.png
deleted file mode 100644
index 55a4fbbf4..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png
deleted file mode 100644
index 9147c4090..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-night/ic_all_divider.xml b/app/src/main/res/drawable-night/ic_all_divider.xml
deleted file mode 100644
index cd444a285..000000000
--- a/app/src/main/res/drawable-night/ic_all_divider.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:centerColor="@android:color/transparent"
-        android:centerX="0.01"
-        android:startColor="@color/colorDividerInverse" />
-</shape>
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_push.png b/app/src/main/res/drawable-xhdpi/ic_stat_all.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_stat_push.png
rename to app/src/main/res/drawable-xhdpi/ic_stat_all.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_grade.png b/app/src/main/res/drawable-xhdpi/ic_stat_grade.png
deleted file mode 100644
index c55ca7fdd..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png b/app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png
deleted file mode 100644
index 49e502ac0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_message.png b/app/src/main/res/drawable-xhdpi/ic_stat_message.png
deleted file mode 100644
index 0e67ade37..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_note.png b/app/src/main/res/drawable-xhdpi/ic_stat_note.png
deleted file mode 100644
index ea674a793..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png
deleted file mode 100644
index 96942b5a3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxhdpi/ic_stat_all.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_stat_push.png
rename to app/src/main/res/drawable-xxhdpi/ic_stat_all.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png b/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png
deleted file mode 100644
index eeb6fa41b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_grade.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png b/app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png
deleted file mode 100644
index 9bab13731..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_luckynumber.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_message.png b/app/src/main/res/drawable-xxhdpi/ic_stat_message.png
deleted file mode 100644
index 2e8818242..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_message.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_note.png b/app/src/main/res/drawable-xxhdpi/ic_stat_note.png
deleted file mode 100644
index 174e1509b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_note.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png
deleted file mode 100644
index 510da8d52..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_all.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_stat_push.png
rename to app/src/main/res/drawable-xxxhdpi/ic_stat_all.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png
deleted file mode 100644
index a95cc4f5d..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png and /dev/null differ
diff --git a/app/src/main/res/drawable/background_widget_header_timetable.xml b/app/src/main/res/drawable/background_widget_header_timetable.xml
new file mode 100644
index 000000000..98eec700d
--- /dev/null
+++ b/app/src/main/res/drawable/background_widget_header_timetable.xml
@@ -0,0 +1,7 @@
+<?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
new file mode 100644
index 000000000..616a91279
--- /dev/null
+++ b/app/src/main/res/drawable/background_widget_header_timetable_dark.xml
@@ -0,0 +1,7 @@
+<?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
new file mode 100644
index 000000000..08854fba2
--- /dev/null
+++ b/app/src/main/res/drawable/background_widget_item_timetable.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="@android:color/white" />
+    <corners android:radius="3dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_widget_item_timetable_dark.xml b/app/src/main/res/drawable/background_widget_item_timetable_dark.xml
new file mode 100644
index 000000000..e432a648c
--- /dev/null
+++ b/app/src/main/res/drawable/background_widget_item_timetable_dark.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="@color/colorWidgetTopBar" />
+    <corners android:radius="3dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_widget_timetable.xml b/app/src/main/res/drawable/background_widget_timetable.xml
new file mode 100644
index 000000000..2267587d9
--- /dev/null
+++ b/app/src/main/res/drawable/background_widget_timetable.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="#bbffffff" />
+    <corners android:radius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_widget_timetable_dark.xml b/app/src/main/res/drawable/background_widget_timetable_dark.xml
new file mode 100644
index 000000000..6fe7d0ab2
--- /dev/null
+++ b/app/src/main/res/drawable/background_widget_timetable_dark.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="#BB191919" />
+    <corners android:radius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_about_twitter.xml b/app/src/main/res/drawable/ic_about_twitter.xml
new file mode 100644
index 000000000..7b7cf6d5c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_twitter.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFF" android:pathData="M44.719,10.305C44.425,10 43.97,9.913 43.583,10.091l-0.164,0.075c-0.139,0.064 -0.278,0.128 -0.418,0.191c0.407,-0.649 0.73,-1.343 0.953,-2.061c0.124,-0.396 -0.011,-0.829 -0.339,-1.085s-0.78,-0.283 -1.135,-0.066c-1.573,0.956 -3.059,1.552 -4.676,1.874L37.02,9.152c2.106,1.547 3.48,4.034 3.48,6.848c0,0.127 -0.006,0.26 -0.009,0.389l0.149,-0.12c3.125,-2.604 4.209,-4.732 4.254,-4.821C45.084,11.067 45.014,10.609 44.719,10.305z"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M32,7.5c-4.694,0 -8.5,3.806 -8.5,8.5v1.5C11.308,16.846 8,8.5 8,8.5s-1.5,2 -1.5,5c0,5 4,7 4,7c-3,0 -5,-1 -5,-1s0.5,5.5 7,8l-4,1c0,0 2,3.5 8,5c0,0 -3.5,3 -12,3c0,0 3.5,4 13,4c16.5,0 23,-15.5 23,-24.5C40.5,11.306 36.694,7.5 32,7.5z"
+        android:strokeColor="#FFF" android:strokeLineJoin="round" android:strokeWidth="3"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_divider.xml b/app/src/main/res/drawable/ic_all_divider.xml
index 61e964979..922882c21 100644
--- a/app/src/main/res/drawable/ic_all_divider.xml
+++ b/app/src/main/res/drawable/ic_all_divider.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:centerColor="@android:color/transparent"
-        android:centerX="0.01"
-        android:startColor="@color/colorDivider" />
+    <solid android:color="?colorDivider" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_main_dashboard.xml b/app/src/main/res/drawable/ic_main_dashboard.xml
new file mode 100644
index 000000000..ed2269256
--- /dev/null
+++ b/app/src/main/res/drawable/ic_main_dashboard.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="@android:color/white"
+        android:pathData="M19,5v2h-4L15,5h4M9,5v6L5,11L5,5h4m10,8v6h-4v-6h4M9,17v2L5,19v-2h4M21,3h-8v6h8L21,3zM11,3L3,3v10h8L11,3zM21,11h-8v10h8L21,11zM11,15L3,15v6h8v-6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_conferences.xml b/app/src/main/res/drawable/ic_more_conferences.xml
index 87be8e055..65d6b6e83 100644
--- a/app/src/main/res/drawable/ic_more_conferences.xml
+++ b/app/src/main/res/drawable/ic_more_conferences.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFF"
         android:pathData="M9,13.75c-2.34,0 -7,1.17 -7,3.5L2,19h14v-1.75c0,-2.33 -4.66,-3.5 -7,-3.5zM4.34,17c0.84,-0.58 2.87,-1.25 4.66,-1.25s3.82,0.67 4.66,1.25L4.34,17zM9,12c1.93,0 3.5,-1.57 3.5,-3.5S10.93,5 9,5 5.5,6.57 5.5,8.5 7.07,12 9,12zM9,7c0.83,0 1.5,0.67 1.5,1.5S9.83,10 9,10s-1.5,-0.67 -1.5,-1.5S8.17,7 9,7zM16.04,13.81c1.16,0.84 1.96,1.96 1.96,3.44L18,19h4v-1.75c0,-2.02 -3.5,-3.17 -5.96,-3.44zM15,12c1.93,0 3.5,-1.57 3.5,-3.5S16.93,5 15,5c-0.54,0 -1.04,0.13 -1.5,0.35 0.63,0.89 1,1.98 1,3.15s-0.37,2.26 -1,3.15c0.46,0.22 0.96,0.35 1.5,0.35z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/main/res/drawable/ic_stat_grade.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
rename to app/src/main/res/drawable/ic_stat_grade.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/main/res/drawable/ic_stat_luckynumber.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
rename to app/src/main/res/drawable/ic_stat_luckynumber.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/main/res/drawable/ic_stat_message.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
rename to app/src/main/res/drawable/ic_stat_message.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/main/res/drawable/ic_stat_note.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
rename to app/src/main/res/drawable/ic_stat_note.xml
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_timetable.xml b/app/src/main/res/drawable/ic_stat_timetable.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi-v24/ic_stat_timetable.xml
rename to app/src/main/res/drawable/ic_stat_timetable.xml
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 100644
new mode 100755
index 550260258..849430187
Binary files a/app/src/main/res/drawable/img_timetable_widget_preview.png and b/app/src/main/res/drawable/img_timetable_widget_preview.png differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3841b25cd..e55ea8b95 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -6,11 +6,11 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/loginToolbar"
-        android:background="@android:color/transparent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent" />
 
-    <com.aurelhubert.ahbottomnavigation.AHBottomNavigationViewPager
+    <io.github.wulkanowy.ui.widgets.SwipeDisabledViewPager
         android:id="@+id/loginViewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2ea0a4d39..11844e244 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
-    android:id="@+id/mainContainer"
+    android:id="@+id/main_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/mainToolbar"
+        android:id="@+id/main_toolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:contentInsetStartWithNavigation="0dp" />
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/mainFragmentContainer"
+        android:id="@+id/main_fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?actionBarSize"
-        android:layout_marginBottom="@dimen/bottom_navigation_height" />
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/main_bottom_nav"
+        app:layout_constraintTop_toBottomOf="@id/main_toolbar" />
 
-    <com.aurelhubert.ahbottomnavigation.AHBottomNavigation
-        android:id="@+id/mainBottomNav"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/main_message_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        app:layout_constraintBottom_toTopOf="@id/main_bottom_nav" />
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/main_bottom_nav"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:itemTextAppearanceActive="@style/WulkanowyTheme.TextAppearanceBottomNavigation"
+        app:itemTextAppearanceInactive="@style/WulkanowyTheme.TextAppearanceBottomNavigation"
+        app:labelVisibilityMode="labeled"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_attendance.xml b/app/src/main/res/layout/dialog_attendance.xml
index 22268aac1..08ed9d4a3 100644
--- a/app/src/main/res/layout/dialog_attendance.xml
+++ b/app/src/main/res/layout/dialog_attendance.xml
@@ -1,92 +1,178 @@
 <?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">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        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_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            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:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
-            android:id="@+id/attendanceDialogSubject"
+            android:id="@+id/attendanceDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogSubjectTitle" />
+
 
         <TextView
+            android:id="@+id/attendanceDialogDescriptionTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_description"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogSubjectValue" />
 
         <TextView
-            android:id="@+id/attendanceDialogDescription"
+            android:id="@+id/attendanceDialogDescriptionValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDescriptionTitle" />
 
         <TextView
+            android:id="@+id/attendanceDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_date"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDescriptionValue" />
 
         <TextView
-            android:id="@+id/attendanceDialogDate"
+            android:id="@+id/attendanceDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDateTitle" />
 
         <TextView
+            android:id="@+id/attendanceDialogNumberTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/attendance_number"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogDateValue" />
 
         <TextView
-            android:id="@+id/attendanceDialogNumber"
+            android:id="@+id/attendanceDialogNumberValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogNumberTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/attendanceDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="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_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/attendanceDialogNumberValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index 2d4e5d0ba..a78790bce 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -10,9 +10,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingHorizontal="20dp"
-        android:paddingTop="20dp"
+        android:paddingTop="24dp"
         android:text="@string/all_details"
-        android:textSize="20sp" />
+        android:textSize="21sp"
+        android:textStyle="bold" />
 
     <TextView
         android:id="@+id/errorDialogMessage"
@@ -57,22 +58,32 @@
         </androidx.core.widget.NestedScrollView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@drawable/ic_all_divider" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:gravity="end"
         android:minHeight="52dp"
         android:orientation="horizontal">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogReport"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
+            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/about_feedback" />
 
         <Space
@@ -82,20 +93,34 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCancel"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             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="@android:string/cancel" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCopy"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             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="@android:string/copy" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_exam.xml b/app/src/main/res/layout/dialog_exam.xml
index 8e46dc4f0..51153ac8e 100644
--- a/app/src/main/res/layout/dialog_exam.xml
+++ b/app/src/main/res/layout/dialog_exam.xml
@@ -1,113 +1,208 @@
 <?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">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        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_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/examDialogSubject"
+            android:id="@+id/examDialogSubjectTitle"
             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:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
             android:id="@+id/examDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogSubjectTitle" />
 
         <TextView
-            android:id="@+id/examDialogType"
+            android:id="@+id/examDialogTypeTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/exam_type"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogSubjectValue" />
 
         <TextView
             android:id="@+id/examDialogTypeValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTypeTitle" />
 
         <TextView
-            android:id="@+id/examDialogTeacher"
+            android:id="@+id/examDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTypeValue" />
 
         <TextView
             android:id="@+id/examDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTeacherTitle" />
 
         <TextView
-            android:id="@+id/examDialogDate"
+            android:id="@+id/examDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/exam_entry_date"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogTeacherValue" />
 
         <TextView
             android:id="@+id/examDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDateTitle" />
 
         <TextView
-            android:id="@+id/examDialogDescription"
+            android:id="@+id/examDialogDescriptionTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_description"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDateValue" />
 
         <TextView
             android:id="@+id/examDialogDescriptionValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDescriptionTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/examDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="20dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="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_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/examDialogDescriptionValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index be0570c20..9ed2bc068 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -8,19 +8,20 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minWidth="300dp">
+        android:minWidth="300dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="8dp">
 
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:padding="20dp"
+            android:layout_marginTop="24dp"
             tools:ignore="UselessParent">
 
             <LinearLayout
                 android:id="@+id/gradeDialogValueLayout"
-                android:layout_width="86dp"
-                android:layout_height="match_parent"
+                android:layout_width="101dp"
+                android:layout_height="121dp"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
@@ -31,6 +32,8 @@
                     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:gravity="center"
                     android:textColor="@android:color/white"
@@ -42,7 +45,9 @@
                     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"
@@ -57,15 +62,13 @@
                 android:id="@+id/gradeDialogHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:layout_marginRight="12dp"
+                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:gravity="center_vertical"
-                android:minHeight="120dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -74,101 +77,32 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
                     android:gravity="center_vertical"
-                    android:maxLines="2"
                     android:text="@string/grade_header"
                     android:textIsSelectable="true"
-                    android:textSize="20sp" />
+                    android:textSize="21sp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/gradeDialogDescriptionValue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
                     android:text="@string/all_no_description"
-                    android:textColor="?android:textColorSecondary"
+                    android:layout_marginTop="8dp"
                     android:textIsSelectable="true"
                     android:textSize="16sp" />
             </LinearLayout>
 
             <TextView
-                android:id="@+id/gradeDialogComment"
+                android:id="@+id/gradeDialogDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/gradeDialogHeader"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/grade_comment"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogCommentValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogComment"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/grade_comment"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogTeacher"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogCommentValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/all_teacher"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogTeacherValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogTeacher"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_teacher"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogColor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogTeacherValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/all_color"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogColorValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogColor"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_color"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogColorValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="16dp"
                 android:text="@string/all_date"
-                android:textSize="17sp" />
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp" />
 
             <TextView
                 android:id="@+id/gradeDialogDateValue"
@@ -177,22 +111,102 @@
                 android:layout_below="@+id/gradeDialogDate"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
+                android:layout_marginEnd="24dp"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
                 android:text="@string/all_date"
                 android:textIsSelectable="true"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogComment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogDateValue"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginTop="16dp"
+                android:text="@string/grade_comment"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="12sp" />
 
+            <TextView
+                android:id="@+id/gradeDialogCommentValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogComment"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:text="@string/grade_comment"
+                android:textIsSelectable="true"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogTeacher"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogCommentValue"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginTop="16dp"
+                android:text="@string/all_teacher"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogTeacherValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogTeacher"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:text="@string/all_teacher"
+                android:textIsSelectable="true"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogColor"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogTeacherValue"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginTop="16dp"
+                android:text="@string/all_color"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/gradeDialogColorValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/gradeDialogColor"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:text="@string/all_color"
+                android:textIsSelectable="true"
+                android:textSize="16sp" />
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/gradeDialogClose"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@+id/gradeDialogDateValue"
-                android:layout_alignParentEnd="true"
+                android:layout_height="36dp"
+                android:layout_below="@+id/gradeDialogColorValue"
                 android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginTop="25dp"
+                android:layout_marginTop="36dp"
+                android:layout_marginBottom="8dp"
+                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 7c149d4b0..22a03cb21 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -15,18 +15,32 @@
         tools:itemCount="1"
         tools:listitem="@layout/item_homework_dialog_details" />
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
-        android:paddingHorizontal="10dp"
-        android:paddingVertical="5dp">
+        android:gravity="end"
+        android:minHeight="52dp"
+        android:orientation="horizontal">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogRead"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
+            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:layout_gravity="center_vertical"
             android:layout_alignParentStart="true"
             android:layout_alignParentBottom="true"
             android:text="@string/homework_mark_as_done"
@@ -35,9 +49,18 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
+            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:layout_gravity="center_vertical"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:text="@string/all_close"
diff --git a/app/src/main/res/layout/dialog_lesson_completed.xml b/app/src/main/res/layout/dialog_lesson_completed.xml
index 31ca7dd3b..500cdb6f3 100644
--- a/app/src/main/res/layout/dialog_lesson_completed.xml
+++ b/app/src/main/res/layout/dialog_lesson_completed.xml
@@ -1,145 +1,245 @@
 <?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.timetable.completed.CompletedLessonDialog">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        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_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            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:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
-            android:id="@+id/completedLessonDialogSubject"
+            android:id="@+id/completedLessonDialogSubjectValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogSubjectTitle" />
 
         <TextView
+            android:id="@+id/completedLessonDialogTopicTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_topic"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogSubjectValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogTopic"
+            android:id="@+id/completedLessonDialogTopicValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTopicTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTopicValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogTeacher"
+            android:id="@+id/completedLessonDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTeacherTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogChangesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_changes"
             android:textColor="?colorTimetableChange"
-            android:textSize="17sp" />
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogTeacherValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogChanges"
+            android:id="@+id/completedLessonDialogChangesValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogChangesTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogAbsenceTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_absence"
             android:textColor="?colorPrimary"
-            android:textSize="17sp" />
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogChangesValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogAbsence"
+            android:id="@+id/completedLessonDialogAbsenceValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogAbsenceTitle" />
 
         <TextView
             android:id="@+id/completedLessonDialogResourcesTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/completed_lessons_resources"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogAbsenceValue" />
 
         <TextView
-            android:id="@+id/completedLessonDialogResources"
+            android:id="@+id/completedLessonDialogResourcesValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:autoLink="web"
             android:text="@string/all_no_data"
-            android:textColor="?android:textColorPrimary"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogResourcesTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/completedLessonDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="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_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/completedLessonDialogResourcesValue" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_mobile_device.xml b/app/src/main/res/layout/dialog_mobile_device.xml
index 680f57197..043afb2ad 100644
--- a/app/src/main/res/layout/dialog_mobile_device.xml
+++ b/app/src/main/res/layout/dialog_mobile_device.xml
@@ -1,97 +1,158 @@
 <?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.mobiledevice.token.MobileDeviceTokenDialog">
 
-    <FrameLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:id="@+id/mobileDeviceDialogContent"
-            android:layout_width="match_parent"
+        <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"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/mobile_device_qr"
+            tools:src="@tools:sample/avatars"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogTokenTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/mobile_device_token"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceQr" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogTokenValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_no_data"
+            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/mobileDeviceDialogTokenTitle" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogSymbolTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/mobile_device_symbol"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogTokenValue" />
+        <TextView
+            android:id="@+id/mobileDeviceDialogSymbolValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_no_data"
+            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/mobileDeviceDialogSymbolTitle" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogPinTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/mobile_device_pin"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogSymbolValue" />
+
+        <TextView
+            android:id="@+id/mobileDeviceDialogPinValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_no_data"
+            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/mobileDeviceDialogPinTitle" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/mobileDeviceDialogClose"
+            style="@style/Widget.MaterialComponents.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: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"
+            app:layout_constraintTop_toBottomOf="@+id/mobileDeviceDialogPinValue" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/mobileDeviceDialogContent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:visibility="invisible"
-            tools:visibility="visible">
-
-            <ImageView
-                android:id="@+id/mobileDeviceQr"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="12dp"
-                android:adjustViewBounds="true"
-                android:contentDescription="@string/mobile_device_qr"
-                tools:src="@tools:sample/avatars" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/mobile_device_token"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/mobileDeviceDialogToken"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/mobile_device_symbol"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/mobileDeviceDialogSymbol"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/mobile_device_pin"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/mobileDeviceDialogPin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_data"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/mobileDeviceDialogClose"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginTop="15dp"
-                android:text="@string/all_close" />
-        </LinearLayout>
+            tools:visibility="visible"
+            app:constraint_referenced_ids="mobileDeviceQr,mobileDeviceDialogTokenTitle,mobileDeviceDialogTokenValue,mobileDeviceDialogSymbolTitle,mobileDeviceDialogSymbolValue,mobileDeviceDialogPinTitle,mobileDeviceDialogPinValue,mobileDeviceDialogClose" />
 
         <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/mobileDeviceDialogProgress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:indeterminate="true"
-            tools:visibility="invisible" />
-    </FrameLayout>
+            tools:visibility="invisible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_note.xml b/app/src/main/res/layout/dialog_note.xml
index 71506b01f..57a4ad820 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -1,109 +1,209 @@
 <?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">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        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_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            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:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
 
         <TextView
-            android:id="@+id/noteDialogCategory"
+            android:id="@+id/noteDialogCategoryValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogCategoryTitle" />
 
         <TextView
+            android:id="@+id/noteDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogCategoryValue" />
 
         <TextView
-            android:id="@+id/noteDialogTeacher"
+            android:id="@+id/noteDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogTeacherTitle" />
 
         <TextView
+            android:id="@+id/noteDialogDateTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_date"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogTeacherValue" />
 
         <TextView
-            android:id="@+id/noteDialogDate"
+            android:id="@+id/noteDialogDateValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogDateTitle" />
 
         <TextView
+            android:id="@+id/noteDialogPointsTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/note_points"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogDateValue" />
 
         <TextView
-            android:id="@+id/noteDialogPoints"
+            android:id="@+id/noteDialogPointsValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogPointsTitle" />
 
         <TextView
+            android:id="@+id/noteDialogContentTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_content"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogPointsValue" />
 
         <TextView
-            android:id="@+id/noteDialogContent"
+            android:id="@+id/noteDialogContentValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:lineSpacingMultiplier="1.2"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogContentTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/noteDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="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_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/noteDialogContentValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_timetable.xml b/app/src/main/res/layout/dialog_timetable.xml
index f3d4cf1ce..04a5c0c13 100644
--- a/app/src/main/res/layout/dialog_timetable.xml
+++ b/app/src/main/res/layout/dialog_timetable.xml
@@ -1,167 +1,298 @@
 <?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"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        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_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_details"
-            android:textSize="20sp" />
+            android:textSize="21sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             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:textColor="?colorTimetableChange"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/timetableDialogChanges"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/timetable_lesson"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/timetableDialogSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/timetableDialogSubjectNew"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textColor="?colorTimetableChange"
-            android:textIsSelectable="true"
             android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/allDetailsHeader" />
+
+        <TextView
+            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:textColor="?colorTimetableChange"
+            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/timetableDialogChangesTitle" />
+
+        <TextView
+            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"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogChangesValue" />
+
+        <TextView
+            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: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/timetableDialogLessonTitle" />
+
+        <TextView
+            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:textColor="?colorTimetableChange"
+            android:textIsSelectable="true"
+            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogLessonValue" />
 
         <TextView
             android:id="@+id/timetableDialogTeacherTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/all_teacher"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogLessonNewValue" />
 
         <TextView
-            android:id="@+id/timetableDialogTeacher"
+            android:id="@+id/timetableDialogTeacherValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherTitle" />
 
         <TextView
-            android:id="@+id/timetableDialogTeacherNew"
+            android:id="@+id/timetableDialogTeacherNewValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="12sp"
+            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherValue" />
 
         <TextView
             android:id="@+id/timetableDialogGroupTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_group"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTeacherNewValue" />
 
         <TextView
-            android:id="@+id/timetableDialogGroup"
+            android:id="@+id/timetableDialogGroupValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogGroupTitle" />
 
         <TextView
             android:id="@+id/timetableDialogRoomTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_room"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogGroupValue" />
 
         <TextView
-            android:id="@+id/timetableDialogRoom"
+            android:id="@+id/timetableDialogRoomValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomTitle" />
 
         <TextView
-            android:id="@+id/timetableDialogRoomNew"
+            android:id="@+id/timetableDialogRoomNewValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textColor="?colorTimetableChange"
             android:textIsSelectable="true"
-            android:textSize="12sp"
+            android:textSize="16sp"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomValue" />
 
         <TextView
+            android:id="@+id/timetableDialogTimeTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/timetable_time"
-            android:textSize="17sp" />
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogRoomNewValue" />
 
         <TextView
-            android:id="@+id/timetableDialogTime"
+            android:id="@+id/timetableDialogTimeValue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="24dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="16dp"
             android:text="@string/all_no_data"
             android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTimeTitle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/timetableDialogClose"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
+            android:layout_height="36dp"
+            android:layout_marginTop="36dp"
+            android:layout_marginEnd="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_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/timetableDialogTimeValue" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
new file mode 100644
index 000000000..cf799ecc2
--- /dev/null
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -0,0 +1,82 @@
+<?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="match_parent">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/dashboard_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/dashboard_swipe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/dashboard_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <LinearLayout
+        android:id="@+id/dashboard_error_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables"
+        tools:visibility="visible">
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_error"
+            app:tint="?colorOnBackground"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:id="@+id/dashboard_error_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:padding="8dp"
+            android:text="@string/error_unknown"
+            android:textSize="20sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/dashboard_error_details"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:text="@string/all_details" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/dashboard_error_retry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/all_retry" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
new file mode 100644
index 000000000..2d71d89ca
--- /dev/null
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -0,0 +1,12 @@
+<?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">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/debugRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_debug" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_debug_notifications.xml b/app/src/main/res/layout/fragment_debug_notifications.xml
new file mode 100644
index 000000000..372e10552
--- /dev/null
+++ b/app/src/main/res/layout/fragment_debug_notifications.xml
@@ -0,0 +1,6 @@
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:listitem="@layout/item_debug_notifications" />
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index fb0e138e9..06d1fa5e9 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -81,6 +81,22 @@
                         app:icon="@drawable/ic_about_faq" />
                 </LinearLayout>
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/loginFormRecoverLinkSecond"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginRight="16dp"
+                    android:text="@string/login_recover_button"
+                    app:fontFamily="sans-serif-medium"
+                    app:icon="@drawable/ic_all_about"
+                    app:layout_constraintBottom_toTopOf="@id/loginFormHostLayout"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout"
+                    tools:visibility="visible" />
+
                 <View
                     android:id="@+id/loginFormContactDivider"
                     android:layout_width="match_parent"
@@ -95,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
                 android:layout_marginLeft="32dp"
-                android:layout_marginTop="48dp"
+                android:layout_marginTop="32dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
                 android:gravity="center_horizontal"
@@ -106,7 +122,9 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormContact"
-                app:layout_constraintVertical_chainStyle="packed" />
+                app:layout_constraintVertical_bias="0"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_goneMarginTop="64dp" />
 
 
             <com.google.android.material.textfield.TextInputLayout
@@ -170,7 +188,6 @@
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
                     tools:targetApi="o" />
-
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_logviewer.xml b/app/src/main/res/layout/fragment_logviewer.xml
index 64f9125fb..e03124a43 100644
--- a/app/src/main/res/layout/fragment_logviewer.xml
+++ b/app/src/main/res/layout/fragment_logviewer.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.modules.about.logviewer.LogViewerFragment">
+    tools:context=".ui.modules.debug.logviewer.LogViewerFragment">
 
     <HorizontalScrollView
         android:layout_width="match_parent"
@@ -29,6 +29,6 @@
         android:focusable="true"
         android:text="@string/logviewer_refresh"
         android:tint="?colorOnSecondary"
-        app:srcCompat="@drawable/ic_refresh" />
-
+        app:srcCompat="@drawable/ic_refresh"
+        tools:ignore="ContentDescription" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_mobile_device.xml b/app/src/main/res/layout/fragment_mobile_device.xml
index afe1db8e0..e97bd0c52 100644
--- a/app/src/main/res/layout/fragment_mobile_device.xml
+++ b/app/src/main/res/layout/fragment_mobile_device.xml
@@ -111,5 +111,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:tint="?colorOnSecondary"
-        app:srcCompat="@drawable/ic_all_add" />
+        app:srcCompat="@drawable/ic_all_add"
+        tools:ignore="ContentDescription" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_more.xml b/app/src/main/res/layout/fragment_more.xml
index dbd5470c7..f0b0285f3 100644
--- a/app/src/main/res/layout/fragment_more.xml
+++ b/app/src/main/res/layout/fragment_more.xml
@@ -1,10 +1,12 @@
 <?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">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/moreRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_more" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_school_announcement.xml b/app/src/main/res/layout/fragment_school_announcement.xml
new file mode 100644
index 000000000..800706ce9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_school_announcement.xml
@@ -0,0 +1,106 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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.schoolannouncement.SchoolAnnouncementFragment">
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/directorInformationProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        tools:visibility="invisible" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/directorInformationSwipe"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/directorInformationRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_school_announcement" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <LinearLayout
+        android:id="@+id/directorInformationEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="10dp"
+        android:visibility="gone"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="100dp"
+            android:minHeight="100dp"
+            app:srcCompat="@drawable/ic_all_about"
+            app:tint="?android:attr/textColorPrimary"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/school_announcement_no_items"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/directorInformationError"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables"
+        tools:visibility="invisible">
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_error"
+            app:tint="?colorOnBackground"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:id="@+id/directorInformationErrorMessage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:padding="8dp"
+            android:text="@string/error_unknown"
+            android:textSize="20sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/directorInformationErrorDetails"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:text="@string/all_details" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/directorInformationErrorRetry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/all_retry" />
+        </LinearLayout>
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_student_info.xml b/app/src/main/res/layout/fragment_student_info.xml
index 5970e2fc4..d270da4a0 100644
--- a/app/src/main/res/layout/fragment_student_info.xml
+++ b/app/src/main/res/layout/fragment_student_info.xml
@@ -24,7 +24,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/student_info_recycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_student_info" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index df33b289e..bd37a7663 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -15,7 +15,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:indeterminate="true" />
+            android:indeterminate="true"
+            tools:visibility="gone" />
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/timetableSwipe"
@@ -26,7 +27,8 @@
                 android:id="@+id/timetableRecycler"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:listitem="@layout/item_timetable" />
+                tools:listitem="@layout/item_timetable"
+                tools:visibility="visible" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <LinearLayout
@@ -53,6 +55,18 @@
                 android:gravity="center"
                 android:text="@string/timetable_no_items"
                 android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/timetableEmptyMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:gravity="center"
+                android:lineSpacingMultiplier="1.2"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="16sp"
+                tools:maxLines="4"
+                tools:text="@tools:sample/lorem/random" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index e25b51f69..f30152832 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -52,7 +52,8 @@
             android:layout_height="32dp"
             android:visibility="gone"
             app:srcCompat="@drawable/ic_excuse_waiting"
-            app:tint="?attr/colorOnSurface" />
+            app:tint="?attr/colorOnSurface"
+            tools:ignore="ContentDescription" />
     </LinearLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml
index 155526299..340ea8928 100644
--- a/app/src/main/res/layout/item_attendance_summary.xml
+++ b/app/src/main/res/layout/item_attendance_summary.xml
@@ -37,7 +37,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -62,10 +61,14 @@
             tools:text="50" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -90,10 +93,14 @@
             tools:text="0" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -118,10 +125,14 @@
             tools:text="25" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -146,10 +157,14 @@
             tools:text="0" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -174,10 +189,14 @@
             tools:text="6" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -202,10 +221,14 @@
             tools:text="0" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -229,4 +252,9 @@
             android:textSize="12sp"
             tools:text="0" />
     </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_dashboard_account.xml b/app/src/main/res/layout/item_dashboard_account.xml
new file mode 100644
index 000000000..139157c8b
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_account.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/dashboard_account_item_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/dashboard_account_item_avatar"
+            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"
+            tools:ignore="ContentDescription"
+            tools:src="@tools:sample/avatars" />
+
+        <TextView
+            android:id="@+id/dashboard_account_item_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:textSize="16sp"
+            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_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="16dp"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/dashboard_account_item_avatar"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_account_item_name"
+            tools:text="Szkoła Wulkanowego " />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/dashboard_account_item_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_announcements.xml b/app/src/main/res/layout/item_dashboard_announcements.xml
new file mode 100644
index 000000000..19f720884
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_announcements.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?selectableItemBackground"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/dashboard_announcements_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_announcements_title"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:drawableStartCompat="@drawable/ic_all_about"
+            app:drawableTint="?colorOnSurface"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/dashboard_announcements_item_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_announcements_item_title"
+            app:layout_constraintVertical_bias="0"
+            tools:itemCount="2"
+            tools:listitem="@layout/subitem_dashboard_announcements"
+            tools:visibility="visible" />
+
+        <View
+            android:id="@+id/dashboard_announcements_item_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:background="?colorDivider"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_announcements_item_recycler" />
+
+        <TextView
+            android:id="@+id/dashboard_announcements_item_more"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            tools:visibility="visible"
+            android:fontFamily="sans-serif-medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_announcements_item_divider"
+            tools:text="Jeszcze 5 ogłoszeń więcej" />
+
+        <TextView
+            android:id="@+id/dashboard_announcements_item_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_announcements_no_announcements"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_announcements_item_title"
+            tools:visibility="gone" />
+
+        <TextView
+            android:id="@+id/dashboard_announcements_item_error"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:gravity="center_vertical"
+            android:layout_marginBottom="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_announcements_error"
+            android:textColor="?colorError"
+            android:textSize="14sp"
+            tools:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_error"
+            app:drawableTint="?colorError"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_announcements_item_title" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/dashboard_announcements_item_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            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
diff --git a/app/src/main/res/layout/item_dashboard_conferences.xml b/app/src/main/res/layout/item_dashboard_conferences.xml
new file mode 100644
index 000000000..02d3edfc8
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_conferences.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?selectableItemBackground"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/dashboard_conferences_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_conferences_title"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:drawableStartCompat="@drawable/ic_more_conferences"
+            app:drawableTint="?colorOnSurface"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/dashboard_conferences_item_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_conferences_item_title"
+            app:layout_constraintVertical_bias="0"
+            tools:itemCount="2"
+            tools:listitem="@layout/subitem_dashboard_exams" />
+
+        <View
+            android:id="@+id/dashboard_conferences_item_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:background="?colorDivider"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_conferences_item_recycler" />
+
+        <TextView
+            android:id="@+id/dashboard_conferences_item_more"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:fontFamily="sans-serif-medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_conferences_item_divider"
+            tools:text="Jeszcze 5 zebrań więcej" />
+
+        <TextView
+            android:id="@+id/dashboard_conferences_item_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_conferences_no_conferences"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_conferences_item_title" />
+
+        <TextView
+            android:id="@+id/dashboard_conferences_item_error"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:gravity="center_vertical"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_conferences_error"
+            android:textColor="?colorError"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:layout_constraintHorizontal_bias="0"
+            app:drawableStartCompat="@drawable/ic_error"
+            app:drawableTint="?colorError"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_conferences_item_title" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/dashboard_conferences_item_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            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
diff --git a/app/src/main/res/layout/item_dashboard_exams.xml b/app/src/main/res/layout/item_dashboard_exams.xml
new file mode 100644
index 000000000..9cc98d790
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_exams.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?selectableItemBackground"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/dashboard_exams_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_exams_title"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:drawableStartCompat="@drawable/ic_main_exam"
+            app:drawableTint="?colorOnSurface"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/dashboard_exams_item_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_exams_item_title"
+            app:layout_constraintVertical_bias="0"
+            tools:itemCount="2"
+            tools:listitem="@layout/subitem_dashboard_exams" />
+
+        <View
+            android:id="@+id/dashboard_exams_item_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:background="?colorDivider"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_exams_item_recycler" />
+
+        <TextView
+            android:id="@+id/dashboard_exams_item_more"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:fontFamily="sans-serif-medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_exams_item_divider"
+            tools:text="Jeszcze 5 sprawdzianów więcej" />
+
+        <TextView
+            android:id="@+id/dashboard_exams_item_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_exams_no_exams"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_exams_item_title" />
+
+        <TextView
+            android:id="@+id/dashboard_exams_item_error"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:text="@string/dashboard_exams_error"
+            android:textColor="?colorError"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_error"
+            app:drawableTint="?colorError"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_exams_item_title" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/dashboard_exams_item_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            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
diff --git a/app/src/main/res/layout/item_dashboard_grades.xml b/app/src/main/res/layout/item_dashboard_grades.xml
new file mode 100644
index 000000000..5cc9ce308
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_grades.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    android:foreground="?selectableItemBackground"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/dashboard_grades_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_grade_title"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:drawableStartCompat="@drawable/ic_main_grade"
+            app:drawableTint="?colorOnSurface"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/dashboard_grades_item_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="10dp"
+            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"
+            tools:itemCount="3"
+            tools:listitem="@layout/subitem_dashboard_grades" />
+
+        <TextView
+            android:id="@+id/dashboard_grades_item_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_grade_no_grade"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_grades_item_title" />
+
+        <TextView
+            android:id="@+id/dashboard_grades_item_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:drawablePadding="8dp"
+            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"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_grades_item_title" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/dashboard_grades_item_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            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
diff --git a/app/src/main/res/layout/item_dashboard_homework.xml b/app/src/main/res/layout/item_dashboard_homework.xml
new file mode 100644
index 000000000..975d66efd
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_homework.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?selectableItemBackground"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/dashboard_homework_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_homework_title"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:drawableStartCompat="@drawable/ic_more_homework"
+            app:drawableTint="?colorOnSurface"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/dashboard_homework_item_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_homework_item_title"
+            app:layout_constraintVertical_bias="0"
+            tools:itemCount="5"
+            tools:listitem="@layout/subitem_dashboard_homework" />
+
+        <View
+            android:id="@+id/dashboard_homework_item_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:background="?colorDivider"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_homework_item_recycler" />
+
+        <TextView
+            android:id="@+id/dashboard_homework_item_more"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:fontFamily="sans-serif-medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_homework_item_divider"
+            tools:text="Jeszcze 5 zadań więcej" />
+
+        <TextView
+            android:id="@+id/dashboard_homework_item_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_homework_no_homework"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_homework_item_title" />
+
+        <TextView
+            android:id="@+id/dashboard_homework_item_error"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:gravity="center_vertical"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_homework_error"
+            android:textColor="?colorError"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_error"
+            app:drawableTint="?colorError"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_homework_item_title" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/dashboard_homework_item_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            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
diff --git a/app/src/main/res/layout/item_dashboard_horizontal_group.xml b/app/src/main/res/layout/item_dashboard_horizontal_group.xml
new file mode 100644
index 000000000..bbd8f3517
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_horizontal_group.xml
@@ -0,0 +1,216 @@
+<?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="12dp"
+    android:layout_marginVertical="2dp"
+    android:clipToPadding="false">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/dashboard_horizontal_group_item_lucky_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        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"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/dashboard_horizontal_group_item_lucky_icon"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:src="@drawable/ic_more_lucky_number"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/dashboard_horizontal_group_item_lucky_value"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="?colorOnSurface"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:id="@+id/dashboard_horizontal_group_item_lucky_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="8dp"
+                android:includeFontPadding="false"
+                android:maxLines="1"
+                android:textSize="20sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/dashboard_horizontal_group_item_lucky_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="16" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/dashboard_horizontal_group_item_message_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        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"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginEnd="0dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/dashboard_horizontal_group_item_message_icon"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:src="@drawable/ic_more_messages"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/dashboard_horizontal_group_item_message_value"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="?colorOnSurface"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:id="@+id/dashboard_horizontal_group_item_message_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="8dp"
+                android:includeFontPadding="false"
+                android:textSize="20sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/dashboard_horizontal_group_item_message_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="16" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/dashboard_horizontal_group_item_attendance_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        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"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="0.40">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/dashboard_horizontal_group_item_attendance_icon"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:src="@drawable/ic_main_attendance"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/dashboard_horizontal_group_item_attendance_value"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="?colorOnSurface"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:id="@+id/dashboard_horizontal_group_item_attendance_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="8dp"
+                android:includeFontPadding="false"
+                android:textSize="20sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/dashboard_horizontal_group_item_attendance_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="99,00%" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/dashboard_horizontal_group_item_info_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="4dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="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"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="0.40">
+
+        <TextView
+            android:id="@+id/dashboard_horizontal_group_item_info_error_text"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="8dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:text="@string/dashboard_horizontal_group_error"
+            android:textColor="?colorError"
+            android:textSize="14sp"
+            app:drawableStartCompat="@drawable/ic_error"
+            app:drawableTint="?colorError"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_title"
+            tools:visibility="gone" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/dashboard_horizontal_group_item_info_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:indeterminate="true"
+            app:indicatorSize="28dp" />
+    </com.google.android.material.card.MaterialCardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_lessons.xml b/app/src/main/res/layout/item_dashboard_lessons.xml
new file mode 100644
index 000000000..a2a92c54c
--- /dev/null
+++ b/app/src/main/res/layout/item_dashboard_lessons.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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_marginHorizontal="12dp"
+    android:layout_marginVertical="6dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?selectableItemBackground"
+    app:cardElevation="4dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_timetable_title"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:drawableStartCompat="@drawable/ic_main_timetable"
+            app:drawableTint="?colorOnSurface"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_title_tomorrow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:text="@string/dashboard_timetable_title_tomorrow"
+            android:textColor="?colorOnSurface"
+            android:textSize="14sp"
+            app:layout_constraintBaseline_toBaselineOf="@id/dashboard_lessons_item_title"
+            app:layout_constraintBottom_toBottomOf="@id/dashboard_lessons_item_title"
+            app:layout_constraintStart_toEndOf="@id/dashboard_lessons_item_title" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_first_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="6dp"
+            android:fontFamily="sans-serif-medium"
+            android:textColor="?colorPrimary"
+            android:textSize="13sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_title"
+            tools:text="Teraz:" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_first_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="12dp"
+            android:fontFamily="sans-serif-medium"
+            android:textColor="?colorPrimary"
+            android:textSize="13sp"
+            app:layout_constraintEnd_toStartOf="@id/dashboard_lessons_item_first_time_barrier"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toEndOf="@id/dashboard_lessons_item_first_title"
+            app:layout_constraintTop_toTopOf="@id/dashboard_lessons_item_first_title"
+            tools:text="Matematyka, Sala 28" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/dashboard_lessons_item_first_time_barrier"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="start"
+            app:constraint_referenced_ids="dashboard_lessons_item_first_time, dashboard_lessons_item_first_time_range" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_first_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/background_timetable_time_left"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:paddingBottom="1dp"
+            android:textColor="@android:color/white"
+            android:textSize="13sp"
+            app:backgroundTint="?colorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/dashboard_lessons_item_first_title"
+            tools:text="jeszcze 15 minut" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_first_time_range"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:textSize="13sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/dashboard_lessons_item_first_title"
+            tools:text="10:45 - 11:45"
+            tools:visibility="gone" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_second_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="6dp"
+            android:text="@string/dashboard_timetable_second_lessons_title"
+            android:textSize="13sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_first_value" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_second_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="16dp"
+            android:textSize="13sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/dashboard_lessons_item_second_time"
+            app:layout_constraintStart_toEndOf="@id/dashboard_lessons_item_second_title"
+            app:layout_constraintTop_toTopOf="@id/dashboard_lessons_item_second_title"
+            app:layout_constraintVertical_bias="0"
+            tools:text="Matematyka (28)" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_second_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:textSize="13sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/dashboard_lessons_item_second_title"
+            tools:text="10:45 - 11:45" />
+
+        <View
+            android:id="@+id/dashboard_lessons_item_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="4dp"
+            android:background="?colorDivider"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_second_value" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_third_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_timetable_third_title"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_divider"
+            tools:text="Poźniej" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_third_value"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="12dp"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@id/dashboard_lessons_item_third_time"
+            app:layout_constraintStart_toEndOf="@id/dashboard_lessons_item_third_title"
+            app:layout_constraintTop_toTopOf="@id/dashboard_lessons_item_third_title"
+            tools:text="jeszcze 5 kolejnych lekcji" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_third_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/dashboard_lessons_item_third_title"
+            tools:text="do 15:55" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/dashboard_timetable_no_lessons"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_title" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_day_header"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_title"
+            tools:text="@tools:sample/lorem"
+            tools:visibility="gone" />
+
+        <TextView
+            android:id="@+id/dashboard_lessons_item_error"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:gravity="center_vertical"
+            android:drawablePadding="8dp"
+            android:text="@string/dashboard_timetable_error"
+            android:textColor="?colorError"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_error"
+            app:drawableTint="?colorError"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/dashboard_lessons_item_title" />
+
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/dashboard_lessons_item_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            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
diff --git a/app/src/main/res/layout/item_debug.xml b/app/src/main/res/layout/item_debug.xml
new file mode 100644
index 000000000..f0f9f09fc
--- /dev/null
+++ b/app/src/main/res/layout/item_debug.xml
@@ -0,0 +1,20 @@
+<?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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context=".ui.modules.debug.DebugAdapter">
+
+    <TextView
+        android:id="@+id/debugItemName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:gravity="bottom"
+        android:singleLine="true"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem/random" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_debug_notifications.xml b/app/src/main/res/layout/item_debug_notifications.xml
new file mode 100644
index 000000000..204f70005
--- /dev/null
+++ b/app/src/main/res/layout/item_debug_notifications.xml
@@ -0,0 +1,47 @@
+<?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:paddingVertical="10dp"
+    tools:ignore="HardcodedText">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="5dp"
+        android:text="@string/grade_title"
+        android:textSize="26sp"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Oceny" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="5dp"
+        android:text="1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button_2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="5dp"
+        android:text="3"
+        app:layout_constraintStart_toEndOf="@id/button_1"
+        app:layout_constraintTop_toTopOf="@id/button_1" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button_3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="5dp"
+        android:text="10"
+        app:layout_constraintStart_toEndOf="@id/button_2"
+        app:layout_constraintTop_toTopOf="@id/button_2" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index 85a78571e..30aa6e77b 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -38,7 +38,6 @@
         android:id="@+id/gradeSummaryItemPointsContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -63,10 +62,14 @@
             tools:text="123/150" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -91,10 +94,14 @@
             tools:text="5" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/ic_all_divider"
         android:minHeight="35dp"
         android:orientation="horizontal">
 
@@ -118,4 +125,9 @@
             android:textSize="12sp"
             tools:text="5" />
     </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:background="@drawable/ic_all_divider"
+        android:layout_height="1dp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachment.xml b/app/src/main/res/layout/item_homework_dialog_attachment.xml
index ec0b37f2f..7337cc726 100644
--- a/app/src/main/res/layout/item_homework_dialog_attachment.xml
+++ b/app/src/main/res/layout/item_homework_dialog_attachment.xml
@@ -3,18 +3,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="20dp"
-    android:paddingTop="3dp"
-    android:paddingEnd="10dp"
-    android:paddingBottom="3dp">
+    android:background="?selectableItemBackground">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/homeworkDialogAttachment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="3dp"
+        android:layout_marginBottom="3dp"
+        android:paddingBottom="3dp"
         android:drawablePadding="10dp"
-        android:textSize="12sp"
+        android:textSize="16sp"
         app:drawableStartCompat="@drawable/ic_attachment"
         app:drawableTint="?colorOnBackground"
         tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
index 383cbeaf7..3f3f7bb84 100644
--- a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
+++ b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
@@ -7,8 +7,10 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="3dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/homework_attachments"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 </LinearLayout>
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 3b5705bf8..abc371da8 100644
--- a/app/src/main/res/layout/item_homework_dialog_details.xml
+++ b/app/src/main/res/layout/item_homework_dialog_details.xml
@@ -4,121 +4,162 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="20dp"
-    android:paddingTop="20dp"
-    android:paddingEnd="20dp">
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp">
 
-    <ImageButton
-        android:id="@+id/homework_dialog_full_screen"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="5dp"
-        app:srcCompat="@drawable/ic_fullscreen"
-        app:tint="?colorOnBackground"
-        tools:ignore="ContentDescription" />
+        android:orientation="horizontal" >
 
-    <ImageButton
-        android:id="@+id/homework_dialog_full_screen_exit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:background="?selectableItemBackgroundBorderless"
-        android:padding="5dp"
-        android:visibility="gone"
-        app:srcCompat="@drawable/ic_fullscreen_exit"
-        app:tint="?colorOnBackground"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:text="@string/all_details"
-        android:textSize="20sp" />
+        <TextView
+            android:id="@+id/allDetailsHeader"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="0dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/all_details"
+            android:textSize="21sp"
+            android:textStyle="bold" />
+
+        <ImageButton
+            android:id="@+id/homework_dialog_full_screen"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?selectableItemBackgroundBorderless"
+            android:layout_marginTop="24dp"
+            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:background="?selectableItemBackgroundBorderless"
+            android:layout_marginTop="24dp"
+            android:padding="5dp"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_fullscreen_exit"
+            app:tint="?colorOnBackground"
+            tools:ignore="ContentDescription" />
+
+    </LinearLayout>
 
     <TextView
         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:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_teacher"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_date"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_entry_date"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogEntryDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp" />
+        android:textSize="16sp" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
         android:text="@string/all_content"
-        android:textSize="17sp" />
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp" />
 
     <TextView
         android:id="@+id/homeworkDialogContent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="24dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp"
         android:autoLink="web"
         android:lineSpacingMultiplier="1.2"
         android:text="@string/all_no_data"
         android:textIsSelectable="true"
-        android:textSize="12sp"
+        android:textSize="16sp"
         tools:text="@tools:sample/lorem/random" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_message_chips.xml b/app/src/main/res/layout/item_message_chips.xml
new file mode 100644
index 000000000..481a94835
--- /dev/null
+++ b/app/src/main/res/layout/item_message_chips.xml
@@ -0,0 +1,40 @@
+<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/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_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/chip_unread"
+            style="@style/Widget.MaterialComponents.Chip.Choice"
+            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" />
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/chip_attachments"
+            style="@style/Widget.MaterialComponents.Chip.Choice"
+            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" />
+    </com.google.android.material.chip.ChipGroup>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml
index 83a4406bb..c5dc2fa90 100644
--- a/app/src/main/res/layout/item_message_preview.xml
+++ b/app/src/main/res/layout/item_message_preview.xml
@@ -78,6 +78,17 @@
         app:layout_constraintTop_toBottomOf="@id/messagePreviewToLabel"
         tools:text="@tools:sample/date/ddmmyy" />
 
+    <TextView
+        android:id="@+id/messagePreviewRead"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/messagePreviewDate"
+        tools:text="Read: Yes" />
+
     <TextView
         android:id="@+id/messagePreviewContent"
         android:layout_width="0dp"
@@ -88,6 +99,6 @@
         android:textIsSelectable="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messagePreviewDate"
+        app:layout_constraintTop_toBottomOf="@+id/messagePreviewRead"
         tools:text="@tools:sample/lorem/random" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_school_announcement.xml b/app/src/main/res/layout/item_school_announcement.xml
new file mode 100644
index 000000000..bb0cffd16
--- /dev/null
+++ b/app/src/main/res/layout/item_school_announcement.xml
@@ -0,0 +1,54 @@
+<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/note_subitem_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    tools:context=".ui.modules.schoolannouncement.SchoolAnnouncementAdapter">
+
+    <TextView
+        android:id="@+id/schoolAnnouncementItemDate"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="10dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/date/ddmmyy" />
+
+    <TextView
+        android:id="@+id/schoolAnnouncementItemType"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="@id/schoolAnnouncementItemDate"
+        app:layout_constraintStart_toStartOf="@id/schoolAnnouncementItemDate"
+        app:layout_constraintTop_toBottomOf="@id/schoolAnnouncementItemDate"
+        app:layout_goneMarginEnd="0dp"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/schoolAnnouncementItemContent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="15dp"
+        android:ellipsize="end"
+        android:lineSpacingMultiplier="1.2"
+        android:maxLines="2"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/schoolAnnouncementItemType"
+        app:layout_constraintStart_toStartOf="@id/schoolAnnouncementItemDate"
+        app:layout_constraintTop_toBottomOf="@id/schoolAnnouncementItemType"
+        tools:text="@tools:sample/lorem/random" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_student_info.xml b/app/src/main/res/layout/item_student_info.xml
index 203ce86b2..08eedebca 100644
--- a/app/src/main/res/layout/item_student_info.xml
+++ b/app/src/main/res/layout/item_student_info.xml
@@ -10,32 +10,44 @@
 
     <TextView
         android:id="@+id/student_info_item_title"
-        android:layout_width="match_parent"
-        android:layout_height="28dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="13dp"
         android:layout_marginEnd="16dp"
         android:gravity="bottom"
         android:maxLines="1"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
+        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:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/student_info_item_subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="18dp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:gravity="bottom"
         android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
+        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:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/student_info_item_arrow"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_chevron_right"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_teacher.xml b/app/src/main/res/layout/item_teacher.xml
index a30eb560b..9b94e684b 100644
--- a/app/src/main/res/layout/item_teacher.xml
+++ b/app/src/main/res/layout/item_teacher.xml
@@ -12,37 +12,44 @@
     tools:context=".ui.modules.schoolandteachers.teacher.TeacherAdapter">
 
     <TextView
-        android:id="@+id/teacherItemName"
+        android:id="@+id/teacherItemSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="17sp"
-        tools:text="@tools:sample/full_names" />
-
-    <TextView
-        android:id="@+id/teacherItemShortName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="40dp"
-        android:layout_toEndOf="@+id/teacherItemName"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="17sp"
-        tools:text="[LI]" />
-
-    <TextView
-        android:id="@+id/teacherItemSubject"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/teacherItemName"
-        android:layout_alignStart="@id/teacherItemName"
-        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
         tools:text="11:11-12:00" />
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_below="@+id/teacherItemSubject"
+        android:layout_marginStart="10dp">
+
+        <TextView
+            android:id="@+id/teacherItemName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="16sp"
+            tools:text="@tools:sample/full_names" />
+
+        <TextView
+            android:id="@+id/teacherItemShortName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="40dp"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="16sp"
+            tools:text="[LI]" />
+
+    </LinearLayout>
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index 7a90d5e74..57af6f7ea 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -121,7 +121,7 @@
         app:layout_constraintStart_toEndOf="@+id/timetableItemTeacher"
         app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
         tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/timetableItemTimeBarrier"
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 33f686dac..899d75034 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -6,12 +6,12 @@
     android:layout_height="wrap_content"
     android:minHeight="45dp"
     android:orientation="vertical"
+    android:background="@drawable/background_widget_item_timetable"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
         android:paddingStart="6dp"
         android:paddingLeft="6dp"
         android:paddingTop="6dp"
@@ -126,9 +126,4 @@
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
             tools:visibility="gone" />
     </RelativeLayout>
-
-    <FrameLayout
-        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_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml
index 34535c694..06233244b 100644
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_dark.xml
@@ -6,12 +6,12 @@
     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:background="@color/colorWidgetBackground"
         android:paddingStart="6dp"
         android:paddingTop="6dp"
         android:paddingEnd="12dp"
@@ -111,9 +111,4 @@
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
             tools:visibility="gone" />
     </RelativeLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDividerInverse" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml
index 36a6bbddf..1bf4072dc 100644
--- a/app/src/main/res/layout/item_widget_timetable_small.xml
+++ b/app/src/main/res/layout/item_widget_timetable_small.xml
@@ -91,7 +91,7 @@
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
-    <FrameLayout
+    <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@color/colorDivider" />
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
index a02d85850..50bbbd031 100644
--- a/app/src/main/res/layout/item_widget_timetable_small_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
@@ -90,7 +90,7 @@
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
-    <FrameLayout
+    <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@color/colorDividerInverse" />
diff --git a/app/src/main/res/layout/scrollable_header_grade_summary.xml b/app/src/main/res/layout/scrollable_header_grade_summary.xml
index 2eea20f42..29657ba1a 100644
--- a/app/src/main/res/layout/scrollable_header_grade_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml
@@ -20,6 +20,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:minLines="2"
+            android:textStyle="bold"
             android:text="@string/grade_summary_calculated_average"
             android:textSize="16sp" />
 
@@ -30,6 +31,15 @@
             android:gravity="center_horizontal"
             android:textSize="21sp"
             tools:text="6,00" />
+
+        <TextView
+            android:id="@+id/gradeSummaryScrollableHeaderCalculatedSubjectCount"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center_horizontal"
+            android:textSize="13sp"
+            tools:text="from 8 subjects" />
     </LinearLayout>
 
     <LinearLayout
@@ -43,6 +53,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:minLines="2"
+            android:textStyle="bold"
             android:text="@string/grade_summary_final_average"
             android:textSize="16sp" />
 
@@ -53,5 +64,14 @@
             android:gravity="center_horizontal"
             android:textSize="21sp"
             tools:text="6,00" />
+
+        <TextView
+            android:id="@+id/gradeSummaryScrollableHeaderFinalSubjectCount"
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textSize="13sp"
+            tools:text="from 5 subjects" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/subitem_dashboard_announcements.xml b/app/src/main/res/layout/subitem_dashboard_announcements.xml
new file mode 100644
index 000000000..13c8fa0a4
--- /dev/null
+++ b/app/src/main/res/layout/subitem_dashboard_announcements.xml
@@ -0,0 +1,33 @@
+<?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">
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="24dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@id/dashboard_homework_subitem_time"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Dzień wolny od zajęć dydaktycznych" />
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="12dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="02.11.2020" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subitem_dashboard_conferences.xml b/app/src/main/res/layout/subitem_dashboard_conferences.xml
new file mode 100644
index 000000000..e80809365
--- /dev/null
+++ b/app/src/main/res/layout/subitem_dashboard_conferences.xml
@@ -0,0 +1,32 @@
+<?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">
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="24dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="Spotaknie z rodzicami/opiekunami"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@id/dashboard_homework_subitem_time"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="12dp"
+        android:text="17:00  02.11.2020"
+        android:textSize="13sp"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subitem_dashboard_exams.xml b/app/src/main/res/layout/subitem_dashboard_exams.xml
new file mode 100644
index 000000000..4eb943ce9
--- /dev/null
+++ b/app/src/main/res/layout/subitem_dashboard_exams.xml
@@ -0,0 +1,33 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="24dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        tools:text="Sprawdzian - Matematyka"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@id/dashboard_homework_subitem_time"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="12dp"
+        tools:text="02.11"
+        android:textSize="13sp"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subitem_dashboard_grades.xml b/app/src/main/res/layout/subitem_dashboard_grades.xml
new file mode 100644
index 000000000..61faa6ac2
--- /dev/null
+++ b/app/src/main/res/layout/subitem_dashboard_grades.xml
@@ -0,0 +1,37 @@
+<?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">
+
+    <TextView
+        android:id="@+id/dashboard_grades_subitem_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@id/dashboard_grades_subitem_grade_container"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/dashboard_grades_subitem_grade_container"
+        tools:text="Urządzenia techniki kompu..." />
+
+    <LinearLayout
+        android:id="@+id/dashboard_grades_subitem_grade_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="6dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/dashboard_grades_subitem_title"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include
+            layout="@layout/subitem_dashboard_small_grade"
+            android:visibility="gone"
+            tools:visibility="visible" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subitem_dashboard_homework.xml b/app/src/main/res/layout/subitem_dashboard_homework.xml
new file mode 100644
index 000000000..6e07790b3
--- /dev/null
+++ b/app/src/main/res/layout/subitem_dashboard_homework.xml
@@ -0,0 +1,32 @@
+<?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">
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="24dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@id/dashboard_homework_subitem_time"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Język polski - Zadanie z podręcznika str.107-108" />
+
+    <TextView
+        android:id="@+id/dashboard_homework_subitem_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:textSize="13sp"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="do 18.05" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/subitem_dashboard_small_grade.xml b/app/src/main/res/layout/subitem_dashboard_small_grade.xml
new file mode 100644
index 000000000..986d9602a
--- /dev/null
+++ b/app/src/main/res/layout/subitem_dashboard_small_grade.xml
@@ -0,0 +1,15 @@
+<?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/dashboard_small_grade_subitem_value"
+    android:layout_width="wrap_content"
+    android:layout_height="20dp"
+    android:layout_marginStart="4dp"
+    android:background="@color/grade_material_default"
+    android:gravity="center"
+    android:maxLength="5"
+    android:minWidth="20dp"
+    android:textColor="@android:color/white"
+    android:textSize="12sp"
+    android:textStyle="bold"
+    tools:text="6" />
diff --git a/app/src/main/res/layout/widget_luckynumber_dark.xml b/app/src/main/res/layout/widget_luckynumber_dark.xml
index 77174730c..def110de2 100644
--- a/app/src/main/res/layout/widget_luckynumber_dark.xml
+++ b/app/src/main/res/layout/widget_luckynumber_dark.xml
@@ -21,7 +21,8 @@
         android:src="@drawable/ic_widget_clover"
         android:tint="@android:color/white"
         android:visibility="gone"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        tools:ignore="UseAppTint" />
 
     <TextView
         android:id="@+id/luckyNumberWidgetTitle"
@@ -46,7 +47,8 @@
         android:src="@drawable/ic_widget_clover"
         android:tint="@android:color/white"
         android:visibility="gone"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        tools:ignore="UseAppTint" />
 
     <TextView
         android:id="@+id/luckyNumberWidgetNumber"
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 8a08b5d24..059bb741f 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
+    android:background="@drawable/background_widget_timetable"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:background="@color/colorPrimary">
+        android:background="@drawable/background_widget_header_timetable">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -45,6 +45,7 @@
             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" />
@@ -77,7 +78,12 @@
         android:id="@+id/timetableWidgetList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="56dp"
+        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" />
 
     <TextView
@@ -88,5 +94,6 @@
         android:text="@string/widget_timetable_no_items"
         android:textColor="@android:color/black"
         android:textSize="20sp"
+        android:translationY="28dp"
         tools:visibility="invisible" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
index 5533eaeee..9c8b8c561 100644
--- a/app/src/main/res/layout/widget_timetable_dark.xml
+++ b/app/src/main/res/layout/widget_timetable_dark.xml
@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorWidgetBackground"
+    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="@color/colorWidgetTopBar">
+        android:background="@drawable/background_widget_header_timetable_dark">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -45,6 +45,7 @@
             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" />
@@ -77,7 +78,12 @@
         android:id="@+id/timetableWidgetList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="56dp"
+        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
@@ -88,5 +94,6 @@
         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
new file mode 100644
index 000000000..dbdd6e812
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_dashboard.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/dashboard_menu_tiles"
+        android:icon="@drawable/ic_more_settings"
+        android:orderInCategory="1"
+        android:title="@string/pref_dashboard_appearance_tiles_title"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
index 7abbb10bc..fb938f092 100644
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@@ -45,9 +45,15 @@
         <item>Průměr známek z obou semestrů</item>
         <item>Průměr známek z celého roku</item>
     </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nezobrazovat</item>
-        <item>Zobrazit vše</item>
-        <item>Zobrazit menší</item>
+    <string-array name="dashboard_tile_entries">
+        <item>Šťastné číslo</item>
+        <item>Nepřečtené zprávy</item>
+        <item>Docházka</item>
+        <item>Lekce</item>
+        <item>Známky</item>
+        <item>Domácí úkoly</item>
+        <item>Školní oznámení</item>
+        <item>Zkoušky</item>
+        <item>Setkání</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a2118955a..3b8476551 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -11,6 +11,8 @@
     <string name="more_title">Více</string>
     <string name="about_title">O aplikaci</string>
     <string name="logviewer_title">Prohlížeč protokolů</string>
+    <string name="debug_title">Ladění</string>
+    <string name="notification_debug_title">Ladění oznámení</string>
     <string name="contributors_title">Tvůrci</string>
     <string name="license_title">Licence</string>
     <string name="message_title">Zprávy</string>
@@ -21,6 +23,7 @@
     <string name="account_quick_title">Vyberte účet</string>
     <string name="account_details_title">Podrobnosti účtu</string>
     <string name="student_info_title">Informace o žáku</string>
+    <string name="dashboard_title">Domů</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -36,7 +39,6 @@
     <string name="login_type_hybrid">Hybridní</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">Klíč API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Přihlásit</string>
     <string name="login_invalid_password">Toto heslo je příliš krátké</string>
@@ -62,7 +64,6 @@
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Poslat e-mail</string>
-    <string name="login_email_details">Popište podrobnosti problému:</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_title">Obnovte svůj účet</string>
@@ -81,18 +82,16 @@
     <string name="grade_weight">Váha</string>
     <string name="grade_weight_value">Váha: %s</string>
     <string name="grade_comment">Komentář</string>
-    <string name="grade_no_new_items">Žádné nové známky</string>
     <string name="grade_number_new_items">Počet nových známek: %1$d</string>
     <string name="grade_average">Průměr: %1$.2f</string>
     <string name="grade_points_sum">Body: %s</string>
     <string name="grade_no_average">Bez průměru</string>
-    <string name="grade_predicted">Předpokládaná: %1$s</string>
-    <string name="grade_final">Konečná: %1$s</string>
     <string name="grade_summary_points">Součet bodů</string>
     <string name="grade_summary_final_grade">Konečná známka</string>
     <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_final_average">Konečný průměr</string>
+    <string name="grade_summary_from_subjects">z %1$d z %2$d předmětů</string>
     <string name="grade_menu_summary">Shrnutí</string>
     <string name="grade_menu_statistics">Třída</string>
     <string name="grade_menu_read">Označit jako přečtené</string>
@@ -184,31 +183,41 @@
     <string name="attendance_unknown">Neznámý</string>
     <string name="attendance_number">Číslo lekce</string>
     <string name="attendance_no_items">Žádné položky</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d nepřítomnost</item>
-        <item quantity="few">%1$d nepřítomnosti</item>
-        <item quantity="many">%1$d nepřítomnosti</item>
-        <item quantity="other">%1$d nepřítomnosti</item>
-    </plurals>
     <string name="attendance_excuse_dialog_reason">Důvod nepřítomnosti (volitelný)</string>
     <string name="attendance_excuse_dialog_submit">Poslat</string>
     <string name="attendance_excuse_success">Žádost o omluvu nepřítomnosti byla úspěšně odeslána!</string>
     <string name="attendance_excuse_no_selection">Musíte vybrat alespoň jednu nepřítomnost!</string>
     <string name="attendance_excuse_title">Ospravedlnit</string>
     <!--Attendance summary-->
-    <string name="attendance_summary_final">Docházka</string>
     <string name="attendance_summary_total">Společně</string>
     <!--Exam-->
     <string name="exam_no_items">Tento týden žádné testy</string>
     <string name="exam_type">Typ</string>
     <string name="exam_entry_date">Datum vstupu</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">Nová zkouška</item>
+        <item quantity="few">Nové zkoušky</item>
+        <item quantity="many">Nové zkoušky</item>
+        <item quantity="other">Nové zkoušky</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">Máte %d novou zkoušku</item>
+        <item quantity="few">Máte %d nové zkoušky</item>
+        <item quantity="many">Máte %d nových zkoušek</item>
+        <item quantity="other">Máte %d nových zkoušek</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d zkouška</item>
+        <item quantity="few">%d zkoušky</item>
+        <item quantity="many">%d zkoušek</item>
+        <item quantity="other">%d zkoušek</item>
+    </plurals>
     <!--Message-->
-    <string name="message_inbox">Doručená pošta</string>
+    <string name="message_inbox">Doručené</string>
     <string name="message_sent">Odesláno</string>
     <string name="message_trash">Koš</string>
     <string name="message_no_subject">(žádný předmět)</string>
     <string name="message_no_items">Žádné zprávy</string>
-    <string name="message_preview_error">Při stahování obsahu zprávy došlo k chybě</string>
     <string name="message_from">Od:</string>
     <string name="message_to">Komu:</string>
     <string name="message_date">Datum: %s</string>
@@ -226,6 +235,15 @@
     <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_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>
+    <plurals name="message_read_by">
+        <item quantity="one">Přečtena přes: %1$d z %2$d osob</item>
+        <item quantity="few">Přečtena přes: %1$d z %2$d osob</item>
+        <item quantity="many">Přečtena přes: %1$d z %2$d osob</item>
+        <item quantity="other">Přečtena přes: %1$d z %2$d osob</item>
+    </plurals>
     <plurals name="message_number_item">
         <item quantity="one">%d zpráva</item>
         <item quantity="few">%d zprávy</item>
@@ -238,6 +256,8 @@
         <item quantity="many">Nové zprávy</item>
         <item quantity="other">Nové zprávy</item>
     </plurals>
+    <string name="message_restore_dialog">Chcete obnovit koncept zprávy?</string>
+    <string name="message_restore_dialog_with_recipients">Chcete obnovit koncept zprávy s příjemci: %s?</string>
     <plurals name="message_notify_new_items">
         <item quantity="one">Máte %1$d novou zprávu</item>
         <item quantity="few">Máte %1$d nové zprávy</item>
@@ -308,12 +328,30 @@
     <string name="homework_mark_as_done">Označit jako hotové</string>
     <string name="homework_mark_as_undone">Neudělané</string>
     <string name="homework_attachments">Přílohy</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">Nový domácí úkol</item>
+        <item quantity="few">Nové domácí úkoly</item>
+        <item quantity="many">Nové domácí úkoly</item>
+        <item quantity="other">Nové domácí úkoly</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">Máte %d nový domácí úkol</item>
+        <item quantity="few">Máte %d nové domácí úkoly</item>
+        <item quantity="many">Máte %d nových domácích úkolů</item>
+        <item quantity="other">Máte %d nových domácích úkolů</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d domácí úkol</item>
+        <item quantity="few">%d domácí úkoly</item>
+        <item quantity="many">%d domácích úkolů</item>
+        <item quantity="other">%d domácích úkolů</item>
+    </plurals>
     <!--Lucky number-->
     <string name="lucky_number_title">Šťastné číslo</string>
     <string name="lucky_number_header">Dnešní šťastné číslo je</string>
     <string name="lucky_number_empty">Žádné informace o šťastném čísle</string>
     <string name="lucky_number_notify_new_item_title">Šťastné číslo pro dnešek</string>
-    <string name="lucky_number_notify_new_item">Dnes je šťastným číslem: %d</string>
+    <string name="lucky_number_notify_new_item">Dnešní šťastné číslo je: %s</string>
     <string name="lucky_number_history_button">Zobrazit historii</string>
     <!--Lucky number history-->
     <string name="lucky_number_history_title">Historie šťastných čísel</string>
@@ -346,6 +384,45 @@
     <!--Conference-->
     <string name="conferences_title">Setkání</string>
     <string name="conference_no_items">Žádné informace o setkáních</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d setkání</item>
+        <item quantity="few">%d setkání</item>
+        <item quantity="many">%d setkání</item>
+        <item quantity="other">%d setkání</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">Nové setkání</item>
+        <item quantity="few">Nová setkání</item>
+        <item quantity="many">Nová setkání</item>
+        <item quantity="other">Nová setkání</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">Máte %1$d nové setkání</item>
+        <item quantity="few">Máte %1$d nové setkání</item>
+        <item quantity="many">Máte %1$d nových setkání</item>
+        <item quantity="other">Máte %1$d nových setkání</item>
+    </plurals>
+    <!--Director information-->
+    <string name="school_announcement_title">Školní oznámení</string>
+    <string name="school_announcement_no_items">Žádná školní oznámení</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d školní oznámení</item>
+        <item quantity="few">%d školní oznámení</item>
+        <item quantity="many">%d školní oznámení</item>
+        <item quantity="other">%d školní oznámení</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">Nové školní oznámení</item>
+        <item quantity="few">Nová školní oznámení</item>
+        <item quantity="many">Nová školní oznámení</item>
+        <item quantity="other">Nová školní oznámení</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">Máte %1$d nové školní oznámení</item>
+        <item quantity="few">Máte %1$d nové školní oznámení</item>
+        <item quantity="many">Máte %1$d nových školních oznámení</item>
+        <item quantity="other">Máte %1$d nových školních oznámení</item>
+    </plurals>
     <!--Account-->
     <string name="account_add_new">Přidat účet</string>
     <string name="account_logout">Odhlásit</string>
@@ -353,8 +430,6 @@
     <string name="account_logout_student">Odhlášení žáků</string>
     <string name="account_type_student">Žákův účet</string>
     <string name="account_type_parent">Rodičovský účet</string>
-    <string name="account_login_mobile_api">Režim Mobilního API</string>
-    <string name="account_login_hybrid">Hybridní režim</string>
     <string name="account_details_edit">Upravit data</string>
     <string name="account_quick_manager">Manažer účtů</string>
     <string name="account_select_student">Vyberte žáka</string>
@@ -373,9 +448,13 @@
     <string name="about_discord">Server Discord</string>
     <string name="about_discord_summary">Připojte se ke komunitě Wulkanového</string>
     <string name="about_facebook">Facebooková fanpage</string>
+    <string name="about_twitter">Twitter stránka</string>
+    <string name="about_twitter_summary">Sledujte nás na Twitteru</string>
     <string name="about_facebook_summary">Stejně jako naše facebooková fanpage</string>
     <string name="about_privacy">Zásady ochrany osobních údajů</string>
     <string name="about_privacy_summary">Pravidla pro shromažďování osobních údajů</string>
+    <string name="about_system">Systemová nastavení</string>
+    <string name="about_system_summary">Otevřít systémová nastavení</string>
     <string name="about_homepage">Domovská stránka</string>
     <string name="about_homepage_summary">Navštivte stránku a pomozte s vývojem aplikace</string>
     <string name="about_licenses">Licence</string>
@@ -406,6 +485,7 @@
     <string name="student_info_male">Muž</string>
     <string name="student_info_female">Žena</string>
     <string name="student_info_last_name">Příjmení</string>
+    <string name="student_info_guardian">Opatrovník</string>
     <!--Account edit-->
     <string name="account_edit_nick_hint">Přezdívka</string>
     <string name="account_edit_header">Přidat přezdívku</string>
@@ -413,6 +493,80 @@
     <!--Log viewer-->
     <string name="logviewer_share">Sdílet protokoly</string>
     <string name="logviewer_refresh">Obnovit</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lekce</string>
+    <string name="dashboard_timetable_title_tomorrow">(Zítra)</string>
+    <string name="dashboard_timetable_lesson_value">%1$s (%2$s)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">Za chvíli:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Brzy:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">První:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Teď:</string>
+    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
+        <item quantity="one">za %1$d minutu</item>
+        <item quantity="few">za %1$d minuty</item>
+        <item quantity="many">za %1$d minut</item>
+        <item quantity="other">za %1$d minut</item>
+    </plurals>
+    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
+        <item quantity="one">ještě %1$d minutu</item>
+        <item quantity="few">ještě %1$d minuty</item>
+        <item quantity="many">ještě %1$d minut</item>
+        <item quantity="other">ještě %1$d minut</item>
+    </plurals>
+    <string name="dashboard_timetable_second_lesson_value_end">Konec lekcí</string>
+    <string name="dashboard_timetable_second_lessons_title">Další:</string>
+    <string name="dashboard_timetable_third_title">Později:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">ještě %1$d další lekce</item>
+        <item quantity="few">ještě %1$d další lekce</item>
+        <item quantity="many">ještě %1$d dalších lekcí</item>
+        <item quantity="other">ještě %1$d dalších lekcí</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">do %1$s</string>
+    <string name="dashboard_timetable_no_lessons">Žádné nadcházející lekce</string>
+    <string name="dashboard_timetable_error">Při načítání lekcí došlo k chybě</string>
+    <string name="dashboard_homework_title">Domácí úkoly</string>
+    <string name="dashboard_homework_no_homework">Žádné domácí úkoly do vykonána</string>
+    <string name="dashboard_homework_error">Při načítání domácích úkolů došlo k chybě</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">Ještě %1$d další domácí úkol</item>
+        <item quantity="few">Ještě %1$d další domácí úkoly</item>
+        <item quantity="many">Ještě %1$d dalších domácích úkolů</item>
+        <item quantity="other">Ještě %1$d dalších domácích úkolů</item>
+    </plurals>
+    <string name="dashboard_homework_time">do %1$s</string>
+    <string name="dashboard_grade_title">Poslední známky</string>
+    <string name="dashboard_grade_no_grade">Žádné nové známky</string>
+    <string name="dashboard_grade_error">Při načítání známek došlo k chybě</string>
+    <string name="dashboard_announcements_title">Školní oznámení</string>
+    <string name="dashboard_announcements_no_announcements">Žádná aktuální oznámení</string>
+    <string name="dashboard_announcements_error">Při načítání oznámení došlo k chybě</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">Ještě %1$d další oznámení</item>
+        <item quantity="few">Ještě %1$d další oznámení</item>
+        <item quantity="many">Ještě %1$d dalších oznámení</item>
+        <item quantity="other">Ještě %1$d dalších oznámení</item>
+    </plurals>
+    <string name="dashboard_exams_title">Zkoušky</string>
+    <string name="dashboard_exams_no_exams">Žádné nadcházející zkoušky</string>
+    <string name="dashboard_exams_error">Při načítání zkoušek došlo k chybě</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">Ještě %1$d další zkouška</item>
+        <item quantity="few">Ještě %1$d další zkoušky</item>
+        <item quantity="many">Ještě %1$d dalších zkoušek</item>
+        <item quantity="other">Ještě %1$d dalších zkoušek</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Setkání</string>
+    <string name="dashboard_conferences_no_conferences">Žádná nadcházející setkání</string>
+    <string name="dashboard_conferences_error">Při načítání setkání došlo k chybě</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">Ještě %1$d další setkání</item>
+        <item quantity="few">Ještě %1$d další setkání</item>
+        <item quantity="many">Ještě %1$d dalších setkání</item>
+        <item quantity="other">Ještě %1$d dalších setkání</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">Při načítání dat došlo k chybě</string>
+    <string name="dashboard_horizontal_group_no_lukcy_number">Žádné</string>
     <!--Error dialog-->
     <string name="dialog_error_check_update">Zkontrolovat aktualizace</string>
     <string name="dialog_error_check_update_message">Před hlášením chyby zkontrolujte, zda je k dispozici aktualizace s opravou chyb</string>
@@ -454,7 +608,6 @@
     <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_grade_statistics_list">Zobrazit seznam grafů v známkách třídy</string>
-    <string name="pref_view_timetable_show_whole_class">Zobrazit lekce pro celou třídu</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>
     <string name="pref_view_grade_sorting_mode">Třídění předmětů</string>
@@ -462,6 +615,7 @@
     <string name="pref_notify_header">Upozornění</string>
     <string name="pref_notify_switch">Zobrazit upozornění</string>
     <string name="pref_notify_upcoming_lessons_switch">Zobrazit upozornění o nadcházející lekci</string>
+    <string name="pref_notify_open_system_settings">Otevřít systémová nastavení upozornění</string>
     <string name="pref_notify_fix_sync_issues">Opravte problémy se synchronizací a upozorněním</string>
     <string name="pref_notify_fix_sync_issues_message">Vaše zařízení může mít problémy se synchronizací dat as upozorněními.\n\nChcete-li je opravit, přidejte Wulkanového do funkce Autostart a vypněte optimalizaci/úsporu baterie v nastavení systému telefonu.</string>
     <string name="pref_notify_fix_sync_issues_settings_button">Přejít do nastavení</string>
@@ -476,14 +630,18 @@
     <string name="pref_services_message_sync_success">Synchronizováno!</string>
     <string name="pref_services_message_sync_failed">Synchronizace selhala</string>
     <string name="pref_services_sync_in_progress">Probíhá synchronizace</string>
+    <string name="pref_services_last_full_sync_date">Poslední úplná synchronizace: %s</string>
     <string name="pref_other_grade_modifier_plus">Hodnota plusu</string>
     <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_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhled a chování</string>
     <string name="pref_settings_notifications_title">Upozornění</string>
     <string name="pref_settings_sync_title">Synchronizace</string>
     <string name="pref_grades_appearance_header">Známky</string>
+    <string name="pref_dashboard_appearance_header">Domů</string>
+    <string name="pref_dashboard_appearance_tiles_title">Viditelnost dlaždic</string>
     <string name="pref_attendance_appearance_view">Docházka</string>
     <string name="pref_timetable_appearance_view">Plán lekce</string>
     <string name="pref_grades_advanced_header">Známky</string>
@@ -498,28 +656,28 @@
     <string name="pref_advanced_category">Pokročilé</string>
     <string name="pref_about_category_summary">Verze aplikace, tvůrci, sociální portály, licence</string>
     <!--Notification Channels-->
-    <string name="channel_new_entries">Nové položky v deníku</string>
     <string name="channel_new_grades">Nové známky</string>
+    <string name="channel_new_homework">Nové domácí úkoly</string>
+    <string name="channel_new_conference">Nová setkání</string>
+    <string name="channel_new_exam">Nové zkoušky</string>
     <string name="channel_lucky_number">Šťastné číslo</string>
     <string name="channel_new_message">Nové zprávy</string>
     <string name="channel_new_notes">Nové poznámky</string>
+    <string name="channel_new_school_announcement">Nové školní oznámení</string>
     <string name="channel_push">Push upozornění</string>
     <string name="channel_upcoming_lessons">Nadcházející lekce</string>
     <string name="channel_debug">Ladění</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Konec podpory</string>
-    <string name="drop_kitkat_content">Ukončujeme podporu pro vaše zařízení. V Wulkanovým už pro něj nebudou žádné nové funkce. Kritické opravy však budeme vydávat až do konce roku 2021, abyste měli čas přejít na novější model</string>
-    <string name="drop_kitkat_again">Nezobrazovat znovu</string>
     <!--Colors-->
-    <string name="all_black">Černý</string>
-    <string name="all_red">Červený</string>
-    <string name="all_blue">Modrý</string>
-    <string name="all_green">Zelený</string>
-    <string name="all_purple">Fialový</string>
+    <string name="all_black">Černá</string>
+    <string name="all_red">Červená</string>
+    <string name="all_blue">Modrá</string>
+    <string name="all_green">Zelená</string>
+    <string name="all_purple">Fialová</string>
     <string name="all_empty_color">Žádná barva</string>
     <!--Others-->
     <string name="all_copied">Zkopírováno</string>
     <string name="all_undo">Vrátit</string>
+    <string name="all_change">Změnit</string>
     <!--Update helper-->
     <string name="update_download_started">Stahování aktualizací začalo…</string>
     <string name="update_download_success">Aktualizace byla stažena.</string>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index f578ff11f..1e0df8dea 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -45,9 +45,15 @@
         <item>Durchschnitt der Noten aus beiden Semestern</item>
         <item>Durchschnitt der Noten aus dem ganzen Jahr</item>
     </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nicht zeigen</item>
-        <item>Alle zeigen</item>
-        <item>Zeigen die reduzierte</item>
+    <string-array name="dashboard_tile_entries">
+        <item>Glückszahl</item>
+        <item>Ungelesene Nachrichten</item>
+        <item>Schulbesuch</item>
+        <item>Lektionen</item>
+        <item>Noten</item>
+        <item>Hausaufgaben</item>
+        <item>Schulankündigungen</item>
+        <item>Prüfungen</item>
+        <item>Sitzungen</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2880996a8..29d5c7636 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -11,6 +11,8 @@
     <string name="more_title">Mehr</string>
     <string name="about_title">Über die Applikation</string>
     <string name="logviewer_title">Log Viewer</string>
+    <string name="debug_title">Debuggen</string>
+    <string name="notification_debug_title">Benachrichtigungen debuggen</string>
     <string name="contributors_title">Mitarbeiter</string>
     <string name="license_title">Lizenzen</string>
     <string name="message_title">Nachrichten</string>
@@ -21,6 +23,7 @@
     <string name="account_quick_title">Konto auswählen</string>
     <string name="account_details_title">Kontodetails</string>
     <string name="student_info_title">Schülerinfo</string>
+    <string name="dashboard_title">Übersicht</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -36,7 +39,6 @@
     <string name="login_type_hybrid">Hybride</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">API Schlüssel</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Anmelden</string>
     <string name="login_invalid_password">Passwort ist zu kurz</string>
@@ -62,7 +64,6 @@
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">email senden</string>
-    <string name="login_email_details">Beschreiben Sie die Details des Problems:</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_title">Ihr Konto wiederherstellen</string>
@@ -81,18 +82,16 @@
     <string name="grade_weight">Gewichtung</string>
     <string name="grade_weight_value">Gewichtung: %s</string>
     <string name="grade_comment">Kommentar</string>
-    <string name="grade_no_new_items">Keine neuen Noten</string>
     <string name="grade_number_new_items">Anzahl der neuen Bewertungen: %1$d</string>
     <string name="grade_average">Durchschnitt: %1$.2f</string>
     <string name="grade_points_sum">Punkte: %s</string>
     <string name="grade_no_average">Kein Durchschnitt</string>
-    <string name="grade_predicted">Vorausgesagt: %1$s</string>
-    <string name="grade_final">Finale: %1$s</string>
     <string name="grade_summary_points">Gesamtpunkte</string>
     <string name="grade_summary_final_grade">Finaler Note</string>
     <string name="grade_summary_predicted_grade">Vorhergesagte Note</string>
     <string name="grade_summary_calculated_average">Berechnender Durchschnitt</string>
     <string name="grade_summary_final_average">Finaler Durchschnitt</string>
+    <string name="grade_summary_from_subjects">aus %1$d von %2$d Schulfächern</string>
     <string name="grade_menu_summary">Zusammenfassung</string>
     <string name="grade_menu_statistics">Klasse</string>
     <string name="grade_menu_read">Als gelesen markieren</string>
@@ -170,29 +169,35 @@
     <string name="attendance_unknown">Unbekannt</string>
     <string name="attendance_number">Lektion Nummer</string>
     <string name="attendance_no_items">Keine Einträgen</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d abwesenheit</item>
-        <item quantity="other">%1$d Abwesenheiten</item>
-    </plurals>
     <string name="attendance_excuse_dialog_reason">Abwesenheitsgrund (optional)</string>
     <string name="attendance_excuse_dialog_submit">Senden</string>
     <string name="attendance_excuse_success">Abwesenheitsentschuldigungsanfrage erfolgreich gesendet!</string>
     <string name="attendance_excuse_no_selection">Sie müssen mindestens eine Abwesenheit auswählen!</string>
     <string name="attendance_excuse_title">Verzeihung</string>
     <!--Attendance summary-->
-    <string name="attendance_summary_final">Schulbesuch</string>
     <string name="attendance_summary_total">Gesamt</string>
     <!--Exam-->
     <string name="exam_no_items">Diese Woche keine Prüfungen</string>
     <string name="exam_type">Form</string>
     <string name="exam_entry_date">Eintrittsdatum</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">Neue prüfung</item>
+        <item quantity="other">Neue prüfungen</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">Du hast %d neue Prüfung erhalten</item>
+        <item quantity="other">Sie haben %d neue Prüfungen erhalten</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d prüfung</item>
+        <item quantity="other">%d prüfungen</item>
+    </plurals>
     <!--Message-->
     <string name="message_inbox">Posteingang</string>
     <string name="message_sent">Gesendet</string>
     <string name="message_trash">Korb</string>
     <string name="message_no_subject">(kein Thema)</string>
     <string name="message_no_items">Keine Nachrichten</string>
-    <string name="message_preview_error">Beim Herunterladen des Nachrichteninhalts ist ein Fehler aufgetreten</string>
     <string name="message_from">Von:</string>
     <string name="message_to">An:</string>
     <string name="message_date">Datum: %s</string>
@@ -210,6 +215,13 @@
     <string name="message_not_exists">Nachricht existiert nicht</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_only_unread">Nur ungelesen</string>
+    <string name="message_chip_only_with_attachments">Nur mit Anhängen</string>
+    <string name="message_read">Lesen: %s</string>
+    <plurals name="message_read_by">
+        <item quantity="one">Lesen von: %1$d von %2$d Personen</item>
+        <item quantity="other">Lesen von: %1$d von %2$d Personen</item>
+    </plurals>
     <plurals name="message_number_item">
         <item quantity="one">%d nachricht</item>
         <item quantity="other">%d nachrichten</item>
@@ -218,6 +230,8 @@
         <item quantity="one">Neu nachricht</item>
         <item quantity="other">Neue nachrichten</item>
     </plurals>
+    <string name="message_restore_dialog">Möchten Sie den Entwurf der Nachricht wiederherstellen?</string>
+    <string name="message_restore_dialog_with_recipients">Möchten Sie die Entwurfsnachricht mit den Empfängern wiederherstellen: %s?</string>
     <plurals name="message_notify_new_items">
         <item quantity="one">Du hast %1$d nachricht bekommen</item>
         <item quantity="other">Du hast %1$d nachrichten bekommen</item>
@@ -268,12 +282,24 @@
     <string name="homework_mark_as_done">Gemacht</string>
     <string name="homework_mark_as_undone">Unvollständig</string>
     <string name="homework_attachments">Anhänge</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">Neue hausaufgaben</item>
+        <item quantity="other">Neue hausaufgaben</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">Du hast %d neue Hausaufgaben erhalten</item>
+        <item quantity="other">Du hast %d neue Hausaufgaben erhalten</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d hausaufgaben</item>
+        <item quantity="other">%d hausaufgaben</item>
+    </plurals>
     <!--Lucky number-->
     <string name="lucky_number_title">Glückliche Nummer</string>
     <string name="lucky_number_header">Die heutige Glücksnummer ist </string>
     <string name="lucky_number_empty">Keine Information über die Glücksnummer.</string>
     <string name="lucky_number_notify_new_item_title">Glücksnummer für heute</string>
-    <string name="lucky_number_notify_new_item">Die heutige Glücksnummer ist: %d</string>
+    <string name="lucky_number_notify_new_item">Heutige Glückszahl ist: %s</string>
     <string name="lucky_number_history_button">Verlauf anzeigen</string>
     <!--Lucky number history-->
     <string name="lucky_number_history_title">Glücksnummerverlauf</string>
@@ -306,6 +332,33 @@
     <!--Conference-->
     <string name="conferences_title">Sitzungen</string>
     <string name="conference_no_items">Keine Informationen über Sitzungen</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d konferenz</item>
+        <item quantity="other">%d konferenzen</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">Neue konferenz</item>
+        <item quantity="other">Neue konferenzen</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">Sie haben %1$d neue konferenz</item>
+        <item quantity="other">Sie haben %1$d neue konferenzen</item>
+    </plurals>
+    <!--Director information-->
+    <string name="school_announcement_title">Schulankündigungen</string>
+    <string name="school_announcement_no_items">Keine schulankündigungen</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d schulankündigung</item>
+        <item quantity="other">%d schulankündigungen</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">Ankündigung der neuen schule</item>
+        <item quantity="other">Neue schulankündigungen</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">Sie haben %1$d neue schulmitteilungen</item>
+        <item quantity="other">Sie haben %1$d neue schulankündigungen</item>
+    </plurals>
     <!--Account-->
     <string name="account_add_new">Konto hinzufügen</string>
     <string name="account_logout">Abmelden</string>
@@ -313,8 +366,6 @@
     <string name="account_logout_student">Abmeldung von Student</string>
     <string name="account_type_student">Studentenkonto</string>
     <string name="account_type_parent">Elternkonto</string>
-    <string name="account_login_mobile_api">Mobiler API Modus</string>
-    <string name="account_login_hybrid">Hybrid Modus</string>
     <string name="account_details_edit">Daten bearbeiten</string>
     <string name="account_quick_manager">Konten-Manager</string>
     <string name="account_select_student">Schüler auswählen</string>
@@ -333,9 +384,13 @@
     <string name="about_discord">Discord server</string>
     <string name="about_discord_summary">Treten Sie der Wulkanowy-Gemeinschaft bei</string>
     <string name="about_facebook">Facebook fanpage</string>
+    <string name="about_twitter">Twitter-Seite</string>
+    <string name="about_twitter_summary">Folgen Sie uns bei Twitter</string>
     <string name="about_facebook_summary">Gefällt unsere Facebook-Fanpage</string>
     <string name="about_privacy">Datenschutzerklärung</string>
     <string name="about_privacy_summary">Regeln für die Sammlung persönlicher Daten</string>
+    <string name="about_system">Systemeinstellungen</string>
+    <string name="about_system_summary">Systemeinstellungen öffnen</string>
     <string name="about_homepage">Startseite</string>
     <string name="about_homepage_summary">Besuchen Sie die Website und helfen Sie bei der Entwicklung der Anwendung</string>
     <string name="about_licenses">Lizenzen</string>
@@ -366,6 +421,7 @@
     <string name="student_info_male">Mann</string>
     <string name="student_info_female">Frau</string>
     <string name="student_info_last_name">Nachname</string>
+    <string name="student_info_guardian">Wächter</string>
     <!--Account edit-->
     <string name="account_edit_nick_hint">Nick</string>
     <string name="account_edit_header">Nick hinzufügen</string>
@@ -373,6 +429,66 @@
     <!--Log viewer-->
     <string name="logviewer_share">Logs teilen</string>
     <string name="logviewer_refresh">Aktualisieren</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lektionen</string>
+    <string name="dashboard_timetable_title_tomorrow">(Morgen)</string>
+    <string name="dashboard_timetable_lesson_value">%1$s (%2$s)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">Gleich:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Bald:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">Erstens:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Jetzt:</string>
+    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
+        <item quantity="one">in %1$d Minute</item>
+        <item quantity="other">in %1$d Minuten</item>
+    </plurals>
+    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
+        <item quantity="one">Noch %1$d Minute</item>
+        <item quantity="other">Noch %1$d Minuten</item>
+    </plurals>
+    <string name="dashboard_timetable_second_lesson_value_end">Ende der Lektion</string>
+    <string name="dashboard_timetable_second_lessons_title">Nächste:</string>
+    <string name="dashboard_timetable_third_title">Später:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">Noch %1$d Lektion</item>
+        <item quantity="other">Noch %1$d Lektionen</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">bis %1$s</string>
+    <string name="dashboard_timetable_no_lessons">Keine anstehenden Lektionen</string>
+    <string name="dashboard_timetable_error">Fehler beim Laden des Lektionen</string>
+    <string name="dashboard_homework_title">Hausaufgaben</string>
+    <string name="dashboard_homework_no_homework">Keine Hausaufgaben zu tun</string>
+    <string name="dashboard_homework_error">Fehler beim Laden der Hausaufgaben</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">Noch %1$d Hausaufgabe</item>
+        <item quantity="other">Noch %1$d Hausaufgaben</item>
+    </plurals>
+    <string name="dashboard_homework_time">bis %1$s</string>
+    <string name="dashboard_grade_title">Letzte Noten</string>
+    <string name="dashboard_grade_no_grade">Keine neuen Noten</string>
+    <string name="dashboard_grade_error">Ein Fehler ist beim Laden der Noten</string>
+    <string name="dashboard_announcements_title">Schulankündigungen</string>
+    <string name="dashboard_announcements_no_announcements">Keine aktuellen Ankündigungen</string>
+    <string name="dashboard_announcements_error">Fehler beim Laden der Ankündigungen</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">Noch %1$d Schulankündigung</item>
+        <item quantity="other">Noch %1$d Schulankündigungen</item>
+    </plurals>
+    <string name="dashboard_exams_title">Prüfungen</string>
+    <string name="dashboard_exams_no_exams">Keine bevorstehenden Prüfungen</string>
+    <string name="dashboard_exams_error">Fehler beim Laden der Prüfungen</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">Noch %1$d Prüfung</item>
+        <item quantity="other">Noch %1$d Prüfungen</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Sitzungen</string>
+    <string name="dashboard_conferences_no_conferences">Keine bevorstehenden Ankündigungen</string>
+    <string name="dashboard_conferences_error">Beim Laden der Konferenzen trat ein Fehler auf</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">%1$d weitere Konferenz</item>
+        <item quantity="other">%1$d weitere Konferenzen</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">Fehler beim Laden der Daten</string>
+    <string name="dashboard_horizontal_group_no_lukcy_number">Keine</string>
     <!--Error dialog-->
     <string name="dialog_error_check_update">Auf Updates prüfen</string>
     <string name="dialog_error_check_update_message">Bevor Sie einen Fehler melden, prüfen Sie zuerst, ob ein Update mit der Fehlerbehebung verfügbar ist</string>
@@ -414,7 +530,6 @@
     <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_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
-    <string name="pref_view_timetable_show_whole_class">Unterricht der ganzen Klasse 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>
     <string name="pref_view_grade_sorting_mode">Schulfachen sortieren</string>
@@ -422,6 +537,7 @@
     <string name="pref_notify_header">Benachrichtigungen</string>
     <string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
     <string name="pref_notify_upcoming_lessons_switch">Benachrichtigungen über bevorstehende Lektionen anzeigen</string>
+    <string name="pref_notify_open_system_settings">Systembenachrichtigungseinstellungen öffnen</string>
     <string name="pref_notify_fix_sync_issues">Synchronisierungs- und Benachrichtigungsprobleme reparieren</string>
     <string name="pref_notify_fix_sync_issues_message">Ihr Gerät hat möglicherweise Probleme mit der Datensynchronisierung und Benachrichtigungen.\n\nUm diese zu reparieren, fügen Sie Wulkanowy zum Autostart hinzu und deaktivieren Sie die Batterieoptimierung in den Systemeinstellungen des Geräts.</string>
     <string name="pref_notify_fix_sync_issues_settings_button">Gehe zu den Einstellungen</string>
@@ -436,14 +552,18 @@
     <string name="pref_services_message_sync_success">Synchronisiert!</string>
     <string name="pref_services_message_sync_failed">Synchronisierung fehlgeschlagen</string>
     <string name="pref_services_sync_in_progress">Synchronisierung läuft</string>
+    <string name="pref_services_last_full_sync_date">Letzte vollständige Synchronisierung: %s</string>
     <string name="pref_other_grade_modifier_plus">Wert des Plus</string>
     <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_settings_advanced_title">Erweitert</string>
     <string name="pref_settings_appearance_title">Aussehen &amp; Verhalten</string>
     <string name="pref_settings_notifications_title">Benachrichtigungen</string>
     <string name="pref_settings_sync_title">Synchronisierung</string>
     <string name="pref_grades_appearance_header">Noten</string>
+    <string name="pref_dashboard_appearance_header">Dashboard</string>
+    <string name="pref_dashboard_appearance_tiles_title">Sichtbarkeit der Kacheln</string>
     <string name="pref_attendance_appearance_view">Schulbesuch</string>
     <string name="pref_timetable_appearance_view">Zeitplan</string>
     <string name="pref_grades_advanced_header">Noten</string>
@@ -458,18 +578,17 @@
     <string name="pref_advanced_category">Erweitert</string>
     <string name="pref_about_category_summary">App-Version, Mitarbeiter, soziale Portale, Lizenzen</string>
     <!--Notification Channels-->
-    <string name="channel_new_entries">Neue Einträge im Klassenbuch</string>
     <string name="channel_new_grades">Neue Noten</string>
+    <string name="channel_new_homework">Neue Hausaufgaben</string>
+    <string name="channel_new_conference">Neue Konferenzen</string>
+    <string name="channel_new_exam">Neue Prüfungen</string>
     <string name="channel_lucky_number">Glückliche Nummer</string>
     <string name="channel_new_message">Neue Nachrichten</string>
     <string name="channel_new_notes">Neue Eintragen</string>
+    <string name="channel_new_school_announcement">Neue Schulankündigungen</string>
     <string name="channel_push">Push-Benachrichtigungen</string>
     <string name="channel_upcoming_lessons">Bevorstehende Lektionen</string>
     <string name="channel_debug">Debuggen</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Ende der Unterstützung</string>
-    <string name="drop_kitkat_content">Wir beenden die Unterstützung für dein Gerät. Es werden keine neuen Funktionen mehr in Wulkanowy erscheinen. Allerdings werden wir bis Ende 2021 kritische Patches veröffentlichen, so dass du Zeit hast, zu einem neueren Modell zu wechseln</string>
-    <string name="drop_kitkat_again">Nicht mehr fragen</string>
     <!--Colors-->
     <string name="all_black">Schwarz</string>
     <string name="all_red">Rot</string>
@@ -480,6 +599,7 @@
     <!--Others-->
     <string name="all_copied">Kopiert</string>
     <string name="all_undo">lösen</string>
+    <string name="all_change">Ändern</string>
     <!--Update helper-->
     <string name="update_download_started">Download der Updates wurde gestartet…</string>
     <string name="update_download_success">Ein Update wurde gerade heruntergeladen.</string>
diff --git a/app/src/main/res/values-lt-v29/preferences_values.xml b/app/src/main/res/values-lt-v29/preferences_values.xml
deleted file mode 100644
index 18cbd4cf5..000000000
--- a/app/src/main/res/values-lt-v29/preferences_values.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>Sistemos tema</item>
-        <item>Šviesi</item>
-        <item>Tamsi</item>
-        <item>Juoda (AMOLED)</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-lt/preferences_values.xml b/app/src/main/res/values-lt/preferences_values.xml
deleted file mode 100644
index fcb637d23..000000000
--- a/app/src/main/res/values-lt/preferences_values.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>Šviesi</item>
-        <item>Tamsi</item>
-        <item>Juoda (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>Sistemos kalba</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 minučių</item>
-        <item>30 minučių</item>
-        <item>1 valandą</item>
-        <item>2 valandas</item>
-        <item>6 valandas</item>
-        <item>12 valandas</item>
-        <item>24 valandas</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>Pagal abėcėlę</item>
-        <item>Pagal datą</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Laipsnio spalvos registre</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Antrojo semestro laipsnių vidurkis</item>
-        <item>Abiejų semestrų laipsnių vidurkis</item>
-        <item>Visų metų laipsnių vidurkis</item>
-    </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nerodyti</item>
-        <item>Rodyti viską</item>
-        <item>Rodyti mažesnį</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
deleted file mode 100644
index 424cc2523..000000000
--- a/app/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--Activity/Fragment title-->
-    <string name="login_title">Prisijungti</string>
-    <string name="main_title">Wulkanowy</string>
-    <string name="grade_title">Laipsnis</string>
-    <string name="attendance_title">Attendance</string>
-    <string name="exam_title">Exams</string>
-    <string name="timetable_title">Timetable</string>
-    <string name="settings_title">Nustatymai</string>
-    <string name="more_title">Daugiau</string>
-    <string name="about_title">Apie</string>
-    <string name="logviewer_title">Peržiūrėti žurnalą</string>
-    <string name="contributors_title">Prisidėję</string>
-    <string name="license_title">Licencijos</string>
-    <string name="message_title">Žinutės</string>
-    <string name="send_message_title">Nauja žinutė</string>
-    <string name="note_title">Pastabos ir pasiekimai</string>
-    <string name="homework_title">Namų darbai</string>
-    <string name="account_title">Paskyros valdymas</string>
-    <string name="account_quick_title">Pasirinkite paskyrą</string>
-    <string name="account_details_title">Paskyros informacija</string>
-    <string name="student_info_title">Studentų informacija</string>
-    <!--Subtitles-->
-    <string name="grade_subtitle">Semestras %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</string>
-    <string name="login_nickname_hint">Vartotojo vardas</string>
-    <string name="login_email_hint">El. paštas</string>
-    <string name="login_login_pesel_email_hint">Prisijunkite, PESEL arba el. paštas</string>
-    <string name="login_password_hint">Slaptažodis</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">Hibridas</string>
-    <string name="login_token_hint">Token</string>
-    <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">API raktas</string>
-    <string name="login_symbol_hint">Symbol</string>
-    <string name="login_sign_in">Prisijungti</string>
-    <string name="login_invalid_password">Slaptažodis per trumpas</string>
-    <string name="login_incorrect_password">Login details are incorrect. Make sure the correct UONET+ register variation is selected in the field below</string>
-    <string name="login_invalid_pin">Netinkamas PIN kodas</string>
-    <string name="login_invalid_token">Invalid token</string>
-    <string name="login_expired_token">Token expired</string>
-    <string name="login_invalid_email">Neteisingas el. paštas</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">Netinkamas simbolis</string>
-    <string name="login_incorrect_symbol">Student not found. Validate the symbol and the chosen variation of the UONET+ register</string>
-    <string name="login_field_required">This field is required</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. Wulkanowy does not detect pre-school students at the moment</string>
-    <string name="login_select_student">Select students to log in to the application</string>
-    <string name="login_advanced">Papildomi nustatymai</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">Privatumo politika</string>
-    <string name="login_contact_header">Trouble signing in? Contact us!</string>
-    <string name="login_contact_email">El. paštas</string>
-    <string name="login_contact_discord">Discord</string>
-    <string name="login_email_intent_title">Send email</string>
-    <string name="login_email_details">Describe details of problem:</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">Atkurti</string>
-    <string name="login_signed_in">Student is already signed in</string>
-    <!--Main-->
-    <string name="main_account_picker">Paskyros valdymas</string>
-    <string name="main_log_in">Prisijungti</string>
-    <string name="main_session_expired">Sesijos laikas baigėsi</string>
-    <string name="main_session_relogin">Sesijos laikas baigėsi, prašome prisijungti iš naujo</string>
-    <!--Grade-->
-    <string name="grade_header">Laipsnis</string>
-    <string name="grade_semester">Semestras %d</string>
-    <string name="grade_switch_semester">Keisti semestrą</string>
-    <string name="grade_no_items">Jokių laipsnių</string>
-    <string name="grade_weight">Svoris</string>
-    <string name="grade_weight_value">Svoris: %s</string>
-    <string name="grade_comment">Pastabos</string>
-    <string name="grade_no_new_items">Jokių naujų laipsnių</string>
-    <string name="grade_number_new_items">Number of new ratings: %1$d</string>
-    <string name="grade_average">Vidurkis: %1$.2f</string>
-    <string name="grade_points_sum">Puantai: %s</string>
-    <string name="grade_no_average">Jokiu vidurkis</string>
-    <string name="grade_predicted">Numatomas: %1$s</string>
-    <string name="grade_final">Galutinis: %1$s</string>
-    <string name="grade_summary_points">Bendras punktų skaičius</string>
-    <string name="grade_summary_final_grade">Galutinis laipsnis</string>
-    <string name="grade_summary_predicted_grade">Numatomas laipsnis</string>
-    <string name="grade_summary_calculated_average">Calculated average</string>
-    <string name="grade_summary_final_average">Final average</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_average">Average: %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="few">%d grades</item>
-        <item quantity="many">%d grades</item>
-        <item quantity="other">%d grades</item>
-    </plurals>
-    <plurals name="grade_new_items">
-        <item quantity="one">New grade</item>
-        <item quantity="few">New grades</item>
-        <item quantity="many">New grades</item>
-        <item quantity="other">New grades</item>
-    </plurals>
-    <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
-        <item quantity="few">New predicted grades</item>
-        <item quantity="many">New predicted grades</item>
-        <item quantity="other">New predicted grades</item>
-    </plurals>
-    <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
-        <item quantity="few">New final grades</item>
-        <item quantity="many">New final grades</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="few">You received %1$d grades</item>
-        <item quantity="many">You received %1$d grades</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="few">You received %1$d predicted grades</item>
-        <item quantity="many">You received %1$d predicted grades</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="few">You received %1$d final grades</item>
-        <item quantity="many">You received %1$d final grades</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>
-    <!--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>
-    <!--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>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d absence</item>
-        <item quantity="few">%1$d absences</item>
-        <item quantity="many">%1$d absences</item>
-        <item quantity="other">%1$d absences</item>
-    </plurals>
-    <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>
-    <!--Attendance summary-->
-    <string name="attendance_summary_final">Attendance</string>
-    <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>
-    <!--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_preview_error">An error occurred while downloading message content</string>
-    <string name="message_from">From:</string>
-    <string name="message_to">To:</string>
-    <string name="message_date">Date: %s</string>
-    <string name="message_reply">Reply</string>
-    <string name="message_forward">Forward</string>
-    <string name="message_delete">Delete</string>
-    <string name="message_move_to_bin">Move to trash</string>
-    <string name="message_delete_forever">Delete permanently</string>
-    <string name="message_delete_success">Message deleted successfully</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>
-    <plurals name="message_number_item">
-        <item quantity="one">%d message</item>
-        <item quantity="few">%d messages</item>
-        <item quantity="many">%d messages</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <plurals name="message_new_items">
-        <item quantity="one">New message</item>
-        <item quantity="few">New messages</item>
-        <item quantity="many">New messages</item>
-        <item quantity="other">New messages</item>
-    </plurals>
-    <plurals name="message_notify_new_items">
-        <item quantity="one">You received %1$d message</item>
-        <item quantity="few">You received %1$d messages</item>
-        <item quantity="many">You received %1$d messages</item>
-        <item quantity="other">You received %1$d messages</item>
-    </plurals>
-    <!--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="few">%d notes</item>
-        <item quantity="many">%d notes</item>
-        <item quantity="other">%d notes</item>
-    </plurals>
-    <plurals name="note_new_items">
-        <item quantity="one">New note</item>
-        <item quantity="few">New notes</item>
-        <item quantity="many">New notes</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="few">You received %1$d notes</item>
-        <item quantity="many">You received %1$d notes</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="few">%d praises</item>
-        <item quantity="many">%d praises</item>
-        <item quantity="other">%d praises</item>
-    </plurals>
-    <plurals name="praise_new_items">
-        <item quantity="one">New praise</item>
-        <item quantity="few">New praises</item>
-        <item quantity="many">New praises</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="few">You received %1$d praises</item>
-        <item quantity="many">You received %1$d praises</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="few">%d neutral notes</item>
-        <item quantity="many">%d neutral notes</item>
-        <item quantity="other">%d neutral notes</item>
-    </plurals>
-    <plurals name="neutral_note_new_items">
-        <item quantity="one">New neutral note</item>
-        <item quantity="few">New neutral notes</item>
-        <item quantity="many">New neutral notes</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="few">You received %1$d neutral notes</item>
-        <item quantity="many">You received %1$d neutral notes</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_attachments">Attachments</string>
-    <!--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: %d</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>
-    <!--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_login_mobile_api">Mobile API mode</string>
-    <string name="account_login_hybrid">Hybrid mode</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_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_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>
-    <!--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>
-    <!--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>
-    <!--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 appearance &amp; behavior</string>
-    <string name="pref_view_list">Default view</string>
-    <string name="pref_view_grade_average_mode">Calculation of the end-of-year average</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">Expand grades</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_timetable_show_whole_class">Show whole class lessons</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_switch">Show notifications</string>
-    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</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_fix_sync_issues_settings_button">Go to 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_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_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_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_grades_appearance_header">Grades</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_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, licenses</string>
-    <!--Notification Channels-->
-    <string name="channel_new_entries">New entries in register</string>
-    <string name="channel_new_grades">New grades</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_push">Push notifications</string>
-    <string name="channel_upcoming_lessons">Upcoming lessons</string>
-    <string name="channel_debug">Debug</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">End of support</string>
-    <string name="drop_kitkat_content">We are ending support for your device. No more new features will appear for it in Wulkanowy. However, we will be releasing critical patches until the end of 2021 so you have time to switch to a newer model</string>
-    <string name="drop_kitkat_again">Don\'t show again</string>
-    <!--Colors-->
-    <string name="all_black">Black</string>
-    <string name="all_red">Red</string>
-    <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>
-    <!--Others-->
-    <string name="all_copied">Copied</string>
-    <string name="all_undo">Undo</string>
-    <!--Update helper-->
-    <string name="update_download_started">Download of updates has started…</string>
-    <string name="update_download_success">An update has just been downloaded.</string>
-    <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_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>
-</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 68a9fa2fe..5eca4680e 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -10,44 +10,37 @@
         <item name="colorSwipeRefresh">@color/colorSwipeRefreshDark</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">
-            @color/colorNavigationBarLight
-        </item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">
-            @color/colorStatusBarLight
-        </item>
+        <item name="android:navigationBarColor">@color/colorNavigationBarLight</item>
+        <item name="android:statusBarColor">@color/colorStatusBarLight</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
-        <item name="mdtp_theme_dark">true</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
     </style>
 
     <style name="WulkanowyTheme.Black" parent="WulkanowyTheme.NoActionBar">
         <item name="colorSurface">@android:color/black</item>
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">
-            @color/colorNavigationBarBlack
-        </item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@color/colorStatusBarBlack</item>
+        <item name="android:navigationBarColor">@color/colorNavigationBarBlack</item>
+        <item name="android:statusBarColor">@color/colorStatusBarBlack</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
     </style>
 
     <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">?colorSurface</item>
+        <item name="android:navigationBarColor">?colorSurface</item>
+        <item name="android:statusBarColor">?colorSurface</item>
     </style>
 
     <style name="WulkanowyTheme.Login.Black" parent="WulkanowyTheme.Black">
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">?colorSurface</item>
+        <item name="android:navigationBarColor">?colorSurface</item>
+        <item name="android:statusBarColor">?colorSurface</item>
     </style>
 
     <style name="WulkanowyTheme.MessageSend" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:navigationBarColor" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">#1C1C1C</item>
+        <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" tools:targetApi="lollipop">?colorSurface</item>
-        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
+        <item name="android:navigationBarColor">?colorSurface</item>
+        <item name="android:statusBarColor">@android:color/black</item>
     </style>
 
     <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Dialog">
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index b25dc3e59..12cfda8c9 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -45,9 +45,15 @@
         <item>Średnia średnich z obu semestrów</item>
         <item>Średnia wszystkich ocen z całego roku</item>
     </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nie pokazuj</item>
-        <item>Pokazuj wszystkie</item>
-        <item>Pokazuj pomniejszone</item>
+    <string-array name="dashboard_tile_entries">
+        <item>Szczęśliwy numerek</item>
+        <item>Nieprzeczytane wiadomości</item>
+        <item>Frekwencja</item>
+        <item>Lekcje</item>
+        <item>Oceny</item>
+        <item>Zadania domowe</item>
+        <item>Ogłoszenia szkolne</item>
+        <item>Sprawdziany</item>
+        <item>Zebrania</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fb538fadb..74627ed1f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -11,6 +11,8 @@
     <string name="more_title">Więcej</string>
     <string name="about_title">O aplikacji</string>
     <string name="logviewer_title">Przeglądarka logów</string>
+    <string name="debug_title">Debugowanie</string>
+    <string name="notification_debug_title">Debugowanie powiadomień</string>
     <string name="contributors_title">Twórcy</string>
     <string name="license_title">Licencje</string>
     <string name="message_title">Wiadomości</string>
@@ -21,6 +23,7 @@
     <string name="account_quick_title">Wybierz konto</string>
     <string name="account_details_title">Szczegóły konta</string>
     <string name="student_info_title">Informacje o uczniu</string>
+    <string name="dashboard_title">Start</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -36,7 +39,6 @@
     <string name="login_type_hybrid">Hybrydowe</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">Klucz API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Zaloguj</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
@@ -62,7 +64,6 @@
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Wyślij email</string>
-    <string name="login_email_details">Opisz problem:</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_title">Przywróć swoje konto</string>
@@ -81,18 +82,16 @@
     <string name="grade_weight">Waga</string>
     <string name="grade_weight_value">Waga: %s</string>
     <string name="grade_comment">Komentarz</string>
-    <string name="grade_no_new_items">Brak nowych ocen</string>
     <string name="grade_number_new_items">Ilość nowych ocen: %1$d</string>
     <string name="grade_average">Średnia: %1$.2f</string>
     <string name="grade_points_sum">Punkty: %s</string>
     <string name="grade_no_average">Brak średniej</string>
-    <string name="grade_predicted">Przewidywana: %1$s</string>
-    <string name="grade_final">Końcowa: %1$s</string>
     <string name="grade_summary_points">Suma punktów</string>
     <string name="grade_summary_final_grade">Ocena końcowa</string>
     <string name="grade_summary_predicted_grade">Przewidywana ocena</string>
     <string name="grade_summary_calculated_average">Obliczona średnia</string>
     <string name="grade_summary_final_average">Końcowa średnia</string>
+    <string name="grade_summary_from_subjects">z %1$d na %2$d przedmiotów</string>
     <string name="grade_menu_summary">Podsumowanie</string>
     <string name="grade_menu_statistics">Klasa</string>
     <string name="grade_menu_read">Oznacz jako przeczytane</string>
@@ -184,31 +183,41 @@
     <string name="attendance_unknown">Nieznany</string>
     <string name="attendance_number">Numer lekcji</string>
     <string name="attendance_no_items">Brak wpisów</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d nieobecność</item>
-        <item quantity="few">%1$d nieobecności</item>
-        <item quantity="many">%1$d nieobecności</item>
-        <item quantity="other">%1$d nieobecności</item>
-    </plurals>
     <string name="attendance_excuse_dialog_reason">Powód nieobecności (opcjonalny)</string>
     <string name="attendance_excuse_dialog_submit">Wyślij</string>
     <string name="attendance_excuse_success">Prośba o usprawiedliwienie została pomyślnie wysłana!</string>
     <string name="attendance_excuse_no_selection">Musisz wybrać co najmniej jedną nieobecność!</string>
     <string name="attendance_excuse_title">Usprawiedliw</string>
     <!--Attendance summary-->
-    <string name="attendance_summary_final">Frekwencja</string>
     <string name="attendance_summary_total">Razem</string>
     <!--Exam-->
     <string name="exam_no_items">Brak sprawdzianów w tym tygodniu</string>
     <string name="exam_type">Typ</string>
     <string name="exam_entry_date">Data wpisu</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">Nowy sprawdzian</item>
+        <item quantity="few">Nowe sprawdziany</item>
+        <item quantity="many">Nowe sprawdziany</item>
+        <item quantity="other">Nowe sprawdziany</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">Masz %d nowy sprawdzian</item>
+        <item quantity="few">Masz %d nowe sprawdziany</item>
+        <item quantity="many">Masz %d nowych sprawdzianów</item>
+        <item quantity="other">Masz %d nowych sprawdzianów</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d sprawdzian</item>
+        <item quantity="few">%d sprawdziany</item>
+        <item quantity="many">%d sprawdzianów</item>
+        <item quantity="other">%d sprawdzianów</item>
+    </plurals>
     <!--Message-->
     <string name="message_inbox">Odebrane</string>
     <string name="message_sent">Wysłane</string>
     <string name="message_trash">Kosz</string>
     <string name="message_no_subject">(brak tematu)</string>
     <string name="message_no_items">Brak wiadomości</string>
-    <string name="message_preview_error">Wystąpił błąd podczas pobierania treści wiadomości</string>
     <string name="message_from">Od:</string>
     <string name="message_to">Do:</string>
     <string name="message_date">Data: %s</string>
@@ -226,6 +235,15 @@
     <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_only_unread">Tylko nieprzeczytane</string>
+    <string name="message_chip_only_with_attachments">Tylko z załącznikami</string>
+    <string name="message_read">Przeczytana: %s</string>
+    <plurals name="message_read_by">
+        <item quantity="one">Przeczytana przez: %1$d z %2$d osób</item>
+        <item quantity="few">Przeczytana przez: %1$d z %2$d osób</item>
+        <item quantity="many">Przeczytana przez: %1$d z %2$d osób</item>
+        <item quantity="other">Przeczytana przez: %1$d z %2$d osób</item>
+    </plurals>
     <plurals name="message_number_item">
         <item quantity="one">%d wiadomość</item>
         <item quantity="few">%d wiadomości</item>
@@ -238,6 +256,8 @@
         <item quantity="many">Nowe wiadomości</item>
         <item quantity="other">Nowe wiadomości</item>
     </plurals>
+    <string name="message_restore_dialog">Czy chcesz przywrócić wersję roboczą wiadomości?</string>
+    <string name="message_restore_dialog_with_recipients">Czy chcesz przywrócić wersję roboczą wiadomości z adresatami: %s?</string>
     <plurals name="message_notify_new_items">
         <item quantity="one">Masz %1$d nową wiadomość</item>
         <item quantity="few">Masz %1$d nowe wiadomości</item>
@@ -308,12 +328,30 @@
     <string name="homework_mark_as_done">Wykonane</string>
     <string name="homework_mark_as_undone">Niewykonane</string>
     <string name="homework_attachments">Załączniki</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">Nowe zadanie domowe</item>
+        <item quantity="few">Nowe zadania domowe</item>
+        <item quantity="many">Nowe zadania domowe</item>
+        <item quantity="other">Nowe zadania domowe</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">Masz %d nowe zadanie domowe</item>
+        <item quantity="few">Masz %d nowe zadania domowe</item>
+        <item quantity="many">Masz %d nowych zadań domowych</item>
+        <item quantity="other">Masz %d nowych zadań domowych</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d zadanie domowe</item>
+        <item quantity="few">%d zadania domowe</item>
+        <item quantity="many">%d zadań domowych</item>
+        <item quantity="other">%d zadań domowych</item>
+    </plurals>
     <!--Lucky number-->
     <string name="lucky_number_title">Szczęśliwy numerek</string>
     <string name="lucky_number_header">Dzisiejszym szczęśliwym numerkiem jest</string>
     <string name="lucky_number_empty">Brak informacji o szczęśliwym numerku</string>
     <string name="lucky_number_notify_new_item_title">Szczęśliwy numerek na dzisiaj</string>
-    <string name="lucky_number_notify_new_item">Dziś szczęśliwym numerkiem jest: %d</string>
+    <string name="lucky_number_notify_new_item">Dzisiejszym szczęśliwym numerkiem jest: %s</string>
     <string name="lucky_number_history_button">Pokaż historię</string>
     <!--Lucky number history-->
     <string name="lucky_number_history_title">Historia numerków</string>
@@ -346,6 +384,45 @@
     <!--Conference-->
     <string name="conferences_title">Zebrania</string>
     <string name="conference_no_items">Brak informacji o zebraniach</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d zebranie</item>
+        <item quantity="few">%d zebrania</item>
+        <item quantity="many">%d zebrań</item>
+        <item quantity="other">%d zebrań</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">Nowe zebranie</item>
+        <item quantity="few">Nowe zebrania</item>
+        <item quantity="many">Nowe zebrania</item>
+        <item quantity="other">Nowe zebrania</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">Masz %1$d nowe zebranie</item>
+        <item quantity="few">Masz %1$d nowe zebrania</item>
+        <item quantity="many">Masz %1$d nowych zebrań</item>
+        <item quantity="other">Masz %1$d nowych zebrań</item>
+    </plurals>
+    <!--Director information-->
+    <string name="school_announcement_title">Ogłoszenia szkolne</string>
+    <string name="school_announcement_no_items">Brak ogłoszeń szkolnych</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d ogłoszenie szkolne</item>
+        <item quantity="few">%d ogłoszenia szkolne</item>
+        <item quantity="many">%d ogłoszeń szkolnych</item>
+        <item quantity="other">%d ogłoszeń szkolnych</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">Nowe ogłoszenie szkolne</item>
+        <item quantity="few">Nowe ogłoszenia szkolne</item>
+        <item quantity="many">Nowe ogłoszenia szkolne</item>
+        <item quantity="other">Nowe ogłoszenia szkolne</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">Masz %1$d nowe ogłoszenie szkolne</item>
+        <item quantity="few">Masz %1$d nowe ogłoszenia szkolne</item>
+        <item quantity="many">Masz %1$d nowych ogłoszeń szkolnych</item>
+        <item quantity="other">Masz %1$d nowych ogłoszeń szkolnych</item>
+    </plurals>
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
@@ -353,8 +430,6 @@
     <string name="account_logout_student">Wylogowanie ucznia</string>
     <string name="account_type_student">Konto ucznia</string>
     <string name="account_type_parent">Konto rodzica</string>
-    <string name="account_login_mobile_api">Tryb API mobilne</string>
-    <string name="account_login_hybrid">Tryb hybrydowy</string>
     <string name="account_details_edit">Edytuj dane</string>
     <string name="account_quick_manager">Menadżer kont</string>
     <string name="account_select_student">Wybierz ucznia</string>
@@ -373,9 +448,13 @@
     <string name="about_discord">Serwer Discord</string>
     <string name="about_discord_summary">Dołącz do społeczności Wulkanowego</string>
     <string name="about_facebook">Fanpage na Facebooku</string>
+    <string name="about_twitter">Strona na Twitterze</string>
+    <string name="about_twitter_summary">Śledź nas na Twitterze</string>
     <string name="about_facebook_summary">Polub nasz fanpage na Facebooku</string>
     <string name="about_privacy">Polityka prywatności</string>
     <string name="about_privacy_summary">Zasady zbierania danych osobowych</string>
+    <string name="about_system">Ustawienia systemowe</string>
+    <string name="about_system_summary">Otwórz ustawienia systemowe</string>
     <string name="about_homepage">Strona domowa</string>
     <string name="about_homepage_summary">Odwiedź stronę i pomóż rozwijać aplikację</string>
     <string name="about_licenses">Licencje</string>
@@ -406,6 +485,7 @@
     <string name="student_info_male">Mężczyzna</string>
     <string name="student_info_female">Kobieta</string>
     <string name="student_info_last_name">Nazwisko</string>
+    <string name="student_info_guardian">Opiekun</string>
     <!--Account edit-->
     <string name="account_edit_nick_hint">Pseudonim</string>
     <string name="account_edit_header">Dodaj pseudonim</string>
@@ -413,6 +493,80 @@
     <!--Log viewer-->
     <string name="logviewer_share">Udostępnij logi</string>
     <string name="logviewer_refresh">Odśwież</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lekcje</string>
+    <string name="dashboard_timetable_title_tomorrow">(Jutro)</string>
+    <string name="dashboard_timetable_lesson_value">%1$s (%2$s)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">Za chwilę:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Wkrótce:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">Pierwsza:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Teraz:</string>
+    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
+        <item quantity="one">za %1$d minutę</item>
+        <item quantity="few">za %1$d minuty</item>
+        <item quantity="many">za %1$d minut</item>
+        <item quantity="other">za %1$d minut</item>
+    </plurals>
+    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
+        <item quantity="one">jeszcze %1$d minuta</item>
+        <item quantity="few">jeszcze %1$d minuty</item>
+        <item quantity="many">jeszcze %1$d minut</item>
+        <item quantity="other">jeszcze %1$d minut</item>
+    </plurals>
+    <string name="dashboard_timetable_second_lesson_value_end">Koniec lekcji</string>
+    <string name="dashboard_timetable_second_lessons_title">Następnie:</string>
+    <string name="dashboard_timetable_third_title">Później:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">jeszcze %1$d dodatkowa lekcja</item>
+        <item quantity="few">jeszcze %1$d dodatkowe lekcje</item>
+        <item quantity="many">jeszcze %1$d dodatkowych lekcji</item>
+        <item quantity="other">jeszcze %1$d dodatkowych lekcji</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">do %1$s</string>
+    <string name="dashboard_timetable_no_lessons">Brak nadchodzących lekcji</string>
+    <string name="dashboard_timetable_error">Wystąpił błąd podczas ładowania lekcji</string>
+    <string name="dashboard_homework_title">Zadania domowe</string>
+    <string name="dashboard_homework_no_homework">Brak prac domowych do wykonania</string>
+    <string name="dashboard_homework_error">Wystąpił błąd podczas ładowania zadań domowych</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">Jeszcze %1$d dodatkowe zadanie domowe</item>
+        <item quantity="few">Jeszcze %1$d dodatkowe zadania domowe</item>
+        <item quantity="many">Jeszcze %1$d dodatkowych zadań domowych</item>
+        <item quantity="other">Jeszcze %1$d dodatkowych zadań domowych</item>
+    </plurals>
+    <string name="dashboard_homework_time">do %1$s</string>
+    <string name="dashboard_grade_title">Ostatnie oceny</string>
+    <string name="dashboard_grade_no_grade">Brak nowych ocen</string>
+    <string name="dashboard_grade_error">Wystąpił błąd podczas ładowania ocen</string>
+    <string name="dashboard_announcements_title">Ogłoszenia szkolne</string>
+    <string name="dashboard_announcements_no_announcements">Brak aktualnych ogłoszeń</string>
+    <string name="dashboard_announcements_error">Wystąpił błąd podczas ładowania ogłoszeń</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">Jeszcze %1$d dodatkowe ogłoszenie</item>
+        <item quantity="few">Jeszcze %1$d dodatkowe ogłoszenia</item>
+        <item quantity="many">Jeszcze %1$d dodatkowych ogłoszeń</item>
+        <item quantity="other">Jeszcze %1$d dodatkowych ogłoszeń</item>
+    </plurals>
+    <string name="dashboard_exams_title">Sprawdziany</string>
+    <string name="dashboard_exams_no_exams">Brak nadchodzących sprawdzianów</string>
+    <string name="dashboard_exams_error">Wystąpił błąd podczas ładowania sprawdzianów</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">Jeszcze %1$d dodatkowy sprawdzian</item>
+        <item quantity="few">Jeszcze %1$d dodatkowe sprawdziany</item>
+        <item quantity="many">Jeszcze %1$d dodatkowych sprawdzianów</item>
+        <item quantity="other">Jeszcze %1$d dodatkowych sprawdzianów</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Zebrania</string>
+    <string name="dashboard_conferences_no_conferences">Brak nadchodzących zebrań</string>
+    <string name="dashboard_conferences_error">Wystąpił błąd podczas ładowania zebrań</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">Jeszcze %1$d dodatkowe zebranie</item>
+        <item quantity="few">Jeszcze %1$d dodatkowe zebrania</item>
+        <item quantity="many">Jeszcze %1$d dodatkowych zebrań</item>
+        <item quantity="other">Jeszcze %1$d dodatkowych zebrań</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">Wystąpił błąd podczas ładowania danych</string>
+    <string name="dashboard_horizontal_group_no_lukcy_number">Brak</string>
     <!--Error dialog-->
     <string name="dialog_error_check_update">Sprawdź dostępność aktualizacji</string>
     <string name="dialog_error_check_update_message">Przed zgłoszeniem błędu sprawdź wcześniej, czy dostępna jest już aktualizacja z poprawką błędu</string>
@@ -454,7 +608,6 @@
     <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_grade_statistics_list">Pokazuj listę wykresów w ocenach klasy</string>
-    <string name="pref_view_timetable_show_whole_class">Pokazuj lekcje całej 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>
     <string name="pref_view_grade_sorting_mode">Sortowanie przedmiotów</string>
@@ -462,6 +615,7 @@
     <string name="pref_notify_header">Powiadomienia</string>
     <string name="pref_notify_switch">Pokazuj powiadomienia</string>
     <string name="pref_notify_upcoming_lessons_switch">Pokazuj powiadomienia o nadchodzących lekcjach</string>
+    <string name="pref_notify_open_system_settings">Otwórz systemowe ustawienia powiadomień</string>
     <string name="pref_notify_fix_sync_issues">Napraw problemy z synchronizacją i powiadomieniami</string>
     <string name="pref_notify_fix_sync_issues_message">Na twoim urządzeniu mogą występować problemy z synchronizacją danych i powiadomieniami.\n\nBy je naprawić, dodaj Wulkanowego do autostartu i wyłącz optymalizację/oszczędzanie baterii w ustawieniach systemowych telefonu.</string>
     <string name="pref_notify_fix_sync_issues_settings_button">Przejdź do ustawień</string>
@@ -476,14 +630,18 @@
     <string name="pref_services_message_sync_success">Zsynchronizowano!</string>
     <string name="pref_services_message_sync_failed">Synchronizacja nie powiodła się</string>
     <string name="pref_services_sync_in_progress">Synchronizacja w trakcie</string>
+    <string name="pref_services_last_full_sync_date">Ostatnia pełna synchronizacja: %s</string>
     <string name="pref_other_grade_modifier_plus">Wartość plusa</string>
     <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_settings_advanced_title">Zaawansowane</string>
     <string name="pref_settings_appearance_title">Wygląd i zachowanie</string>
     <string name="pref_settings_notifications_title">Powiadomienia</string>
     <string name="pref_settings_sync_title">Synchronizacja</string>
     <string name="pref_grades_appearance_header">Oceny</string>
+    <string name="pref_dashboard_appearance_header">Start</string>
+    <string name="pref_dashboard_appearance_tiles_title">Widoczność kafelków</string>
     <string name="pref_attendance_appearance_view">Frekwencja</string>
     <string name="pref_timetable_appearance_view">Plan lekcji</string>
     <string name="pref_grades_advanced_header">Oceny</string>
@@ -498,18 +656,17 @@
     <string name="pref_advanced_category">Zaawansowane</string>
     <string name="pref_about_category_summary">Wersja aplikacji, twórcy, media społecznościowe, licencje</string>
     <!--Notification Channels-->
-    <string name="channel_new_entries">Nowe wpisy w dzienniku</string>
     <string name="channel_new_grades">Nowe oceny</string>
+    <string name="channel_new_homework">Nowe zadania domowe</string>
+    <string name="channel_new_conference">Nowe zebrania</string>
+    <string name="channel_new_exam">Nowe sprawdziany</string>
     <string name="channel_lucky_number">Szczęśliwy numerek</string>
     <string name="channel_new_message">Nowe wiadomości</string>
     <string name="channel_new_notes">Nowe uwagi</string>
+    <string name="channel_new_school_announcement">Nowe ogłoszenia szkolne</string>
     <string name="channel_push">Powiadomienia push</string>
     <string name="channel_upcoming_lessons">Nadchodzące lekcje</string>
     <string name="channel_debug">Debugowanie</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Koniec wsparcia</string>
-    <string name="drop_kitkat_content">Kończymy wsparcie dla Twojego urządzenia. Nie pojawią się już dla niego żadne nowe funkcje w Wulkanowym. Będziemy jednak wypuszczać krytyczne poprawki do końca 2021 roku, abyś miał czas na przeniesienie się na nowszy model</string>
-    <string name="drop_kitkat_again">Nie pokazuj ponownie</string>
     <!--Colors-->
     <string name="all_black">Czarny</string>
     <string name="all_red">Czerwony</string>
@@ -520,6 +677,7 @@
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
     <string name="all_undo">Cofnij</string>
+    <string name="all_change">Zmień</string>
     <!--Update helper-->
     <string name="update_download_started">Rozpoczęto pobieranie aktualizacji…</string>
     <string name="update_download_success">Aktualizacja została pobrana.</string>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index 64b777fb3..7c4d14df6 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -45,9 +45,15 @@
         <item>Средняя оценка с двух семестров</item>
         <item>Средняя оценок со всего года</item>
     </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Не показывать</item>
-        <item>Показать все</item>
-        <item>Показать меньше</item>
+    <string-array name="dashboard_tile_entries">
+        <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 665d9dc46..db78f5952 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -11,6 +11,8 @@
     <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="contributors_title">Разработчики</string>
     <string name="license_title">Лицензии</string>
     <string name="message_title">Сообщения</string>
@@ -21,6 +23,7 @@
     <string name="account_quick_title">Выбор учетной записи</string>
     <string name="account_details_title">Данные аккаунта</string>
     <string name="student_info_title">Информация о студенте</string>
+    <string name="dashboard_title">Панель</string>
     <!--Subtitles-->
     <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
     <!--Login-->
@@ -36,7 +39,6 @@
     <string name="login_type_hybrid">Гибрид</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">Ключ API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Войти</string>
     <string name="login_invalid_password">Слишком короткий пароль</string>
@@ -62,7 +64,6 @@
     <string name="login_contact_email">Электронная почта</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Отправить письмо</string>
-    <string name="login_email_details">Опишите детали проблемы:</string>
     <string name="login_recover_warning">Убедитесь, что вы выбрали правильный вариант регистра UONET+!</string>
     <string name="login_recover_button">Я забыл свой пароль</string>
     <string name="login_recover_title">Восстановите свой аккаунт</string>
@@ -81,18 +82,16 @@
     <string name="grade_weight">Стоимость</string>
     <string name="grade_weight_value">Стоимость: %s</string>
     <string name="grade_comment">Комментарий</string>
-    <string name="grade_no_new_items">Новые оценки отсутствуют</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_predicted">Ожидаемая оценка: %1$s</string>
-    <string name="grade_final">Итоговая оценка: %1$s</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_final_average">Итоговая средняя оценка</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>
@@ -184,31 +183,41 @@
     <string name="attendance_unknown">Неизвестно</string>
     <string name="attendance_number">Урок №</string>
     <string name="attendance_no_items">Данные не найдены</string>
-    <plurals name="attendance_number_absences">
-        <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="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>
     <!--Attendance summary-->
-    <string name="attendance_summary_final">Посещаемость</string>
     <string name="attendance_summary_total">Общая</string>
     <!--Exam-->
     <string name="exam_no_items">Нет тестов на этой неделе</string>
     <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>
+    </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>
+    </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>
+    </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_preview_error">Произошла ошибка во время получения содержания сообщения</string>
     <string name="message_from">От:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %s</string>
@@ -226,6 +235,15 @@
     <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>
+    <plurals name="message_read_by">
+        <item quantity="one">Прочитано: %1$d из %2$d человек</item>
+        <item quantity="few">Прочитано: %1$d из %2$d человек</item>
+        <item quantity="many">Прочитано: %1$d из %2$d человек</item>
+        <item quantity="other">Прочитано: %1$d из %2$d человек</item>
+    </plurals>
     <plurals name="message_number_item">
         <item quantity="one">%d сообщение</item>
         <item quantity="few">%d сообщения</item>
@@ -238,6 +256,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>
     <plurals name="message_notify_new_items">
         <item quantity="one">Вы получили %1$d новое сообщение</item>
         <item quantity="few">Вы получили %1$d новых сообщения</item>
@@ -308,12 +328,30 @@
     <string name="homework_mark_as_done">Отметить как выполненное</string>
     <string name="homework_mark_as_undone">Отметить как невыполненное</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>
+    </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>
+    </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>
+    </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_notify_new_item_title">Сегодняшний счастливый номер</string>
-    <string name="lucky_number_notify_new_item">Сегодняшний счастливый номер это: %d</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>
@@ -346,6 +384,45 @@
     <!--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>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <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>
+    </plurals>
+    <!--Director information-->
+    <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>
+    </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>
+    </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>
+    </plurals>
     <!--Account-->
     <string name="account_add_new">Добавить аккаунт</string>
     <string name="account_logout">Выйти</string>
@@ -353,8 +430,6 @@
     <string name="account_logout_student">Выйти</string>
     <string name="account_type_student">Профиль ученика</string>
     <string name="account_type_parent">Профиль родителя</string>
-    <string name="account_login_mobile_api">Режим Mobile API</string>
-    <string name="account_login_hybrid">Гибридный режим</string>
     <string name="account_details_edit">Изменить данные</string>
     <string name="account_quick_manager">Менеджер аккаунтов</string>
     <string name="account_select_student">Выберите Студента</string>
@@ -373,9 +448,13 @@
     <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_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_licenses">Лицензии</string>
@@ -406,6 +485,7 @@
     <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-->
     <string name="account_edit_nick_hint">Ник</string>
     <string name="account_edit_header">Добавить ник</string>
@@ -413,6 +493,80 @@
     <!--Log viewer-->
     <string name="logviewer_share">Поделиться логами</string>
     <string name="logviewer_refresh">Обновить</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Уроки</string>
+    <string name="dashboard_timetable_title_tomorrow">(Завтра)</string>
+    <string name="dashboard_timetable_lesson_value">%1$s (%2$s)</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_now">Сейчас:</string>
+    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
+        <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="dashboard_timetable_first_lesson_time_more_minutes">
+        <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_second_lesson_value_end">Окончание уроков</string>
+    <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>
+    </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_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="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_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_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>
+    </plurals>
+    <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>
+    </plurals>
+    <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>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">Произошла ошибка при загрузке данных</string>
+    <string name="dashboard_horizontal_group_no_lukcy_number">Отсутствует</string>
     <!--Error dialog-->
     <string name="dialog_error_check_update">Проверить наличие обновлений</string>
     <string name="dialog_error_check_update_message">Прежде чем сообщать об ошибке, проверьте наличие обновлений</string>
@@ -454,7 +608,6 @@
     <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_timetable_show_whole_class">Показать уроки всего класса</string>
     <string name="pref_view_subjects_without_grades">Показать предметы без оценок</string>
     <string name="pref_view_grade_color_scheme">Схема цветов оценок</string>
     <string name="pref_view_grade_sorting_mode">Сортировка уроков</string>
@@ -462,6 +615,7 @@
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
     <string name="pref_notify_upcoming_lessons_switch">Показывать уведомления о будущих уроках</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_settings_button">Перейти в настройски</string>
@@ -476,14 +630,18 @@
     <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_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_settings_advanced_title">Расширенные</string>
     <string name="pref_settings_appearance_title">Внешний вид &amp; Поведение</string>
     <string name="pref_settings_notifications_title">Уведомления</string>
     <string name="pref_settings_sync_title">Синхронизация</string>
     <string name="pref_grades_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>
@@ -498,18 +656,17 @@
     <string name="pref_advanced_category">Расширенные</string>
     <string name="pref_about_category_summary">Версия приложения, участники, социальные порталы, лицензии</string>
     <!--Notification Channels-->
-    <string name="channel_new_entries">Новые данные в дневнике</string>
     <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_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>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Конец поддержки</string>
-    <string name="drop_kitkat_content">Поддержка заканчивается на вашем устройстве. В Wulkanowy больше не появятся новые возможности. Однако до конца 2021 года мы выпустим критические патчи, чтобы у вас было время перейти на новую модель</string>
-    <string name="drop_kitkat_again">Не показывать снова</string>
     <!--Colors-->
     <string name="all_black">Чёрный</string>
     <string name="all_red">Красный</string>
@@ -520,6 +677,7 @@
     <!--Others-->
     <string name="all_copied">Скопировано</string>
     <string name="all_undo">Отменить</string>
+    <string name="all_change">Изменить</string>
     <!--Update helper-->
     <string name="update_download_started">Загрузка обновлений началась…</string>
     <string name="update_download_success">Только что было скачано обновление.</string>
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
index b0ba9839c..108af555d 100644
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@@ -45,9 +45,15 @@
         <item>Priemer známok z oboch semestrov</item>
         <item>Priemer známok z celého roka</item>
     </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Nezobrazovať</item>
-        <item>Zobraziť všetko</item>
-        <item>Zobraziť menšie</item>
+    <string-array name="dashboard_tile_entries">
+        <item>Šťastné číslo</item>
+        <item>Neprečítané správy</item>
+        <item>Dochádzka</item>
+        <item>Lekcie</item>
+        <item>Známky</item>
+        <item>Domáce úlohy</item>
+        <item>Školské oznámenia</item>
+        <item>Skúšky</item>
+        <item>Stretnutie</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8a5b8d242..72899b78b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -11,6 +11,8 @@
     <string name="more_title">Viac</string>
     <string name="about_title">O aplikácii</string>
     <string name="logviewer_title">Prehliadač protokolov</string>
+    <string name="debug_title">Ladenie</string>
+    <string name="notification_debug_title">Ladenie oznámení</string>
     <string name="contributors_title">Prispievatelia</string>
     <string name="license_title">Licencie</string>
     <string name="message_title">Správy</string>
@@ -21,6 +23,7 @@
     <string name="account_quick_title">Vyberte účet</string>
     <string name="account_details_title">Podrobnosti účtu</string>
     <string name="student_info_title">Informácie o žiakovi</string>
+    <string name="dashboard_title">Domov</string>
     <!--Subtitles-->
     <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
     <!--Login-->
@@ -36,7 +39,6 @@
     <string name="login_type_hybrid">Hybridné</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">Kľúč API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Prihlásiť</string>
     <string name="login_invalid_password">Toto heslo je príliš krátke</string>
@@ -62,7 +64,6 @@
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Poslať e-mail</string>
-    <string name="login_email_details">Opíšte podrobnosti problému:</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_title">Obnovte svoj účet</string>
@@ -81,18 +82,16 @@
     <string name="grade_weight">Váha</string>
     <string name="grade_weight_value">Váha: %s</string>
     <string name="grade_comment">Komentár</string>
-    <string name="grade_no_new_items">Žiadne nové známky</string>
     <string name="grade_number_new_items">Počet nových známok %1$d</string>
     <string name="grade_average">Priemer: %1$.2f</string>
     <string name="grade_points_sum">Body: %s</string>
     <string name="grade_no_average">Bez priemeru</string>
-    <string name="grade_predicted">Predpokladaná: %1$s</string>
-    <string name="grade_final">Konečná: %1$s</string>
     <string name="grade_summary_points">Súčet bodov</string>
     <string name="grade_summary_final_grade">Konečná známka</string>
     <string name="grade_summary_predicted_grade">Predpokladaná známka</string>
     <string name="grade_summary_calculated_average">Vypočítaný priemer</string>
     <string name="grade_summary_final_average">Konečný priemer</string>
+    <string name="grade_summary_from_subjects">z %1$d z %2$d predmetov</string>
     <string name="grade_menu_summary">Zhrnutie</string>
     <string name="grade_menu_statistics">Trieda</string>
     <string name="grade_menu_read">Označiť ako prečítané</string>
@@ -184,31 +183,41 @@
     <string name="attendance_unknown">Neznámy</string>
     <string name="attendance_number">Číslo lekcie</string>
     <string name="attendance_no_items">Žiadne položky</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d neprítomnosť</item>
-        <item quantity="few">%1$d neprítomnosti</item>
-        <item quantity="many">%1$d neprítomnosti</item>
-        <item quantity="other">%1$d neprítomnosti</item>
-    </plurals>
     <string name="attendance_excuse_dialog_reason">Dôvod neprítomnosti (voliteľný)</string>
     <string name="attendance_excuse_dialog_submit">Poslať</string>
     <string name="attendance_excuse_success">Žiadosť o ospravedlnenie neprítomnosti bola úspešne odoslaná!</string>
     <string name="attendance_excuse_no_selection">Musíte vybrať aspoň jednu neprítomnosť!</string>
     <string name="attendance_excuse_title">Ospravedlniť</string>
     <!--Attendance summary-->
-    <string name="attendance_summary_final">Dochádzka</string>
     <string name="attendance_summary_total">Spoločne</string>
     <!--Exam-->
     <string name="exam_no_items">Tento týždeň žiadne testy</string>
     <string name="exam_type">Typ</string>
     <string name="exam_entry_date">Dátum vstupu</string>
+    <plurals name="exam_notify_new_item_title">
+        <item quantity="one">Nová skúška</item>
+        <item quantity="few">Nové skúšky</item>
+        <item quantity="many">Nové skúšky</item>
+        <item quantity="other">Nové skúšky</item>
+    </plurals>
+    <plurals name="exam_notify_new_item_content">
+        <item quantity="one">Máte %d novú skúšku</item>
+        <item quantity="few">Máte %d nové skúšky</item>
+        <item quantity="many">Máte %d nových skúšok</item>
+        <item quantity="other">Máte %d nových skúšok</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d skúška</item>
+        <item quantity="few">%d skúšky</item>
+        <item quantity="many">%d skúšok</item>
+        <item quantity="other">%d skúšok</item>
+    </plurals>
     <!--Message-->
-    <string name="message_inbox">Doručená pošta</string>
+    <string name="message_inbox">Doručené</string>
     <string name="message_sent">Odoslané</string>
     <string name="message_trash">Kôš</string>
     <string name="message_no_subject">(žiadny predmet)</string>
     <string name="message_no_items">Žiadne správy</string>
-    <string name="message_preview_error">Pri sťahovaní obsahu správy došlo k chybe</string>
     <string name="message_from">Od:</string>
     <string name="message_to">Komu:</string>
     <string name="message_date">Dátum: %s</string>
@@ -226,6 +235,15 @@
     <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_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>
+    <plurals name="message_read_by">
+        <item quantity="one">Prečítaná cez: %1$d z %2$d osôb</item>
+        <item quantity="few">Prečítaná cez: %1$d z %2$d osôb</item>
+        <item quantity="many">Prečítaná cez: %1$d z %2$d osôb</item>
+        <item quantity="other">Prečítaná cez: %1$d z %2$d osôb</item>
+    </plurals>
     <plurals name="message_number_item">
         <item quantity="one">%d správa</item>
         <item quantity="few">%d správy</item>
@@ -238,6 +256,8 @@
         <item quantity="many">Nové správy</item>
         <item quantity="other">Nové správy</item>
     </plurals>
+    <string name="message_restore_dialog">Chcete obnoviť koncept správy?</string>
+    <string name="message_restore_dialog_with_recipients">Chcete obnoviť koncept správy s príjemcami:%s?</string>
     <plurals name="message_notify_new_items">
         <item quantity="one">Máte %1$d novú správu</item>
         <item quantity="few">Máte %1$d nové správy</item>
@@ -308,12 +328,30 @@
     <string name="homework_mark_as_done">Označiť ako hotové</string>
     <string name="homework_mark_as_undone">Nevyrobené</string>
     <string name="homework_attachments">Prílohy</string>
+    <plurals name="homework_notify_new_item_title">
+        <item quantity="one">Nový domáci úloh</item>
+        <item quantity="few">Nové domáce úlohy</item>
+        <item quantity="many">Nové domáce úlohy</item>
+        <item quantity="other">Nové domáce úlohy</item>
+    </plurals>
+    <plurals name="homework_notify_new_item_content">
+        <item quantity="one">Máte %d novú domácu úlohu</item>
+        <item quantity="few">Máte %d nové domáce úlohy</item>
+        <item quantity="many">Máte %d nových domácich úloh</item>
+        <item quantity="other">Máte %d nových domácich úloh</item>
+    </plurals>
+    <plurals name="homework_number_item">
+        <item quantity="one">%d domáci úloh</item>
+        <item quantity="few">%d domáce úlohy</item>
+        <item quantity="many">%d domácich úloh</item>
+        <item quantity="other">%d domácich úloh</item>
+    </plurals>
     <!--Lucky number-->
     <string name="lucky_number_title">Šťastné číslo</string>
     <string name="lucky_number_header">Dnešné šťastné číslo je</string>
     <string name="lucky_number_empty">Žiadne informácie o šťastnom čísle</string>
     <string name="lucky_number_notify_new_item_title">Šťastné číslo pre dnešok</string>
-    <string name="lucky_number_notify_new_item">Dnes je šťastným číslom: %d</string>
+    <string name="lucky_number_notify_new_item">Dnešné šťastné číslo je: %s</string>
     <string name="lucky_number_history_button">Zobraziť históriu</string>
     <!--Lucky number history-->
     <string name="lucky_number_history_title">História šťastných čísel</string>
@@ -346,6 +384,45 @@
     <!--Conference-->
     <string name="conferences_title">Stretnutie</string>
     <string name="conference_no_items">Žiadne informácie o stretnutiach</string>
+    <plurals name="conference_number_item">
+        <item quantity="one">%d stretnutie</item>
+        <item quantity="few">%d stretnutia</item>
+        <item quantity="many">%d stretnutí</item>
+        <item quantity="other">%d stretnutí</item>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <item quantity="one">Nové stretnutie</item>
+        <item quantity="few">Nová stretnutia</item>
+        <item quantity="many">Nová stretnutia</item>
+        <item quantity="other">Nová stretnutia</item>
+    </plurals>
+    <plurals name="conference_notify_new_items">
+        <item quantity="one">Máte %1$d nové stretnutie</item>
+        <item quantity="few">Máte %1$d nové stretnutia</item>
+        <item quantity="many">Máte %1$d nových stretnutí</item>
+        <item quantity="other">Máte %1$d nových stretnutí</item>
+    </plurals>
+    <!--Director information-->
+    <string name="school_announcement_title">Školské oznámenia</string>
+    <string name="school_announcement_no_items">Žiadne školské oznámenia</string>
+    <plurals name="school_announcement_number_item">
+        <item quantity="one">%d školské oznámenie</item>
+        <item quantity="few">%d školské oznámenia</item>
+        <item quantity="many">%d školských oznámení</item>
+        <item quantity="other">%d školských oznámení</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_item_title">
+        <item quantity="one">Nové školské oznámenie</item>
+        <item quantity="few">Nové školské oznámenia</item>
+        <item quantity="many">Nové školské oznámenia</item>
+        <item quantity="other">Nové školské oznámenia</item>
+    </plurals>
+    <plurals name="school_announcement_notify_new_items">
+        <item quantity="one">Máte %1$d nové školské oznámenie</item>
+        <item quantity="few">Máte %1$d nové školské oznámenia</item>
+        <item quantity="many">Máte %1$d nových školských oznámení</item>
+        <item quantity="other">Máte %1$d nových školských oznámení</item>
+    </plurals>
     <!--Account-->
     <string name="account_add_new">Pridať účet</string>
     <string name="account_logout">Odhlásiť</string>
@@ -353,8 +430,6 @@
     <string name="account_logout_student">Odhlásenie žiakov</string>
     <string name="account_type_student">Zakov účet</string>
     <string name="account_type_parent">Rodičovský účet</string>
-    <string name="account_login_mobile_api">Režim Mobilného API</string>
-    <string name="account_login_hybrid">Hybridný režim</string>
     <string name="account_details_edit">Upraviť dáta</string>
     <string name="account_quick_manager">Manažér účtov</string>
     <string name="account_select_student">Vyberte žiaka</string>
@@ -373,9 +448,13 @@
     <string name="about_discord">Server Discord</string>
     <string name="about_discord_summary">Pripojte sa ku komunite Wulkanového</string>
     <string name="about_facebook">Facebooková fanpage</string>
+    <string name="about_twitter">Twitter stránka</string>
+    <string name="about_twitter_summary">Sledujte nás na Twitteri</string>
     <string name="about_facebook_summary">Rovnako ako naše facebooková fanpage</string>
     <string name="about_privacy">Zásady ochrany osobných údajov</string>
     <string name="about_privacy_summary">Pravidlá pre zhromažďovanie osobných údajov</string>
+    <string name="about_system">Systémové nastavenia</string>
+    <string name="about_system_summary">Otvoriť systémové nastavenia</string>
     <string name="about_homepage">Domovská stránka</string>
     <string name="about_homepage_summary">Navštívte stránku a pomôžte s vývojom aplikácie</string>
     <string name="about_licenses">Licencie</string>
@@ -406,6 +485,7 @@
     <string name="student_info_male">Muž</string>
     <string name="student_info_female">Žena</string>
     <string name="student_info_last_name">Priezvisko</string>
+    <string name="student_info_guardian">Opatrovník</string>
     <!--Account edit-->
     <string name="account_edit_nick_hint">Prezývka</string>
     <string name="account_edit_header">Pridať prezývku</string>
@@ -413,6 +493,80 @@
     <!--Log viewer-->
     <string name="logviewer_share">Zdieľať protokoly</string>
     <string name="logviewer_refresh">Obnoviť</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Lekcie</string>
+    <string name="dashboard_timetable_title_tomorrow">(Zajtra)</string>
+    <string name="dashboard_timetable_lesson_value">%1$s (%2$s)</string>
+    <string name="dashboard_timetable_first_lesson_title_moment">Za chvíľu:</string>
+    <string name="dashboard_timetable_first_lesson_title_soon">Čoskoro:</string>
+    <string name="dashboard_timetable_first_lesson_title_first">Prvá:</string>
+    <string name="dashboard_timetable_first_lesson_title_now">Teraz:</string>
+    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
+        <item quantity="one">za %1$d minútu</item>
+        <item quantity="few">za %1$d minúty</item>
+        <item quantity="many">za %1$d minút</item>
+        <item quantity="other">za %1$d minút</item>
+    </plurals>
+    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
+        <item quantity="one">ešte %1$d minútu</item>
+        <item quantity="few">ešte %1$d minúty</item>
+        <item quantity="many">ešte %1$d minút</item>
+        <item quantity="other">ešte %1$d minút</item>
+    </plurals>
+    <string name="dashboard_timetable_second_lesson_value_end">Koniec lekcií</string>
+    <string name="dashboard_timetable_second_lessons_title">Ďalej:</string>
+    <string name="dashboard_timetable_third_title">Neskôr:</string>
+    <plurals name="dashboard_timetable_third_value">
+        <item quantity="one">ešte %1$d ďalší lekcia</item>
+        <item quantity="few">ešte %1$d ďalšie lekcie</item>
+        <item quantity="many">ešte %1$d ďalších lekcií</item>
+        <item quantity="other">ešte %1$d ďalších lekcií</item>
+    </plurals>
+    <string name="dashboard_timetable_third_time">do %1$s</string>
+    <string name="dashboard_timetable_no_lessons">Žiadne nadchádzajúce lekcie</string>
+    <string name="dashboard_timetable_error">Pri načítaní lekcií došlo k chybe</string>
+    <string name="dashboard_homework_title">Domáce úlohy</string>
+    <string name="dashboard_homework_no_homework">Žiadne domáce úlohy do vykonaná</string>
+    <string name="dashboard_homework_error">Pri načítaní domácich úloh došlo k chybe</string>
+    <plurals name="dashboard_homework_more">
+        <item quantity="one">Ešte %1$d ďalšia domáca úloha</item>
+        <item quantity="few">Ešte %1$d ďalšie domáce úlohy</item>
+        <item quantity="many">Ešte %1$d ďalších domácich úloh</item>
+        <item quantity="other">Ešte %1$d ďalších domácich úloh</item>
+    </plurals>
+    <string name="dashboard_homework_time">do %1$s</string>
+    <string name="dashboard_grade_title">Posledné známky</string>
+    <string name="dashboard_grade_no_grade">Žiadne nové známky</string>
+    <string name="dashboard_grade_error">Pri načítaní známok došlo k chybe</string>
+    <string name="dashboard_announcements_title">Školské oznámenia</string>
+    <string name="dashboard_announcements_no_announcements">Žiadne aktuálne oznámenia</string>
+    <string name="dashboard_announcements_error">Pri načítaní oznámení došlo k chybe</string>
+    <plurals name="dashboard_announcements_more">
+        <item quantity="one">Ešte %1$d ďalšie oznámenie</item>
+        <item quantity="few">Ešte %1$d ďalšie oznámenia</item>
+        <item quantity="many">Ešte %1$d ďalších oznámení</item>
+        <item quantity="other">Ešte %1$d ďalších oznámení</item>
+    </plurals>
+    <string name="dashboard_exams_title">Skúšky</string>
+    <string name="dashboard_exams_no_exams">Žiadne nadchádzajúce skúšky</string>
+    <string name="dashboard_exams_error">Pri načítaní skúšok došlo k chybe</string>
+    <plurals name="dashboard_exams_more">
+        <item quantity="one">Ešte %1$d ďalšia skúška</item>
+        <item quantity="few">Ešte %1$d ďalšie skúšky</item>
+        <item quantity="many">Ešte %1$d ďalších skúšok</item>
+        <item quantity="other">Ešte %1$d ďalších skúšok</item>
+    </plurals>
+    <string name="dashboard_conferences_title">Stretnutie</string>
+    <string name="dashboard_conferences_no_conferences">Žiadna nadchádzajúce stretnutie</string>
+    <string name="dashboard_conferences_error">Pri načítaní stretnutí došlo k chybe</string>
+    <plurals name="dashboard_conference_more">
+        <item quantity="one">Ešte %1$d ďalšie stretnutie</item>
+        <item quantity="few">Ešte %1$d ďalšie stretnutia</item>
+        <item quantity="many">Ešte %1$d ďalších stretnutí</item>
+        <item quantity="other">Ešte %1$d ďalších stretnutí</item>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">Pri načítaní dát došlo k chybe</string>
+    <string name="dashboard_horizontal_group_no_lukcy_number">Žiadne</string>
     <!--Error dialog-->
     <string name="dialog_error_check_update">Skontrolovať aktualizácie</string>
     <string name="dialog_error_check_update_message">Pred hlásením chyby skontrolujte, či je k dispozícii aktualizácia s opravou chýb</string>
@@ -454,7 +608,6 @@
     <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_grade_statistics_list">Zobraziť zoznam grafov v známkach triedy</string>
-    <string name="pref_view_timetable_show_whole_class">Zobraziť lekcie pre celú triedu</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>
     <string name="pref_view_grade_sorting_mode">Triedenie predmetov</string>
@@ -462,6 +615,7 @@
     <string name="pref_notify_header">Upozornenia</string>
     <string name="pref_notify_switch">Zobraziť upozornenia</string>
     <string name="pref_notify_upcoming_lessons_switch">Zobraziť upozornenia o nadchádzajúcej lekciu</string>
+    <string name="pref_notify_open_system_settings">Otvoriť systémové nastavenia upozornení</string>
     <string name="pref_notify_fix_sync_issues">Opravte problémy so synchronizáciou a upozornením</string>
     <string name="pref_notify_fix_sync_issues_message">Vaše zariadenie môže mať problémy so synchronizáciou dát as upozorneniami.\n\nAk ich chcete opraviť, pridajte Wulkanového do funkcie Autostart a vypnite optimalizáciu/úsporu batérie v nastavení systému telefóne.</string>
     <string name="pref_notify_fix_sync_issues_settings_button">Prejsť do nastavení</string>
@@ -476,14 +630,18 @@
     <string name="pref_services_message_sync_success">Synchronizovano!</string>
     <string name="pref_services_message_sync_failed">Synchronizácia zlyhala</string>
     <string name="pref_services_sync_in_progress">Prebieha synchronizácia</string>
+    <string name="pref_services_last_full_sync_date">Posledná úplná synchronizácia: %s</string>
     <string name="pref_other_grade_modifier_plus">Hodnota plusu</string>
     <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_settings_advanced_title">Pokročilé</string>
     <string name="pref_settings_appearance_title">Vzhľad a správanie</string>
     <string name="pref_settings_notifications_title">Upozornenia</string>
     <string name="pref_settings_sync_title">Synchronizácia</string>
     <string name="pref_grades_appearance_header">Známky</string>
+    <string name="pref_dashboard_appearance_header">Domov</string>
+    <string name="pref_dashboard_appearance_tiles_title">Viditeľnosť dlaždíc</string>
     <string name="pref_attendance_appearance_view">Dochádzka</string>
     <string name="pref_timetable_appearance_view">Plán lekcie</string>
     <string name="pref_grades_advanced_header">Známky</string>
@@ -498,28 +656,28 @@
     <string name="pref_advanced_category">Pokročilé</string>
     <string name="pref_about_category_summary">Verzia aplikácie, prispievatelia, sociálne portály, licencie</string>
     <!--Notification Channels-->
-    <string name="channel_new_entries">Nové položky v denníku</string>
     <string name="channel_new_grades">Nové známky</string>
+    <string name="channel_new_homework">Nové domáce úlohy</string>
+    <string name="channel_new_conference">Nová stretnutia</string>
+    <string name="channel_new_exam">Nové skúšky</string>
     <string name="channel_lucky_number">Šťastné číslo</string>
     <string name="channel_new_message">Nové správy</string>
     <string name="channel_new_notes">Nové poznámky</string>
+    <string name="channel_new_school_announcement">Nové školské oznámenia</string>
     <string name="channel_push">Push upozornenia</string>
     <string name="channel_upcoming_lessons">Nadchádzajúce lekcie</string>
     <string name="channel_debug">Ladenie</string>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Koniec podpory</string>
-    <string name="drop_kitkat_content">Ukončujeme podporu pre vaše zariadenie. V Wulkanovým už pre neho nebudú žiadne nové funkcie. Kritické opravy však budeme vydávať až do konca roka 2021, aby ste mali čas prejsť na novší model</string>
-    <string name="drop_kitkat_again">Nezobrazovať znovu</string>
     <!--Colors-->
-    <string name="all_black">Čierny</string>
-    <string name="all_red">Červený</string>
-    <string name="all_blue">Modrý</string>
-    <string name="all_green">Zelený</string>
-    <string name="all_purple">Fialový</string>
+    <string name="all_black">Čierna</string>
+    <string name="all_red">Červená</string>
+    <string name="all_blue">Modrá</string>
+    <string name="all_green">Zelená</string>
+    <string name="all_purple">Fialová</string>
     <string name="all_empty_color">Žiadna farba</string>
     <!--Others-->
     <string name="all_copied">Skopírované</string>
     <string name="all_undo">Vrátiť</string>
+    <string name="all_change">Zmeniť</string>
     <!--Update helper-->
     <string name="update_download_started">Sťahovanie aktualizácií začalo…</string>
     <string name="update_download_success">Aktualizácia bola stiahnutá.</string>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index d0891925d..f6f5b984f 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -45,9 +45,15 @@
         <item>Середнє оцінювання за обидва семестри</item>
         <item>Середнє оцінювання за весь рік</item>
     </string-array>
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Не показувати</item>
-        <item>Показати все</item>
-        <item>Показати менше</item>
+    <string-array name="dashboard_tile_entries">
+        <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 2e0b89da6..4850e2396 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -11,6 +11,8 @@
     <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="contributors_title">Розробники</string>
     <string name="license_title">Ліцензії</string>
     <string name="message_title">Повідомлення</string>
@@ -21,6 +23,7 @@
     <string name="account_quick_title">Виберіть обліковий запис</string>
     <string name="account_details_title">Деталі облікового запису</string>
     <string name="student_info_title">Інформація про учня</string>
+    <string name="dashboard_title">Дошка</string>
     <!--Subtitles-->
     <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
     <!--Login-->
@@ -36,7 +39,6 @@
     <string name="login_type_hybrid">Hybrid</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">Ключ API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Увійти</string>
     <string name="login_invalid_password">Занадто короткий пароль</string>
@@ -62,7 +64,6 @@
     <string name="login_contact_email">Електронна пошта</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Відправити лист</string>
-    <string name="login_email_details">Опишіть деталі помилки:</string>
     <string name="login_recover_warning">Переконайтеся, що ви вибрали правильний варіант реєстрації UONET+!</string>
     <string name="login_recover_button">Забули пароль?</string>
     <string name="login_recover_title">Відновіть свій обліковий запис</string>
@@ -81,18 +82,16 @@
     <string name="grade_weight">Вартість</string>
     <string name="grade_weight_value">Вартість: %s</string>
     <string name="grade_comment">Коментар</string>
-    <string name="grade_no_new_items">Нові оцінки відсутні</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_predicted">Очікувана оцінка: %1$s</string>
-    <string name="grade_final">Підсумкова оцінка: %1$s</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_final_average">Підсумкова середня оцінка</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>
@@ -184,31 +183,41 @@
     <string name="attendance_unknown">Невідомо</string>
     <string name="attendance_number">Номер уроку</string>
     <string name="attendance_no_items">Брак записів</string>
-    <plurals name="attendance_number_absences">
-        <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="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>
     <!--Attendance summary-->
-    <string name="attendance_summary_final">Відвідуваність</string>
     <string name="attendance_summary_total">Загальна</string>
     <!--Exam-->
     <string name="exam_no_items">Брак тестів у цьому тижні</string>
     <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>
+    </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>
+    </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>
+    </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_preview_error">З\'явилася помилка підчас завантаження змісту повідомлення</string>
     <string name="message_from">Від:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %s</string>
@@ -226,6 +235,15 @@
     <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_only_unread">Лише непрочитані</string>
+    <string name="message_chip_only_with_attachments">Тільки з вкладеннями</string>
+    <string name="message_read">Читання: %s</string>
+    <plurals name="message_read_by">
+        <item quantity="one">Прочитані: %1$d з %2$d осіб</item>
+        <item quantity="few">Прочитані: %1$d з %2$d осіб</item>
+        <item quantity="many">Прочитані: %1$d з %2$d осіб</item>
+        <item quantity="other">Прочитані: %1$d з %2$d осіб</item>
+    </plurals>
     <plurals name="message_number_item">
         <item quantity="one">%d повідомлення</item>
         <item quantity="few">%d повідомлення</item>
@@ -238,6 +256,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>
     <plurals name="message_notify_new_items">
         <item quantity="one">Ви отримали %1$d нове повідомлення</item>
         <item quantity="few">Ви отримали %1$d нових повідомлення</item>
@@ -308,12 +328,30 @@
     <string name="homework_mark_as_done">Позначити як зроблене</string>
     <string name="homework_mark_as_undone">Позначити як не зроблене</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>
+    </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>
+    </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>
+    </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_notify_new_item_title">Сьогоднішній щасливий номер</string>
-    <string name="lucky_number_notify_new_item">Сьогоднішнім щасливим номером є %d</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>
@@ -346,6 +384,45 @@
     <!--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>
+    </plurals>
+    <plurals name="conference_notify_new_item_title">
+        <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>
+    </plurals>
+    <!--Director information-->
+    <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">Оголошення нової школи</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>
+    </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>
+    </plurals>
     <!--Account-->
     <string name="account_add_new">Додати аккаунт</string>
     <string name="account_logout">Вийти</string>
@@ -353,8 +430,6 @@
     <string name="account_logout_student">Вийти з аккаунту учня</string>
     <string name="account_type_student">Студентський рахунок</string>
     <string name="account_type_parent">Головний рахунок</string>
-    <string name="account_login_mobile_api">Режим мобільного API</string>
-    <string name="account_login_hybrid">Гібридний режим</string>
     <string name="account_details_edit">Редагувати дані</string>
     <string name="account_quick_manager">Менеджер аккаунтів</string>
     <string name="account_select_student">Виберіть учня</string>
@@ -373,9 +448,13 @@
     <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_twitter_summary">Стежте за нами у Твіттері</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_licenses">Ліцензії</string>
@@ -406,6 +485,7 @@
     <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-->
     <string name="account_edit_nick_hint">Псевдонім</string>
     <string name="account_edit_header">Додати псевдонім</string>
@@ -413,6 +493,80 @@
     <!--Log viewer-->
     <string name="logviewer_share">Поділитися логами</string>
     <string name="logviewer_refresh">Оновити</string>
+    <!--Dashboard-->
+    <string name="dashboard_timetable_title">Уроки</string>
+    <string name="dashboard_timetable_title_tomorrow">(Завтра)</string>
+    <string name="dashboard_timetable_lesson_value">%1$s (%2$s)</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_now">Зараз:</string>
+    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
+        <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="dashboard_timetable_first_lesson_time_more_minutes">
+        <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_second_lesson_value_end">Кінець уроків</string>
+    <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>
+    </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_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="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_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_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>
+    </plurals>
+    <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>
+    </plurals>
+    <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>
+    </plurals>
+    <string name="dashboard_horizontal_group_error">Помилка при завантаженні даних</string>
+    <string name="dashboard_horizontal_group_no_lukcy_number">Нічого</string>
     <!--Error dialog-->
     <string name="dialog_error_check_update">Провірити наявність оновлень</string>
     <string name="dialog_error_check_update_message">Перед тим, як повідомлювати о помілці, перевірте наявність оновлень</string>
@@ -454,7 +608,6 @@
     <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_timetable_show_whole_class">Показати уроки всього класу</string>
     <string name="pref_view_subjects_without_grades">Показати предмети без оцінок</string>
     <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>
     <string name="pref_view_grade_sorting_mode">Сортування предметів</string>
@@ -462,6 +615,7 @@
     <string name="pref_notify_header">Повідомлення</string>
     <string name="pref_notify_switch">Показувати повідомлення</string>
     <string name="pref_notify_upcoming_lessons_switch">Показувати повідомлення о наступних уроках</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_settings_button">Перейти до налаштувань</string>
@@ -476,14 +630,18 @@
     <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_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_settings_advanced_title">Додатково</string>
     <string name="pref_settings_appearance_title">Вигляд &amp; Поведінка</string>
     <string name="pref_settings_notifications_title">Повідомлення</string>
     <string name="pref_settings_sync_title">Синхронізація</string>
     <string name="pref_grades_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>
@@ -498,18 +656,17 @@
     <string name="pref_advanced_category">Додатково</string>
     <string name="pref_about_category_summary">Версія програми, учасники, соціальні портали, ліцензії</string>
     <!--Notification Channels-->
-    <string name="channel_new_entries">Нові дані в щоденнику</string>
     <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_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>
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">Кінець підтримки</string>
-    <string name="drop_kitkat_content">Ми завершуємо підтримку вашого пристрою. Більше нових функцій не з\'явиться у Wulkanowy. Однак ми виробляємо критичні патчі до кінця 2021, тому у вас буде час перейти на новішу модель</string>
-    <string name="drop_kitkat_again">Не показувати знову</string>
     <!--Colors-->
     <string name="all_black">Чорний</string>
     <string name="all_red">Червоний</string>
@@ -520,6 +677,7 @@
     <!--Others-->
     <string name="all_copied">Скопійовано</string>
     <string name="all_undo">Відмінити</string>
+    <string name="all_change">Змінити</string>
     <!--Update helper-->
     <string name="update_download_started">Завантаження оновлень розпочато…</string>
     <string name="update_download_success">Щойно завантажено оновлення.</string>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 6b7c7890c..000000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="WulkanowyTheme" parent="BaseWulkanowyTheme">
-        <item name="android:statusBarColor">@android:color/darker_gray</item>
-    </style>
-
-    <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
-        <item name="android:windowBackground">@drawable/layer_splash_background</item>
-        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b2e0dcef1..a68e2710f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -24,7 +24,7 @@
     <color name="note_positive">#a0c431</color>
     <color name="note_negative">#d43f3f</color>
 
-    <color name="grade_black">#424242</color>
+    <color name="grade_black">#1C1C1C</color>
     <color name="grade_red">#d43f3f</color>
     <color name="grade_blue">#49a6f2</color>
     <color name="grade_green">#a0c431</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index a4bf80ed6..000000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!--BottomNav-->
-    <dimen name="bottom_navigation_margin_top_active" tools:override="true">8dp</dimen>
-    <dimen name="bottom_navigation_margin_top_inactive" tools:override="true">8dp</dimen>
-</resources>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index fb82e0ed6..1ba9359cd 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -24,4 +24,14 @@
     <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>
+    <string-array name="pref_default_dashboard_tiles">
+        <item>LUCKY_NUMBER</item>
+        <item>MESSAGES</item>
+        <item>ATTENDANCE</item>
+        <item>LESSONS</item>
+        <item>GRADES</item>
+        <item>ANNOUNCEMENTS</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index 0cfa485e3..09dac7002 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="pref_key_start_menu">start_menu</string>
+    <string name="pref_key_start_menu">default_menu_index</string>
     <string name="pref_key_attendance_present">attendance_present</string>
     <string name="pref_key_app_theme">app_theme</string>
+    <string name="pref_key_dashboard_tiles">dashboard_tiles</string>
     <string name="pref_key_grade_color_scheme">grade_color_scheme</string>
     <string name="pref_key_expand_grade">expand_grade</string>
     <string name="pref_key_grade_average_mode">grade_average_mode</string>
@@ -14,6 +15,7 @@
     <string name="pref_key_services_wifi_only">services_disable_wifi_only</string>
     <string name="pref_key_services_force_sync">services_force_sync</string>
     <string name="pref_key_notifications_fix_issues">notifications_fix_issues</string>
+    <string name="pref_key_notifications_system_settings">notifications_system_settings</string>
     <string name="pref_key_notifications_enable">notifications_enable</string>
     <string name="pref_key_notifications_upcoming_lessons_enable">notifications_upcoming_lessons_enable</string>
     <string name="pref_key_notification_debug">notification_debug</string>
@@ -26,4 +28,8 @@
     <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_send_is_draft">message_send_is_draft</string>
+    <string name="pref_key_message_send_draft">message_send_recipients</string>
+    <string name="pref_key_last_sync_date">last_sync_date</string>
 </resources>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 44f54c170..9c1a0421a 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string-array name="startup_tab_entries" translatable="false">
+        <item>@string/dashboard_title</item>
         <item>@string/grade_title</item>
         <item>@string/attendance_title</item>
-        <item>@string/exam_title</item>
         <item>@string/timetable_title</item>
     </string-array>
     <string-array name="startup_tab_value" translatable="false">
@@ -110,14 +110,26 @@
         <item>all_year</item>
     </string-array>
 
-    <string-array name="timetable_show_whole_class_entries">
-        <item>Don\'t show</item>
-        <item>Show all</item>
-        <item>Show smaller</item>
+    <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>
-    <string-array name="timetable_show_whole_class_values" translatable="false">
-        <item>no</item>
-        <item>yes</item>
-        <item>small</item>
+    <string-array name="dashboard_tile_values" translatable="false">
+        <item>LUCKY_NUMBER</item>
+        <item>MESSAGES</item>
+        <item>ATTENDANCE</item>
+        <item>LESSONS</item>
+        <item>GRADES</item>
+        <item>HOMEWORK</item>
+        <item>ANNOUNCEMENTS</item>
+        <item>EXAMS</item>
+        <item>CONFERENCES</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4109d2b8..08776c1ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,8 @@
     <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>
@@ -21,6 +23,7 @@
     <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>
 
 
     <!--Subtitles-->
@@ -40,7 +43,6 @@
     <string name="login_type_hybrid">Hybrid</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">API key</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>
@@ -66,7 +68,6 @@
     <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_email_details">Describe details of problem:</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\nOpis problemu: </string>
     <string name="login_recover_warning">Make sure you select the correct UONET+ register variation!</string>
@@ -91,18 +92,16 @@
     <string name="grade_weight">Weight</string>
     <string name="grade_weight_value">Weight: %s</string>
     <string name="grade_comment">Comment</string>
-    <string name="grade_no_new_items">No new grades</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_predicted">Predicted: %1$s</string>
-    <string name="grade_final">Final: %1$s</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_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>
@@ -188,19 +187,16 @@
     <string name="attendance_unknown">Unknown</string>
     <string name="attendance_number">Number of lesson</string>
     <string name="attendance_no_items">No entries</string>
-    <plurals name="attendance_number_absences">
-        <item quantity="one">%1$d absence</item>
-        <item quantity="other">%1$d absences</item>
-    </plurals>
     <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>
+    <string name="attendance_excuse_reason" translatable="false">z powodu</string>
+    <string name="attendance_excuse_formula" translatable="false">Dzień dobry,\nProszę o usprawiedliwienie mojego dziecka w dniu %s z lekcji %s%s%s.\n\nPozdrawiam.</string>
 
 
     <!--Attendance summary-->
-    <string name="attendance_summary_final">Attendance</string>
     <string name="attendance_summary_total">Total</string>
 
 
@@ -208,6 +204,18 @@
     <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">You received %d new exam</item>
+        <item quantity="other">You received %d new exams</item>
+    </plurals>
+    <plurals name="exam_number_item">
+        <item quantity="one">%d exam</item>
+        <item quantity="other">%d exams</item>
+    </plurals>
 
 
     <!--Message-->
@@ -216,7 +224,6 @@
     <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_preview_error">An error occurred while downloading message content</string>
     <string name="message_from">From:</string>
     <string name="message_to">To:</string>
     <string name="message_date">Date: %s</string>
@@ -234,6 +241,13 @@
     <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_read_by">
+        <item quantity="one">Read by: %1$d of %2$d people</item>
+        <item quantity="other">Read by: %1$d of %2$d people</item>
+    </plurals>
     <plurals name="message_number_item">
         <item quantity="one">%d message</item>
         <item quantity="other">%d messages</item>
@@ -242,6 +256,8 @@
         <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>
@@ -298,6 +314,18 @@
     <string name="homework_mark_as_done">Mark as done</string>
     <string name="homework_mark_as_undone">Mark as undone</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-->
@@ -305,7 +333,7 @@
     <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: %d</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-->
@@ -348,6 +376,35 @@
     <!--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>
+
+
+    <!--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-->
@@ -357,8 +414,6 @@
     <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_login_mobile_api">Mobile API mode</string>
-    <string name="account_login_hybrid">Hybrid mode</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>
@@ -379,9 +434,13 @@
     <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>
@@ -419,6 +478,7 @@
     <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-->
@@ -432,6 +492,74 @@
     <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_lesson_value">%1$s (%2$s)</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>
+    <plurals name="dashboard_timetable_first_lesson_time_in_minutes">
+        <item quantity="one">in %1$d minute</item>
+        <item quantity="other">in %1$d minutes</item>
+    </plurals>
+    <plurals name="dashboard_timetable_first_lesson_time_more_minutes">
+        <item quantity="one">%1$d more minute</item>
+        <item quantity="other">%1$d more minutes</item>
+    </plurals>
+    <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_lukcy_number">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>
@@ -479,7 +607,6 @@
     <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_timetable_show_whole_class">Show whole class lessons</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>
@@ -488,6 +615,7 @@
     <string name="pref_notify_header">Notifications</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_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_fix_sync_issues_settings_button">Go to settings</string>
@@ -503,10 +631,12 @@
     <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_settings_advanced_title">Advanced</string>
     <string name="pref_settings_appearance_title">Appearance &amp; Behavior</string>
@@ -514,6 +644,8 @@
     <string name="pref_settings_sync_title">Synchronization</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>
@@ -531,22 +663,19 @@
 
 
     <!--Notification Channels-->
-    <string name="channel_new_entries">New entries in register</string>
     <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>
 
 
-    <!--Drop kitkat alert dialog strings-->
-    <string name="drop_kitkat_title">End of support</string>
-    <string name="drop_kitkat_content">We are ending support for your device. No more new features will appear for it in Wulkanowy. However, we will be releasing critical patches until the end of 2021 so you have time to switch to a newer model</string>
-    <string name="drop_kitkat_again">Don\'t show again</string>
-
-
     <!--Colors-->
     <string name="all_black">Black</string>
     <string name="all_red">Red</string>
@@ -559,6 +688,7 @@
     <!--Others-->
     <string name="all_copied">Copied</string>
     <string name="all_undo">Undo</string>
+    <string name="all_change">Change</string>
 
 
     <!--Update helper-->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 297a4f288..628aa2974 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,9 +11,9 @@
         <item name="colorError">@color/colorError</item>
         <item name="colorDivider">@color/colorDivider</item>
         <item name="colorSwipeRefresh">@color/colorSwipeRefresh</item>
+        <item name="android:statusBarColor">@android:color/darker_gray</item>
         <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:preferenceStyle">@style/PreferenceThemeOverlay</item>
-        <item name="mdtp_theme_dark">false</item>
     </style>
 
     <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
@@ -24,6 +24,8 @@
 
     <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/layer_splash_background</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
     </style>
 
     <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Light.Dialog">
@@ -34,6 +36,19 @@
         <item name="android:textColor">?android:textColorPrimary</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>
+
+    <style name="WulkanowyTheme.TextAppearanceBottomNavigation">
+        <item name="android:textSize">11sp</item>
+    </style>
+
     <style name="mdtp_ActionButton.Text" parent="Widget.MaterialComponents.Button.TextButton.Dialog" />
 
     <style name="WulkanowyTheme.Login" parent="WulkanowyTheme.NoActionBar" />
diff --git a/app/src/main/res/xml/identificators.xml b/app/src/main/res/xml/identificators.xml
deleted file mode 100644
index 2d1873f48..000000000
--- a/app/src/main/res/xml/identificators.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item
-        name="visible"
-        type="id" />
-    <item
-        name="masked"
-        type="id" />
-</resources>
diff --git a/app/src/main/res/xml/scheme_preferences_advanced.xml b/app/src/main/res/xml/scheme_preferences_advanced.xml
index 1d7e9b832..461037871 100644
--- a/app/src/main/res/xml/scheme_preferences_advanced.xml
+++ b/app/src/main/res/xml/scheme_preferences_advanced.xml
@@ -25,6 +25,12 @@
             app:key="@string/pref_key_grade_average_force_calc"
             app:singleLineTitle="false"
             app:title="@string/pref_view_grade_average_force_calc" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_optional_arithmetic_average"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_optional_arithmetic_average"
+            app:singleLineTitle="false"
+            app:title="@string/pref_other_optional_arithmetic_average" />
         <ListPreference
             app:defaultValue="@string/pref_default_grade_average_mode"
             app:entries="@array/grade_average_mode_entries"
diff --git a/app/src/main/res/xml/scheme_preferences_appearance.xml b/app/src/main/res/xml/scheme_preferences_appearance.xml
index 095c5070b..b34fd417d 100644
--- a/app/src/main/res/xml/scheme_preferences_appearance.xml
+++ b/app/src/main/res/xml/scheme_preferences_appearance.xml
@@ -29,6 +29,17 @@
             app:title="@string/pref_view_list"
             app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_dashboard_appearance_header">
+        <MultiSelectListPreference
+            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>
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_grades_appearance_header">
@@ -38,8 +49,7 @@
             app:entryValues="@array/grade_color_scheme_values"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_grade_color_scheme"
-            app:title="@string/pref_view_grade_color_scheme"
-            app:useSimpleSummaryProvider="true" />
+            app:title="@string/pref_view_grade_color_scheme" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_expand_grade"
             app:iconSpaceReserved="false"
@@ -90,15 +100,15 @@
             app:key="@string/pref_key_timetable_show_groups"
             app:singleLineTitle="false"
             app:title="@string/pref_view_timetable_show_groups" />
- <!--Hidden due to not functional hybrid/mobile api modes
-        <ListPreference
-            app:defaultValue="@string/pref_default_timetable_show_whole_class"
-            app:entries="@array/timetable_show_whole_class_entries"
-            app:entryValues="@array/timetable_show_whole_class_values"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_timetable_show_whole_class"
-            app:title="@string/pref_view_timetable_show_whole_class"
-            app:useSimpleSummaryProvider="true" />
- -->
+        <!--Hidden due to not functional hybrid/mobile api modes
+               <ListPreference
+                   app:defaultValue="@string/pref_default_timetable_show_whole_class"
+                   app:entries="@array/timetable_show_whole_class_entries"
+                   app:entryValues="@array/timetable_show_whole_class_values"
+                   app:iconSpaceReserved="false"
+                   app:key="@string/pref_key_timetable_show_whole_class"
+                   app:title="@string/pref_view_timetable_show_whole_class"
+                   app:useSimpleSummaryProvider="true" />
+        -->
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/scheme_preferences_notifications.xml b/app/src/main/res/xml/scheme_preferences_notifications.xml
index 3d435ca8f..ac88746c0 100644
--- a/app/src/main/res/xml/scheme_preferences_notifications.xml
+++ b/app/src/main/res/xml/scheme_preferences_notifications.xml
@@ -20,6 +20,10 @@
             app:key="@string/pref_key_notification_debug"
             app:singleLineTitle="false"
             app:title="@string/pref_notify_debug_switch" />
+        <Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notifications_system_settings"
+            app:title="@string/pref_notify_open_system_settings" />
         <Preference
             app:iconSpaceReserved="false"
             app:isPreferenceVisible="false"
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 b26f4f6ba..f8b805740 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -4,6 +4,7 @@ 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.tressence.common.filters.Filter
 import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
 import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import java.io.InterruptedIOException
@@ -21,18 +22,10 @@ class CrashLogTree : FormatterPriorityTree(Log.VERBOSE) {
     }
 }
 
-class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR) {
+class CrashLogExceptionTree : FormatterPriorityTree(Log.ERROR, ExceptionFilter) {
 
     private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
 
-    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
-        if (t is FeatureDisabledException || t is FeatureNotAvailableException || t is UnknownHostException || t is SocketTimeoutException || t is InterruptedIOException) {
-            return true
-        }
-
-        return super.skipLog(priority, tag, message, t)
-    }
-
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         if (skipLog(priority, tag, message, t)) return
 
diff --git a/app/src/play/java/io/github/wulkanowy/utils/InAppReviewHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
new file mode 100644
index 000000000..1dcece99d
--- /dev/null
+++ b/app/src/play/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
@@ -0,0 +1,28 @@
+package io.github.wulkanowy.utils
+
+import android.content.Context
+import com.google.android.play.core.review.ReviewManagerFactory
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class InAppReviewHelper @Inject constructor(
+    @ApplicationContext private val context: Context
+)  {
+
+    fun showInAppReview(activity: MainActivity) {
+        val manager = ReviewManagerFactory.create(context)
+        val request = manager.requestReviewFlow()
+        request.addOnCompleteListener { task ->
+            if (task.isSuccessful) {
+                val reviewInfo = task.result
+                manager.launchReviewFlow(activity, reviewInfo)
+            } else {
+                Timber.e(task.exception)
+            }
+        }
+    }
+}
\ No newline at end of file
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 2fc899b34..cadc4225a 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
@@ -1,23 +1,32 @@
 package io.github.wulkanowy.data.repositories
 
+import android.content.Context
+import com.squareup.moshi.Moshi
 import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.enums.MessageFolder
+import io.github.wulkanowy.getSemesterEntity
 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.toFirstResult
 import io.mockk.MockKAnnotations
 import io.mockk.Runs
+import io.mockk.checkEquals
 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.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
@@ -26,6 +35,7 @@ import org.junit.Before
 import org.junit.Test
 import java.net.UnknownHostException
 import java.time.LocalDateTime
+import kotlin.test.assertTrue
 
 class MessageRepositoryTest {
 
@@ -38,27 +48,115 @@ class MessageRepositoryTest {
     @MockK
     private lateinit var messageAttachmentDao: MessageAttachmentDao
 
+    @MockK
+    private lateinit var context: Context
+
     @MockK(relaxUnitFun = true)
     private lateinit var refreshHelper: AutoRefreshHelper
 
+    @MockK
+    private lateinit var sharedPrefProvider: SharedPrefProvider
+
     private val student = getStudentEntity()
 
-    private lateinit var messageRepository: MessageRepository
+    private val semester = getSemesterEntity()
+
+    private lateinit var repository: MessageRepository
+
+    @MockK
+    private lateinit var moshi: Moshi
 
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
         every { refreshHelper.isShouldBeRefreshed(any()) } returns false
 
-        messageRepository = MessageRepository(messageDb, messageAttachmentDao, sdk, refreshHelper)
+        repository = MessageRepository(
+            messagesDb = messageDb,
+            messageAttachmentDao = messageAttachmentDao,
+            sdk = sdk,
+            context = context,
+            refreshHelper = refreshHelper,
+            sharedPrefProvider = sharedPrefProvider,
+            moshi = moshi,
+        )
+    }
+
+    @Test
+    fun `get messages when read by values was changed on already read message`() = runBlocking {
+        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().data.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 { messageDb.deleteAll(any()) } just Runs
+        coEvery { messageDb.insertAll(any()) } returns listOf()
+
+        repository.getMessages(
+            student = student,
+            semester = semester,
+            folder = MessageFolder.RECEIVED,
+            forceRefresh = true,
+            notify = false,
+        ).toFirstResult().data.orEmpty()
+
+        coVerify(exactly = 1) { messageDb.deleteAll(withArg { checkEquals(emptyList<Message>()) }) }
+        coVerify {
+            messageDb.insertAll(withArg {
+                assertEquals(4, it.single().messageId)
+                assertTrue(it.single().isNotified)
+            })
+        }
     }
 
     @Test(expected = NoSuchElementException::class)
     fun `throw error when message is not in the db`() {
         val testMessage = getMessageEntity(1, "", false)
-        coEvery { messageDb.loadMessageWithAttachment(1, 1) } throws NoSuchElementException("No message in database")
+        coEvery {
+            messageDb.loadMessageWithAttachment(1, 1)
+        } throws NoSuchElementException("No message in database")
 
-        runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
+        runBlocking { repository.getMessage(student, testMessage).toFirstResult() }
     }
 
     @Test
@@ -66,9 +164,11 @@ class MessageRepositoryTest {
         val testMessage = getMessageEntity(123, "Test", false)
         val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
 
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returns flowOf(messageWithAttachment)
+        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returns flowOf(
+            messageWithAttachment
+        )
 
-        val res = runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
+        val res = runBlocking { repository.getMessage(student, testMessage).toFirstResult() }
 
         assertEquals(null, res.error)
         assertEquals(Status.SUCCESS, res.status)
@@ -83,12 +183,24 @@ class MessageRepositoryTest {
         val mWa = MessageWithAttachment(testMessage, emptyList())
         val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
 
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
-        coEvery { sdk.getMessageDetails(testMessage.messageId, 1, false, testMessage.realId) } returns MessageDetails("Test", emptyList())
+        coEvery {
+            messageDb.loadMessageWithAttachment(
+                1,
+                testMessage.messageId
+            )
+        } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
+        coEvery {
+            sdk.getMessageDetails(
+                messageId = testMessage.messageId,
+                folderId = 1,
+                read = false,
+                id = testMessage.realId
+            )
+        } returns MessageDetails("Test", emptyList())
         coEvery { messageDb.updateAll(any()) } just Runs
         coEvery { messageAttachmentDao.insertAttachments(any()) } returns listOf(1)
 
-        val res = runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
+        val res = runBlocking { repository.getMessage(student, testMessage).toFirstResult() }
 
         assertEquals(null, res.error)
         assertEquals(Status.SUCCESS, res.status)
@@ -100,18 +212,22 @@ class MessageRepositoryTest {
     fun `get message when content in db is empty and there is no internet connection`() {
         val testMessage = getMessageEntity(123, "", false)
 
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } throws UnknownHostException()
+        coEvery {
+            messageDb.loadMessageWithAttachment(1, testMessage.messageId)
+        } throws UnknownHostException()
 
-        runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() }
+        runBlocking { repository.getMessage(student, testMessage).toFirstResult() }
     }
 
     @Test(expected = UnknownHostException::class)
     fun `get message when content in db is empty, unread and there is no internet connection`() {
         val testMessage = getMessageEntity(123, "", true)
 
-        coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } throws UnknownHostException()
+        coEvery {
+            messageDb.loadMessageWithAttachment(1, testMessage.messageId)
+        } throws UnknownHostException()
 
-        runBlocking { messageRepository.getMessage(student, testMessage).toList()[1] }
+        runBlocking { repository.getMessage(student, testMessage).toList()[1] }
     }
 
     private fun getMessageEntity(
@@ -123,10 +239,10 @@ class MessageRepositoryTest {
         realId = 1,
         messageId = messageId,
         sender = "",
-        senderId = 1,
-        recipient = "",
+        senderId = 0,
+        recipient = "Wielu adresatów",
         subject = "",
-        date = LocalDateTime.now(),
+        date = LocalDateTime.MAX,
         folderId = 1,
         unread = unread,
         removed = false,
@@ -136,4 +252,24 @@ class MessageRepositoryTest {
         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, ""),
+        recipients = listOf(),
+        subject = "",
+        content = content,
+        date = LocalDateTime.MAX,
+        folderId = 1,
+        unread = unread,
+        unreadBy = 0,
+        readBy = 0,
+        removed = false,
+        hasAttachments = false,
+    )
 }
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 1e000e848..2c56a1b69 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
@@ -2,10 +2,12 @@ package io.github.wulkanowy.data.repositories
 
 import io.github.wulkanowy.data.db.dao.TimetableAdditionalDao
 import io.github.wulkanowy.data.db.dao.TimetableDao
+import io.github.wulkanowy.data.db.dao.TimetableHeaderDao
 import io.github.wulkanowy.data.mappers.mapToEntities
 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.github.wulkanowy.utils.toFirstResult
@@ -41,6 +43,9 @@ class TimetableRepositoryTest {
     @MockK
     private lateinit var timetableAdditionalDao: TimetableAdditionalDao
 
+    @MockK
+    private lateinit var timetableHeaderDao: TimetableHeaderDao
+
     @MockK(relaxUnitFun = true)
     private lateinit var refreshHelper: AutoRefreshHelper
 
@@ -59,7 +64,7 @@ class TimetableRepositoryTest {
         MockKAnnotations.init(this)
         every { refreshHelper.isShouldBeRefreshed(any()) } returns false
 
-        timetableRepository = TimetableRepository(timetableDb, timetableAdditionalDao, sdk, timetableNotificationSchedulerHelper, refreshHelper)
+        timetableRepository = TimetableRepository(timetableDb, timetableAdditionalDao, timetableHeaderDao, sdk, timetableNotificationSchedulerHelper, refreshHelper)
     }
 
     @Test
@@ -71,7 +76,7 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2021, 1, 4, 9, 40), 3, "", "W-F"),
             createTimetableRemote(of(2021, 1, 4, 10, 30), 4, "", "W-F")
         )
-        coEvery { sdk.getTimetable(any(), any()) } returns (remoteList to emptyList())
+        coEvery { sdk.getTimetableFull(any(), any()) } returns TimetableFull(emptyList(), remoteList, emptyList())
 
         val localList = listOf(
             createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "123", "Przyroda"),
@@ -87,13 +92,17 @@ class TimetableRepositoryTest {
         coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
         coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
 
+        coEvery { timetableHeaderDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
+        coEvery { timetableHeaderDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
+        coEvery { timetableHeaderDao.deleteAll(emptyList()) } just Runs
+
         // execute
         val res = runBlocking {
             timetableRepository.getTimetable(student, semester, startDate, endDate, true).toFirstResult()
         }
 
         // verify
-        assertEquals(4, res.data?.first.orEmpty().size)
+        assertEquals(4, res.data?.lessons.orEmpty().size)
         coVerify {
             timetableDb.insertAll(withArg {
                 assertEquals(4, it.size)
@@ -124,7 +133,7 @@ class TimetableRepositoryTest {
             createTimetableRemote(of(2021, 1, 6, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
             createTimetableRemote(of(2021, 1, 6, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
         )
-        coEvery { sdk.getTimetable(startDate, endDate) } returns (remoteList to emptyList())
+        coEvery { sdk.getTimetableFull(startDate, endDate) } returns TimetableFull(emptyList(), remoteList, emptyList())
 
         val localList = listOf(
             createTimetableRemote(of(2021, 1, 4, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
@@ -150,12 +159,16 @@ class TimetableRepositoryTest {
         coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
         coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
 
+        coEvery { timetableHeaderDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
+        coEvery { timetableHeaderDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
+        coEvery { timetableHeaderDao.deleteAll(emptyList()) } just Runs
+
         // execute
         val res = runBlocking { timetableRepository.getTimetable(student, semester, startDate, endDate, true).toFirstResult() }
 
         // verify
         assertEquals(null, res.error)
-        assertEquals(12, res.data!!.first.size)
+        assertEquals(12, res.data!!.lessons.size)
 
         coVerify {
             timetableDb.insertAll(withArg {
@@ -187,7 +200,7 @@ class TimetableRepositoryTest {
         )
 
         // prepare
-        coEvery { sdk.getTimetable(startDate, endDate) } returns (remoteList to emptyList())
+        coEvery { sdk.getTimetableFull(startDate, endDate) } returns TimetableFull(emptyList(), remoteList, emptyList())
         coEvery { timetableDb.loadAll(1, 1, startDate, endDate) } returnsMany listOf(
             flowOf(remoteList.mapToEntities(semester)),
             flowOf(remoteList.mapToEntities(semester))
@@ -199,13 +212,17 @@ class TimetableRepositoryTest {
         coEvery { timetableAdditionalDao.deleteAll(emptyList()) } just Runs
         coEvery { timetableAdditionalDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
 
+        coEvery { timetableHeaderDao.loadAll(1, 1, startDate, endDate) } returns flowOf(listOf())
+        coEvery { timetableHeaderDao.insertAll(emptyList()) } returns listOf(1, 2, 3)
+        coEvery { timetableHeaderDao.deleteAll(emptyList()) } just Runs
+
         // execute
         val res = runBlocking { timetableRepository.getTimetable(student, semester, startDate, endDate, true).toFirstResult() }
 
         // verify
         assertEquals(null, res.error)
-        assertEquals(2, res.data?.first?.size)
-        coVerify { sdk.getTimetable(startDate, endDate) }
+        assertEquals(2, res.data?.lessons?.size)
+        coVerify { sdk.getTimetableFull(startDate, endDate) }
         coVerify { timetableDb.loadAll(1, 1, startDate, endDate) }
         coVerify { timetableDb.insertAll(match { it.isEmpty() }) }
         coVerify { timetableDb.deleteAll(match { it.isEmpty() }) }
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 3878503aa..ec07e149f 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
@@ -112,6 +112,21 @@ class GradeAverageProviderTest {
         getSummary(24, "Język polski", 3.49)
     )
 
+    private val noWeightGrades = listOf(
+        // standard: 0.0, arithmetic: 4.0
+        getGrade(22, "Matematyka", 5.0, 0.0, 0.0),
+        getGrade(22, "Matematyka", 3.0, 0.0, 0.0),
+        getGrade(22, "Matematyka", 1.0, 0.0, 0.0, "np.")
+    )
+
+    private val noWeightGradesSummary = listOf(
+        getSummary(23, "Matematyka", 0.0)
+    )
+
+    private val noWeightGradesArithmeticSummary = listOf(
+        getSummary(23, "Matematyka", 4.0)
+    )
+
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
@@ -124,9 +139,34 @@ class GradeAverageProviderTest {
         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
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { noWeightGrades to noWeightGradesSummary }
+
+        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
+    }
+
+    @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
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { noWeightGrades to noWeightGradesArithmeticSummary }
+
+        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
+    }
+
     @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
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flow {
@@ -156,6 +196,7 @@ class GradeAverageProviderTest {
     @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
 
         coEvery { semesterRepository.getSemesters(student) } returns semesters
@@ -186,6 +227,7 @@ class GradeAverageProviderTest {
     @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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], false) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
@@ -201,6 +243,7 @@ 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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], false) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
@@ -214,6 +257,7 @@ 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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { emptyList<Grade>() to emptyList() }
@@ -227,6 +271,7 @@ 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
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
@@ -241,6 +286,7 @@ class GradeAverageProviderTest {
         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
 
@@ -258,6 +304,7 @@ class GradeAverageProviderTest {
         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
 
@@ -275,6 +322,7 @@ class GradeAverageProviderTest {
         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
 
@@ -290,6 +338,7 @@ class GradeAverageProviderTest {
     @Test
     fun `calc current semester average`() {
         every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.isOptionalArithmeticAverage } returns false
         every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
         coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
 
@@ -303,6 +352,7 @@ class GradeAverageProviderTest {
     @Test
     fun `force calc current semester average`() {
         every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.isOptionalArithmeticAverage } returns false
         every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
         coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
 
@@ -316,6 +366,7 @@ class GradeAverageProviderTest {
     @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
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
 
@@ -329,6 +380,7 @@ class GradeAverageProviderTest {
     @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
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
@@ -361,6 +413,7 @@ class GradeAverageProviderTest {
     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 flowWithResource {
             firstGrades to listOf(
                 getSummary(22, "Matematyka", 3.0),
@@ -384,6 +437,7 @@ class GradeAverageProviderTest {
     @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
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
             emit(Resource.loading())
@@ -431,6 +485,7 @@ class GradeAverageProviderTest {
     @Test
     fun `force calc full year average`() {
         every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.isOptionalArithmeticAverage } returns false
         every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
         coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
@@ -465,6 +520,7 @@ class GradeAverageProviderTest {
     fun `calc all year average`() {
         every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
         every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.isOptionalArithmeticAverage } returns false
         coEvery {
             gradeRepository.getGrades(
                 student,
@@ -506,6 +562,7 @@ 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
         coEvery { semesterRepository.getSemesters(student) } returns semesters
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow {
@@ -548,6 +605,7 @@ class GradeAverageProviderTest {
     @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
 
         coEvery {
@@ -585,6 +643,7 @@ class GradeAverageProviderTest {
     @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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList() }
@@ -600,6 +659,7 @@ 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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
@@ -623,6 +683,7 @@ class GradeAverageProviderTest {
     @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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
@@ -638,6 +699,7 @@ 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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
@@ -653,6 +715,7 @@ 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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
@@ -669,6 +732,7 @@ class GradeAverageProviderTest {
     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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
             listOf(
@@ -698,6 +762,7 @@ class GradeAverageProviderTest {
     @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
 
         coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
@@ -730,6 +795,7 @@ class GradeAverageProviderTest {
         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
 
@@ -766,6 +832,7 @@ class GradeAverageProviderTest {
         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
 
@@ -797,7 +864,7 @@ class GradeAverageProviderTest {
         assertEquals(5.5555, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272  + 4,8 → .average()
     }
 
-    private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0, weight: Double = 1.0): Grade {
+    private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0, weight: Double = 1.0, entry: String = ""): Grade {
         return Grade(
             studentId = 101,
             semesterId = semesterId,
@@ -809,7 +876,7 @@ class GradeAverageProviderTest {
             date = now(),
             weight = "",
             gradeSymbol = "",
-            entry = "",
+            entry = entry,
             description = "",
             comment = "",
             color = ""
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 48c2aa9c3..98570144b 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
@@ -1,13 +1,10 @@
 package io.github.wulkanowy.ui.modules.splash
 
 import io.github.wulkanowy.MainCoroutineRule
-import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
-import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.verify
 import org.junit.Before
@@ -25,12 +22,6 @@ class SplashPresenterTest {
     @MockK
     lateinit var studentRepository: StudentRepository
 
-    @MockK
-    lateinit var preferencesRepository: PreferencesRepository
-
-    @MockK
-    lateinit var appInfo: AppInfo
-
     @MockK(relaxed = true)
     lateinit var errorHandler: ErrorHandler
 
@@ -39,13 +30,11 @@ class SplashPresenterTest {
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
-        presenter = SplashPresenter(errorHandler, studentRepository, preferencesRepository, appInfo)
+        presenter = SplashPresenter(errorHandler, studentRepository)
     }
 
     @Test
     fun testOpenLoginView() {
-        every { appInfo.systemVersion } returns 30
-        every { preferencesRepository.isKitkatDialogDisabled } returns true
         coEvery { studentRepository.isCurrentStudentSet() } returns false
 
         presenter.onAttachView(splashView, null)
@@ -54,8 +43,6 @@ class SplashPresenterTest {
 
     @Test
     fun testMainMainView() {
-        every { appInfo.systemVersion } returns 30
-        every { preferencesRepository.isKitkatDialogDisabled } returns true
         coEvery { studentRepository.isCurrentStudentSet() } returns true
 
         presenter.onAttachView(splashView, null)
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
index 958b9169b..32b1602e9 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -28,7 +28,7 @@ class GradeExtensionTest {
             createGrade(4.0, 1.0, 0.0),
             createGrade(1.0, 9.0, 0.5),
             createGrade(0.0, .0, 0.0)
-        ).calcAverage(), 0.005)
+        ).calcAverage(false), 0.005)
     }
 
     @Test
diff --git a/build.gradle b/build.gradle
index 1fdd073c9..afe0285c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,47 +1,34 @@
 buildscript {
     ext {
-        kotlin_version = '1.4.32'
-        about_libraries = '8.8.4'
-        hilt_version = "2.33-beta"
+        kotlin_version = '1.5.30'
+        about_libraries = '8.9.1'
+        hilt_version = "2.38.1"
     }
     repositories {
         mavenCentral()
         google()
-        jcenter()
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://developer.huawei.com/repo/" }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.0.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.huawei.agconnect:agcp:1.5.1.200'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.huawei.agconnect:agcp:1.6.0.300'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
         classpath "com.github.triplet.gradle:play-publisher:2.8.0"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.2.4"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }
 }
 
-project.ext.preDexLibs = !project.hasProperty("disablePreDex")
-subprojects {
-    project.plugins.whenPluginAdded { plugin ->
-        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
-            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
-        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
-            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
-        }
-    }
-}
-
 allprojects {
     repositories {
         mavenCentral()
         google()
-        jcenter()
         maven { url "https://jitpack.io" }
         maven { url "https://developer.huawei.com/repo/" }
     }
diff --git a/gradle.properties b/gradle.properties
index 998e31957..38603830b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,17 +4,19 @@
 # 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
+#
 kotlin.code.style=official
-kapt.incremental.apt=true
+#
 kapt.use.worker.api=true
 kapt.include.compile.classpath=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
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c02..7454180f2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8cf6eb5ad..a0f7639f7 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-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c8..744e882ed 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/settings.gradle b/settings.gradle
index 058beb21e..e7b4def49 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1 @@
 include ':app'
-
-buildCache {
-    local {
-        directory = new File(rootDir, '.build-cache')
-        removeUnusedEntriesAfterDays = 30
-    }
-}